(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.

diff --git a/lisp/window.el b/lisp/window.el
index 6b8709b00f38fe4fccf851b24eb28c22c2a53b52..025f0a82d10c3bbdd2c1dfc04daa04cab9f6bcbf 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -314,11 +314,13 @@ and the buffer that is killed or buried is the one in that window."
     (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)