aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-11-04 11:25:18 +0800
committerChong Yidong2012-11-04 11:25:18 +0800
commit2cbafa5672c8ed115a851368b9f2e435152b4643 (patch)
tree0b60f90d1cbe1fd4627d63a2d81013917311d94f
parent85178ca1361874a4ce78f13b827d5c3fa8687856 (diff)
downloademacs-2cbafa5672c8ed115a851368b9f2e435152b4643.tar.gz
emacs-2cbafa5672c8ed115a851368b9f2e435152b4643.zip
* bookmark.el (bookmark-bmenu-switch-other-window): Avoid binding same-window-* variables.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/bookmark.el6
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 84d70ccab18..ce4919afa2b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-11-04 Chong Yidong <cyd@gnu.org>
2
3 * bookmark.el (bookmark-bmenu-switch-other-window): Avoid binding
4 same-window-* variables.
5
12012-11-04 Juri Linkov <juri@jurta.org> 62012-11-04 Juri Linkov <juri@jurta.org>
2 7
3 * isearch.el (isearch-help-for-help, isearch-describe-bindings) 8 * isearch.el (isearch-help-for-help, isearch-describe-bindings)
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 78ca6f22c8e..e3fdf1847b8 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1873,10 +1873,8 @@ With a prefix arg, prompts for a file to save them in."
1873The current window remains selected." 1873The current window remains selected."
1874 (interactive) 1874 (interactive)
1875 (let ((bookmark (bookmark-bmenu-bookmark)) 1875 (let ((bookmark (bookmark-bmenu-bookmark))
1876 (pop-up-windows t) 1876 (fun (lambda (b) (display-buffer b t))))
1877 same-window-buffer-names 1877 (bookmark--jump-via bookmark fun)))
1878 same-window-regexps)
1879 (bookmark--jump-via bookmark 'display-buffer)))
1880 1878
1881(defun bookmark-bmenu-other-window-with-mouse (event) 1879(defun bookmark-bmenu-other-window-with-mouse (event)
1882 "Select bookmark at the mouse pointer in other window, leaving bookmark menu visible." 1880 "Select bookmark at the mouse pointer in other window, leaving bookmark menu visible."