Mercurial > emacs
changeset 34129:9aede9b4161c
(use-fancy-splash-screens-p): New function.
(command-line-1): Use it to determine whether or not to use
a fancy splash screen.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Sat, 02 Dec 2000 20:17:48 +0000 |
| parents | f51ea294cc74 |
| children | 2f332379e418 |
| files | lisp/startup.el |
| diffstat | 1 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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))