Mercurial > emacs

changeset 21860:58d299618042

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(quit-window): Don't try to switch buffers in a dedicated window or a minibuffer window. Treat minibuffer window as dedicated in other ways too.
author Richard M. Stallman <rms@gnu.org>
date Thu, 30 Apr 1998 04:23:59 +0000
parents bd52f7e0fcdc
children d5d9362aa189
files lisp/window.el
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/window.el	Thu Apr 30 03:45:54 1998 +0000
+++ b/lisp/window.el	Thu Apr 30 04:23:59 1998 +0000
@@ -314,11 +314,13 @@
     (save-selected-window
       (if window
 	  (select-window window))
-      (switch-to-buffer (other-buffer)))
+      (or (window-minibuffer-p)
+	  (window-dedicated-p (selected-window))
+	  (switch-to-buffer (other-buffer))))
 
     ;; Get rid of the frame, if it has just one dedicated window
     ;; and other visible frames exist.
-    (and (window-dedicated-p window)
+    (and (or (window-minibuffer-p) (window-dedicated-p window))
 	 (delq frame (visible-frame-list))
 	 window-solitary
 	 (if (and (eq default-minibuffer-frame frame)