(tex-command-end): New variable.

[bpt/emacs.git] / lisp / window.el

diff --git a/lisp/window.el b/lisp/window.el
index 6b8709b..bd3727c 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -303,7 +303,7 @@ If WINDOW is non-nil, it specifies a window; we delete that window,
 and the buffer that is killed or buried is the one in that window."
   (interactive "P")
   (let ((buffer (window-buffer window))
-       (frame (if window (window-frame window) (selected-window)))
+       (frame (window-frame (or window (selected-window))))
        (window-solitary
         (save-selected-window
           (if window
@@ -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)