• Karl Fogel's avatar
    [[[ · 068a0233
    Karl Fogel authored
    * lisp/bookmark.el (bookmark-bmenu-switch-other-window,
      bookmark-bmenu-other-window, bookmark-bmenu-2-window): Don't override
      ambient binding of `bookmark-automatically-show-annotations'.  (Bug #6515)
    ]]]
    
    === modified file 'lisp/bookmark.el'
    --- lisp/bookmark.el	2010-04-14 15:07:53 +0000
    +++ lisp/bookmark.el	2010-06-27 03:40:14 +0000
    @@ -1860,8 +1860,7 @@
             (pop-up-windows t))
         (delete-other-windows)
         (switch-to-buffer (other-buffer))
    -    (let ((bookmark-automatically-show-annotations nil)) ;FIXME: needed?
    -      (bookmark--jump-via bmrk 'pop-to-buffer))
    +    (bookmark--jump-via bmrk 'pop-to-buffer)
         (bury-buffer menu)))
     
     
    @@ -1875,8 +1874,7 @@
       "Select this line's bookmark in other window, leaving bookmark menu visible."
       (interactive)
       (let ((bookmark (bookmark-bmenu-bookmark)))
    -    (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed?
    -      (bookmark--jump-via bookmark 'switch-to-buffer-other-window))))
    +    (bookmark--jump-via bookmark 'switch-to-buffer-other-window)))
     
     
     (defun bookmark-bmenu-switch-other-window ()
    @@ -1887,8 +1885,7 @@
             (pop-up-windows t)
             same-window-buffer-names
             same-window-regexps)
    -    (let ((bookmark-automatically-show-annotations t)) ;FIXME: needed?
    -      (bookmark--jump-via bookmark 'display-buffer))))
    +    (bookmark--jump-via bookmark 'display-buffer)))
     
     (defun bookmark-bmenu-other-window-with-mouse (event)
       "Select bookmark at the mouse pointer in other window, leaving bookmark menu visible."
    
    === modified file 'lisp/saveplace.el'
    --- lisp/saveplace.el	2010-01-13 08:35:10 +0000
    +++ lisp/saveplace.el	2010-02-07 23:14:52 +0000
    @@ -213,7 +213,7 @@
                           (symbol-name coding-system-for-write)))
           (let ((print-length nil)
                 (print-level nil))
    -        (print save-place-alist (current-buffer)))
    +        (pp save-place-alist (current-buffer)))
           (let ((version-control
                  (cond
                   ((null save-place-version-control) nil)
    068a0233
ChangeLog 551 KB