Fix latest fix of delete-window.

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

lisp/ChangeLog

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

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