Commit 285991dc authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

(use-fancy-splash-screens-p): New function.

(command-line-1): Use it to determine whether or not to use
a fancy splash screen.
parent 52dca1b2
2000-12-02 Gerd Moellmann <gerd@gnu.org>
* 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 <schwab@suse.de>
* 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 <jasonr@gnu.org>
......
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment