# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1256494197 0
# Node ID 2a4b8927002059de514238af66041e01d88791b6
# Parent  d0906291f75b558adc152111b7ce0a7c1a9c6fe3
(bookmark-bmenu-list): Don't use switch-to-buffer if
we're inside a dedicated or minibuffer window.

diff -r d0906291f75b -r 2a4b89270020 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Oct 25 02:55:27 2009 +0000
+++ b/lisp/ChangeLog	Sun Oct 25 18:09:57 2009 +0000
@@ -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 -r d0906291f75b -r 2a4b89270020 lisp/bookmark.el
--- 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")