[Emacs-diffs] /srv/bzr/emacs/trunk r100717: * lisp/bookmark.el (bookmark-bmenu-switch-other-window,

[Karl Fogel]

------------------------------------------------------------
revno: 100717
committer: Karl Fogel <address@hidden>
branch nick: trunk
timestamp: Sun 2010-07-04 15:57:02 -0400
message:
  * 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:
  lisp/bookmark.el

=== modified file 'lisp/bookmark.el'
--- a/lisp/bookmark.el  2010-04-14 15:07:53 +0000
+++ b/lisp/bookmark.el  2010-07-04 19:57:02 +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."