diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-10-25 18:09:57 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2009-10-25 18:09:57 +0000 |
| commit | 955ef4309a441a2d53605631d1346a238bba43ea (patch) | |
| tree | cb2123df8bf302a0fc811ce8988439f3ee2dee8c | |
| parent | eefa91dbc077bec47247a7c32fe5d136323360ff (diff) | |
| download | emacs-955ef4309a441a2d53605631d1346a238bba43ea.tar.gz | |
(bookmark-bmenu-list): Don't use switch-to-buffer if
we're inside a dedicated or minibuffer window.
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/bookmark.el | 9 |
2 files changed, 13 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8021b71f656..c6a8287942c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-10-25 Stefan Monnier <monnier@iro.umontreal.ca> + + * bookmark.el (bookmark-bmenu-list): Don't use switch-to-buffer if + we're inside a dedicated or minibuffer window. + 2009-10-24 Karl Fogel <kfogel@red-bean.com> * bookmark.el: Update documentation, especially documentation @@ -12,8 +17,8 @@ * whitespace.el (whitespace-mode, whitespace-newline-mode) (global-whitespace-mode, global-whitespace-newline-mode) - (whitespace-toggle-options, global-whitespace-toggle-options): Doc - fix (Bug#3660). + (whitespace-toggle-options, global-whitespace-toggle-options): + Doc fix (Bug#3660). * nxml/nxml-mode.el (nxml-balanced-close-start-tag): Use the value of xmltok-start before the end tag was inserted (Bug#2840). diff --git a/lisp/bookmark.el b/lisp/bookmark.el index ad715d8a21e..370f9de9cfa 100644 --- a/lisp/bookmark.el +++ b/lisp/bookmark.el @@ -1563,9 +1563,12 @@ The leftmost column displays a D if the bookmark is flagged for deletion, or > if it is flagged for displaying." (interactive) (bookmark-maybe-load-default-file) - (if (called-interactively-p 'interactive) - (switch-to-buffer (get-buffer-create "*Bookmark List*")) - (set-buffer (get-buffer-create "*Bookmark List*"))) + (let ((buf (get-buffer-create "*Bookmark List*"))) + (if (called-interactively-p 'interactive) + (if (or (window-dedicated-p) (window-minibuffer-p)) + (pop-to-buffer buf) + (switch-to-buffer buf)) + (set-buffer buf))) (let ((inhibit-read-only t)) (erase-buffer) (insert "% Bookmark\n- --------\n") |