From 998c4a6a187db3cfc36914fc8d54c43005f7be25 Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Fri, 17 Aug 2012 08:01:17 +0200 Subject: Fix latest fix of delete-window. * window.el (delete-window): Fix last fix. --- lisp/ChangeLog | 4 ++++ lisp/window.el | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c91c40eb52d..2bc154b1610 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2012-08-17 Martin Rudalics + + * window.el (delete-window): Fix last fix. + 2012-08-16 Martin Rudalics * window.el (window-valid-p): Move to window.c. diff --git a/lisp/window.el b/lisp/window.el index d505b7dbbac..142e80e1666 100644 --- a/lisp/window.el +++ b/lisp/window.el @@ -2459,9 +2459,7 @@ that is its frame's root window." (not (eq (window-parameter parent 'window-side) 'none)))) (error "Attempt to delete last non-side window")) ((not parent) - (error "Attempt to delete minibuffer or sole ordinary window")) - ((eq window (window--major-non-side-window frame)) - (error "Attempt to delete last non-side window"))) + (error "Attempt to delete minibuffer or sole ordinary window"))) (let* ((horizontal (window-left-child parent)) (size (window-total-size window horizontal)) -- cgit v1.2.1