[Emacs-diffs] emacs/lisp ChangeLog bookmark.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/10/25 18:10:00

Modified files:
        lisp           : ChangeLog bookmark.el 

Log message:
        (bookmark-bmenu-list): Don't use switch-to-buffer if
        we're inside a dedicated or minibuffer window.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16507&r2=1.16508
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/bookmark.el?cvsroot=emacs&r1=1.138&r2=1.139

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16507
retrieving revision 1.16508
diff -u -b -r1.16507 -r1.16508
--- ChangeLog   25 Oct 2009 02:07:45 -0000      1.16507
+++ ChangeLog   25 Oct 2009 18:09:57 -0000      1.16508
@@ -1,3 +1,8 @@
+2009-10-25  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * 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).

Index: bookmark.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/bookmark.el,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -b -r1.138 -r1.139
--- bookmark.el 25 Oct 2009 02:07:45 -0000      1.138
+++ bookmark.el 25 Oct 2009 18:10:00 -0000      1.139
@@ -1563,9 +1563,12 @@
 deletion, or > if it is flagged for displaying."
   (interactive)
   (bookmark-maybe-load-default-file)
+  (let ((buf (get-buffer-create "*Bookmark List*")))
   (if (called-interactively-p 'interactive)
-      (switch-to-buffer (get-buffer-create "*Bookmark List*"))
-    (set-buffer (get-buffer-create "*Bookmark List*")))
+        (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")