diff lisp/bookmark.el @ 105761:2a4b89270020

(bookmark-bmenu-list): Don't use switch-to-buffer if we're inside a dedicated or minibuffer window.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sun, 25 Oct 2009 18:09:57 +0000
parents 110c55336723
children d5f02d259103
line wrap: on
line diff
--- a/lisp/bookmark.el	Sun Oct 25 02:55:27 2009 +0000
+++ b/lisp/bookmark.el	Sun Oct 25 18:09:57 2009 +0000
@@ -1563,9 +1563,12 @@
 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")