Remove unnecessary let-bindings in bookmark.el (Bug#6515)

* bookmark.el (bookmark-bmenu-2-window)
(bookmark-bmenu-other-window)
(bookmark-bmenu-other-window-with-mouse): Remove unnecessary
bindings of bookmark-automatically-show-annotations (Bug#6515).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca9e18ad585d720fd6fdfd56dadf76cf5927a66f..8fcbf15adabff723024a526249ea0909cc4db307 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-27  Christoph  <cschol2112@googlemail.com>  (tiny change)
+
+       * bookmark.el (bookmark-bmenu-2-window)
+       (bookmark-bmenu-other-window)
+       (bookmark-bmenu-other-window-with-mouse): Remove unnecessary
+       bindings of bookmark-automatically-show-annotations (Bug#6515).
+
 2010-06-25  Eli Zaretskii  <eliz@gnu.org>
 
        * arc-mode.el (archive-zip-extract): Don't quote the file name on

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index e69f87fd7a087d07ac1242792e2d20449072d408..9515837fc28ce94a4194783c690f69793d7ad265 100644 (file)
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1854,8 +1854,7 @@ With a prefix arg, prompts for a file to save them in."
         (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)))
 
 
@@ -1869,8 +1868,7 @@ With a prefix arg, prompts for a file to save them in."
   "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 ()
@@ -1881,8 +1879,7 @@ The current window remains selected."
         (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."