Fix latest fix of delete-window.

* window.el (delete-window): Fix last fix.
This commit is contained in:
Martin Rudalics 2012-08-17 08:01:17 +02:00
parent 44386687ef
commit 998c4a6a18
2 changed files with 5 additions and 3 deletions

View file

@ -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.

View file

@ -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))