Tweak startup image choice logic.

* startup.el (fancy-splash-head): Use splash.svg even if librsvg
is uninstalled, if imagemagick is installed.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a251c45f323bf67c571dc3abd01a95a881a6afc9..39f5f8435d0d2ae889be78c9155650d3853d90a7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-11  Chong Yidong  <cyd@gnu.org>
+
+       * startup.el (fancy-splash-head): Use splash.svg even if librsvg
+       is uninstalled, if imagemagick is installed.
+
 2012-06-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/cl-lib.el: Use lexical-binding.

diff --git a/lisp/startup.el b/lisp/startup.el
index 59d25626372dfc3dd80dd137777ac94714a412b6..e71fe3230666cff0ab45f1eb774a77b2d2b651ba 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1491,7 +1491,8 @@ a face or button specification."
                                   (if (image-type-available-p 'xpm)
                                       "splash.xpm"
                                     "splash.pbm"))
-                                 ((image-type-available-p 'svg)
+                                 ((or (image-type-available-p 'svg)
+                                      (image-type-available-p 'imagemagick))
                                   "splash.svg")
                                  ((image-type-available-p 'png)
                                   "splash.png")