[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108554: Give ImageMagick lowest priority in image-type-file-name-regexps.

[Chong Yidong]

------------------------------------------------------------
revno: 108554
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2012-06-11 18:16:47 +0800
message:
  Give ImageMagick lowest priority in image-type-file-name-regexps.
  
  * lisp/image.el (imagemagick-register-types): Put the ImageMagick
  entry at the end of image-type-file-name-regexps.
modified:
  lisp/ChangeLog
  lisp/image.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-06-11 00:46:21 +0000
+++ b/lisp/ChangeLog    2012-06-11 10:16:47 +0000
@@ -1,3 +1,8 @@
+2012-06-11  Chong Yidong  <address@hidden>
+
+       * image.el (imagemagick-register-types): Put the ImageMagick entry
+       at the end of image-type-file-name-regexps.
+
 2012-06-11  Johan Bockgård  <address@hidden>
 
        * emacs-lisp/pcase.el (pcase-UPAT, pcase-QPAT): New edebug specs.

=== modified file 'lisp/image.el'
--- a/lisp/image.el     2012-06-04 13:02:23 +0000
+++ b/lisp/image.el     2012-06-11 10:16:47 +0000
@@ -747,7 +747,10 @@
          (push (cons re 'image-mode) auto-mode-alist))
        (if itfnr-elt
            (setcar itfnr-elt re)
-         (push (cons re 'imagemagick) image-type-file-name-regexps)))
+         ;; Append to `image-type-file-name-regexps', so that we
+         ;; preferentially use specialized image libraries.
+         (add-to-list 'image-type-file-name-regexps
+                      (cons re 'imagemagick) t)))
       (setq imagemagick--file-regexp re))))
 
 (defcustom imagemagick-types-inhibit