From: Dave Love <fx@gnu.org>
Date: Mon, 25 Sep 2000 18:31:51 +0000 (+0000)
Subject: (fancy-splash-head): Check XPM is available.
X-Git-Tag: emacs-pretest-21.0.90~1386
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d7a7f13120c86296760d0574749283f33ee4c8b6;p=emacs.git

(fancy-splash-head): Check XPM is available.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index e8ebf6696ca..062a2851e70 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -914,7 +914,8 @@ where FACE is a valid face specification, as it can be used with
 (defun fancy-splash-head ()
   "Insert the head part of the splash screen into the current buffer."
   (let* ((img (create-image (or fancy-splash-image
-				(if (display-color-p)
+				(if (and (display-color-p)
+					 (image-type-available-p 'xpm))
 				    "splash.xpm" "splash.pbm"))))
 	 (image-width (and img (car (image-size img))))
 	 (window-width (window-width (selected-window))))