Mercurial > emacs
changeset 52553:c9d6b407c93b
(use-fancy-splash-screens-p, display-splash-screen): Move
display-graphic-p test from latter to former. Fixes previous change.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Fri, 19 Sep 2003 22:42:24 +0000 |
| parents | dab2424315f1 |
| children | 3cf6b0b6a5ef |
| files | lisp/startup.el |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/startup.el Fri Sep 19 18:43:16 2003 +0000 +++ b/lisp/startup.el Fri Sep 19 22:42:24 2003 +0000 @@ -1341,9 +1341,10 @@ (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 @@ 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)))