summaryrefslogtreecommitdiff
path: root/lisp/window.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1998-04-30 04:23:59 +0000
committerRichard M. Stallman <rms@gnu.org>1998-04-30 04:23:59 +0000
commiteed1360c124fb6cb11e9e0df771ed86a6883ad27 (patch)
tree61221f129c5c2be3a4eedd77d51a8b511b7640b6 /lisp/window.el
parenteabb24d041c01f5f927363aa924ca90a0bdf3522 (diff)
downloademacs-eed1360c124fb6cb11e9e0df771ed86a6883ad27.tar.gz
(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.
Diffstat (limited to 'lisp/window.el')
-rw-r--r--lisp/window.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/window.el b/lisp/window.el
index 6b8709b00f3..025f0a82d10 100644
--- 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)