diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2012-08-17 08:01:17 +0200 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2012-08-17 08:01:17 +0200 |
| commit | 998c4a6a187db3cfc36914fc8d54c43005f7be25 (patch) | |
| tree | 94583c70d08f027edbfc479c428007274d54165c /lisp | |
| parent | 44386687ef56cf67b8eaf34c3365fdcb6ff0aa3d (diff) | |
| download | emacs-998c4a6a187db3cfc36914fc8d54c43005f7be25.tar.gz | |
Fix latest fix of delete-window.
* window.el (delete-window): Fix last fix.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/window.el | 4 |
2 files changed, 5 insertions, 3 deletions
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 <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 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)) |