# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 975788268 0
# Node ID 9aede9b4161c3b248f64eed78b8930b82a0ebbc1
# Parent  f51ea294cc74faa76391cba562b72420588e26ad
(use-fancy-splash-screens-p): New function.
(command-line-1): Use it to determine whether or not to use
a fancy splash screen.

diff -r f51ea294cc74 -r 9aede9b4161c lisp/startup.el
--- a/lisp/startup.el	Sat Dec 02 20:11:42 2000 +0000
+++ b/lisp/startup.el	Sat Dec 02 20:17:48 2000 +0000
@@ -1153,6 +1153,20 @@
 	  (kill-buffer splash-buffer)))))
 
 
+(defun use-fancy-splash-screens-p ()
+  "Return t if fancy splash screens should be used."
+  (when (or (and (display-color-p)
+		 (image-type-available-p 'xpm))
+	    (image-type-available-p 'pbm))
+    (let* ((img (create-image (or fancy-splash-image
+				  (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 (selected-window)))))
+      (> window-height (+ image-height 14)))))
+
+
 (defun startup-echo-area-message ()
   (if (eq (key-binding "\C-h\C-p") 'describe-project)
       "For information about the GNU Project and its goals, type C-h C-p."
@@ -1241,9 +1255,7 @@
 		       
 		       (if (assq 'display (frame-parameters))
 			   
-			   (if (or (and (display-color-p)
-					(image-type-available-p 'xpm))
-				   (image-type-available-p 'pbm))
+			   (if (use-fancy-splash-screens-p)
 			       (progn
 				 (setq wait-for-input nil)
 				 (fancy-splash-screens))