diff options
| author | Karl Fogel <kfogel@red-bean.com> | 2010-07-04 15:57:02 -0400 |
|---|---|---|
| committer | Karl Fogel <kfogel@red-bean.com> | 2010-07-04 15:57:02 -0400 |
| commit | 5b98e31f69e0889cf83603785c297333720143ca (patch) | |
| tree | e09b6294e1134b82e3ac4c201a512c829810562a /lisp/bookmark.el | |
| parent | b9503078536af127ced1d0e52ed09224cb575ab6 (diff) | |
| download | emacs-5b98e31f69e0889cf83603785c297333720143ca.tar.gz | |
* 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)
Diffstat (limited to 'lisp/bookmark.el')
| -rw-r--r-- | lisp/bookmark.el | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el index cfc7d7af5c8..d91c3ca46ee 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -1860,8 +1860,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))) @@ -1875,8 +1874,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 () @@ -1887,8 +1885,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." |