* lisp/startup.el (fancy-splash-head): Fix change of 2008-07-02.

* etc/images/splash8.xpm: Remove.

2 files changed, 11 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 20a14d0fd14..4a201e637d3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-18  Francesc Rocher  <rocher@member.fsf.org>
+
+        * startup.el (fancy-splash-head): Fix change of 2008-07-02.
+
 2008-07-18  Glenn Morris  <rgm@gnu.org>
 
         * eshell/esh-arg.el (eshell-quote-backslash): Restrict previous change
diff --git a/lisp/startup.el b/lisp/startup.el
index c426c6c2491..d3ab1d502a9 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1442,15 +1442,17 @@ a face or button specification."
   (let* ((image-file (cond ((stringp fancy-splash-image)
                             fancy-splash-image)
                            ((display-color-p)
-                            (cond ((image-type-available-p 'svg)
+                            (cond ((<= (display-planes) 8)
+                                   (if (image-type-available-p 'xpm)
+                                       "splash.xpm"
+                                     "splash.pbm"))
+                                  ((image-type-available-p 'svg)
                                    "splash.svg")
                                   ((image-type-available-p 'png)
                                    "splash.png")
                                   ((image-type-available-p 'xpm)
-                                   (if (and (fboundp 'x-display-planes)
-                                            (= (funcall 'x-display-planes) 8))
-                                       "splash8.xpm"
-                                     "splash.xpm"))))
+                                   "splash.xpm")
+                                  (t "splash.pbm")))
                            (t "splash.pbm")))
          (img (create-image image-file))
          (image-width (and img (car (image-size img))))