(quit-window): Bind window to selected window when

trying to delete it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 76530d7150a695f9083259272010fcb3b98f714e..1aabd10064496745ca923791f56cef972144bbe2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-17  Martin Rudalics  <rudalics@gmx.at>
+
+       * window.el (quit-window): Bind window to selected window when
+       trying to delete it.
+
 2008-11-17  Glenn Morris  <rgm@gnu.org>
 
        * progmodes/cc-defs.el (c-put-char-property-fun): Add fallback

diff --git a/lisp/window.el b/lisp/window.el
index 2dece4b25fef570714e5870bdfc26a116b381b93..8657842cfb8febd90864517f6ff6dc3dd9265e85 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1437,7 +1437,8 @@ Otherwise, bury WINDOW's buffer, see `bury-buffer'."
            (window-dedicated-p window))
        ;; WINDOW is either non-nil, a minibuffer window, or dedicated;
        ;; try to delete it.
-       (let ((frame (window-frame (or window (selected-window)))))
+       (let* ((window (or window (selected-window)))
+              (frame (window-frame window)))
          (if (eq window (frame-root-window frame))
              ;; WINDOW is alone on its frame.  `delete-windows-on'
              ;; knows how to handle that case.