From 285991dceb4afdb2eec3e58dcca908316471b0c0 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Sat, 2 Dec 2000 20:19:39 +0000 Subject: [PATCH] (use-fancy-splash-screens-p): New function. (command-line-1): Use it to determine whether or not to use a fancy splash screen. --- lisp/ChangeLog | 8 +++++++- lisp/startup.el | 18 +++++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2b00f4598bd..f7b03c122b1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2000-12-02 Gerd Moellmann + + * startup.el (use-fancy-splash-screens-p): New function. + (command-line-1): Use it to determine whether or not to use + a fancy splash screen. + 2000-12-02 Andreas Schwab * emacs-lisp/eldoc.el (eldoc): Don't make parent of itself. @@ -14,7 +20,7 @@ with numeric argument. Docstring fix. (toplevel): Require cl when compiling. - * internat/mule.el (make-char): Doc fix. + * international/mule.el (make-char): Doc fix. 2000-12-02 Jason Rumney diff --git a/lisp/startup.el b/lisp/startup.el index f4550310a87..40e0a5f02c3 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1153,6 +1153,20 @@ where FACE is a valid face specification, as it can be used with (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 @@ where FACE is a valid face specification, as it can be used with (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)) -- 2.39.5