X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fwindow.el;h=8c4bba495638e53452b3b649c84787321a5a3a2a;hb=ef8cf0aed12994f433233c61134b14da9eb6db25;hp=76d638f3bb0c49278f660c9620f2ef698344aed3;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/window.el b/lisp/window.el
index 76d638f..8c4bba4 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -293,17 +293,15 @@ or if the window is the only window of its frame."
 		      (unwind-protect
 			  (count-windows)
 			(select-frame frame))))
-	       ;; check to make sure that we don't have horizontally
-	       ;; split windows
-	       (eq (frame-highest-window (window-frame window) 0)
-		   (frame-highest-window (window-frame window) -1))
+	       ;; check to make sure that the window is the full width
+	       ;; of the frame
+	       (window-leftmost-p window)
+	       (window-rightmost-p window)
+	       (zerop (nth 0 edges))
+	       ;; The whole buffer must be visible.
 	       (pos-visible-in-window-p (point-min) window)
-	       (not (eq mini 'only))
-	       (or (not mini) (eq mini t)
-		   (< (nth 3 edges)
-		      (nth 1 (window-pixel-edges mini)))
-		   (> (nth 1 edges)
-		      0)))
+	       ;; The frame must not be minibuffer-only.
+	       (not (eq mini 'only)))
 	  (progn
 	    (save-window-excursion
 	      (goto-char (point-min))
@@ -353,5 +351,4 @@ Any other non-nil value means search frames on all devices."
                   minibuf all-frames device)
     wins))
 
-
 ;;; window.el ends here