Fix latest fix of delete-window.

* window.el (delete-window): Fix last fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c91c40eb52d158ae5a7fcd71241b4ca2e1459dba..2bc154b161076257d06bd30a3bcd9885eb6e59b5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-17  Martin Rudalics  <rudalics@gmx.at>
+
+       * window.el (delete-window): Fix last fix.
+
 2012-08-16  Martin Rudalics  <rudalics@gmx.at>
 
        * window.el (window-valid-p): Move to window.c.

diff --git a/lisp/window.el b/lisp/window.el
index d505b7dbbac1e265df986d36f0d33faedc560bfd..142e80e16668b6da4a084bc2a8b3225c5a4d5789 100644 (file)
--- 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))