(use-fancy-splash-screens-p, display-splash-screen): Move

display-graphic-p test from latter to former.  Fixes previous change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 23714466857920ec78ec3d22294c0d0d6c9e0a77..17c6f8cfb4b0c1126cb11c7c49574f5ce78d4abd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -7,6 +7,8 @@
 
        * startup.el (command-line-1): Stop startup-echo-area-message
        being hidden by "Loading image..." message.
+       (use-fancy-splash-screens-p, display-splash-screen): Move
+       display-graphic-p test from latter to former.
 
        * progmodes/sh-script.el (sh-font-lock-keywords): Highlight
        escaped EOLs differently from other backslash constructs.

diff --git a/lisp/startup.el b/lisp/startup.el
index 8d425f84e191fbc7bcc0e7401af434512b9f8cf2..2808689eaeb8243dfd7de7b146e929a96aba5335 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1341,9 +1341,10 @@ we put it on this frame."
 
 (defun use-fancy-splash-screens-p ()
   "Return t if fancy splash screens should be used."
-  (when (or (and (display-color-p)
+  (when (and (display-graphic-p)
+             (or (and (display-color-p)
                 (image-type-available-p 'xpm))
-           (image-type-available-p 'pbm))
+                 (image-type-available-p 'pbm)))
     (let ((frame (fancy-splash-frame)))
       (when frame
        (let* ((img (create-image (or fancy-splash-image
@@ -1517,8 +1518,7 @@ Type \\[describe-distribution] for information on getting the latest version."))
 Fancy splash screens are used on graphic displays,
 normal otherwise."
   (interactive)
-  (if (and (display-graphic-p)
-          (use-fancy-splash-screens-p))
+  (if (use-fancy-splash-screens-p)
       (fancy-splash-screens)
     (normal-splash-screen)))