Mercurial > emacs

changeset 99662:75d942e6450e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(quit-window): Bind window to selected window when trying to delete it.
author Martin Rudalics <rudalics@gmx.at>
date Mon, 17 Nov 2008 09:58:22 +0000
parents ee536c159517
children 4600bcdbc24b
files lisp/window.el
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/window.el	Mon Nov 17 08:41:14 2008 +0000
+++ b/lisp/window.el	Mon Nov 17 09:58:22 2008 +0000
@@ -1437,7 +1437,8 @@
 	    (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.