[Emacs-diffs] Changes to emacs/lisp/startup.el,v

[Juanma Barranquero]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      08/07/18 14:22:25

Index: lisp/startup.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/startup.el,v
retrieving revision 1.496
retrieving revision 1.497
diff -u -b -r1.496 -r1.497
--- lisp/startup.el     16 Jul 2008 23:24:43 -0000      1.496
+++ lisp/startup.el     18 Jul 2008 14:22:24 -0000      1.497
@@ -1442,15 +1442,17 @@
   (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))))