# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1166109412 0
# Node ID fca3bf689dc45aafd8ce526a3f4c566863f79a66
# Parent  a034e88d18ffaf97ce99f482921a86e100d8ef58
(use-fancy-splash-screens-p): Use frame-height
instead of window-height.  Pass frame to image-size.

diff -r a034e88d18ff -r fca3bf689dc4 lisp/startup.el
--- a/lisp/startup.el	Thu Dec 14 08:42:28 2006 +0000
+++ b/lisp/startup.el	Thu Dec 14 15:16:52 2006 +0000
@@ -1451,9 +1451,12 @@
 				      (if (and (display-color-p)
 					       (image-type-available-p 'xpm))
 					  "splash.xpm" "splash.pbm"))))
-	       (image-height (and img (cdr (image-size img))))
-	       (window-height (1- (window-height (frame-selected-window frame)))))
-	  (> window-height (+ image-height 19)))))))
+	       (image-height (and img (cdr (image-size img nil frame))))
+	       ;; We test frame-height so that, if the frame is split
+	       ;; by displaying a warning, that doesn't cause the normal
+	       ;; splash screen to be used.
+	       (frame-height (1- (frame-height frame))))
+	  (> frame-height (+ image-height 19)))))))
 
 
 (defun normal-splash-screen (&optional hide-on-input)