[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99901: Remove unnecessary let-bindings in bookmark.el (Bug#6515)

[Chong Yidong]

------------------------------------------------------------
revno: 99901
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sun 2010-06-27 14:03:26 -0400
message:
  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).
modified:
  lisp/ChangeLog
  lisp/bookmark.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-06-25 11:42:47 +0000
+++ b/lisp/ChangeLog    2010-06-27 18:03:26 +0000
@@ -1,3 +1,10 @@
+2010-06-27  Christoph  <address@hidden>  (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  <address@hidden>
 
        * arc-mode.el (archive-zip-extract): Don't quote the file name on

=== modified file 'lisp/bookmark.el'
--- a/lisp/bookmark.el  2010-02-18 18:52:36 +0000
+++ b/lisp/bookmark.el  2010-06-27 18:03:26 +0000
@@ -1854,8 +1854,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)))
 
 
@@ -1869,8 +1868,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 ()
@@ -1881,8 +1879,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."