[Emacs-diffs] /srv/bzr/emacs/trunk r109652: Fix latest fix of delete-window.

[martin rudalics]

------------------------------------------------------------
revno: 109652
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Fri 2012-08-17 08:01:17 +0200
message:
  Fix latest fix of delete-window.
  
  * window.el (delete-window): Fix last fix.
modified:
  lisp/ChangeLog
  lisp/window.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-16 17:22:36 +0000
+++ b/lisp/ChangeLog    2012-08-17 06:01:17 +0000
@@ -1,3 +1,7 @@
+2012-08-17  Martin Rudalics  <address@hidden>
+
+       * window.el (delete-window): Fix last fix.
+
 2012-08-16  Martin Rudalics  <address@hidden>
 
        * window.el (window-valid-p): Move to window.c.

=== modified file 'lisp/window.el'
--- a/lisp/window.el    2012-08-16 17:22:36 +0000
+++ b/lisp/window.el    2012-08-17 06:01:17 +0000
@@ -2459,9 +2459,7 @@
                 (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))