diff options
| author | Glenn Morris <[email protected]> | 2003-09-19 22:44:45 +0000 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2003-09-19 22:44:45 +0000 |
| commit | 9df076f27f6798d72b8c0b0a427f74d482ef94f1 (patch) | |
| tree | ff0178259a56825d1424c73df86a6c3438836730 | |
| parent | 9ceda1bb2270990eb3ae39e835f6db7a9bad0ce8 (diff) | |
(use-fancy-splash-screens-p, display-splash-screen): Move
display-graphic-p test from latter to former. Fixes previous change.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/startup.el | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2371446685..17c6f8cfb4 100644 --- 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 8d425f84e1..2808689eae 100644 --- 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))) |