diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/image.el | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 026e84058ef..6872e3d2235 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-06-11 Chong Yidong <cyd@gnu.org> + + * image.el (imagemagick-register-types): Put the ImageMagick entry + at the end of image-type-file-name-regexps. + 2012-06-11 Johan Bockgård <bojohan@gnu.org> * emacs-lisp/pcase.el (pcase-UPAT, pcase-QPAT): New edebug specs. diff --git a/lisp/image.el b/lisp/image.el index a47e945c26a..f5a2de5e595 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -747,7 +747,10 @@ If Emacs is compiled without ImageMagick support, this does nothing." (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 |