[Emacs-diffs] /srv/bzr/emacs/trunk r108561: Tweak startup image choice logic.

[Chong Yidong]

------------------------------------------------------------
revno: 108561
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2012-06-11 23:55:32 +0800
message:
  Tweak startup image choice logic.
  
  * startup.el (fancy-splash-head): Use splash.svg even if librsvg
  is uninstalled, if imagemagick is installed.
modified:
  lisp/ChangeLog
  lisp/startup.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-06-11 15:52:50 +0000
+++ b/lisp/ChangeLog    2012-06-11 15:55:32 +0000
@@ -1,3 +1,8 @@
+2012-06-11  Chong Yidong  <address@hidden>
+
+       * startup.el (fancy-splash-head): Use splash.svg even if librsvg
+       is uninstalled, if imagemagick is installed.
+
 2012-06-11  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/cl-lib.el: Use lexical-binding.

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2012-06-08 13:18:26 +0000
+++ b/lisp/startup.el   2012-06-11 15:55:32 +0000
@@ -1491,7 +1491,8 @@
                                   (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")