mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-24 19:03:29 +00:00
Code Issues Releases Activity

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

Browse Source 
display-graphic-p test from latter to former.  Fixes previous change.
This commit is contained in:
Glenn Morris 2003-09-19 22:44:45 +00:00
parent 9ceda1bb22
commit 9df076f27f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/ChangeLog
View File

@ -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.

8
lisp/startup.el
View File

@ -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)))