aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-05-31 13:21:31 -0400
committerGlenn Morris2012-05-31 13:21:31 -0400
commit43f5c7ae53b9afbda100ec26758ff0fb3eadfb48 (patch)
treeea4bf3f3b4177b08045c3d21b821114f50a398cd
parent60b5f1870c11723a9ee7055656bb3e3c848b86fb (diff)
downloademacs-43f5c7ae53b9afbda100ec26758ff0fb3eadfb48.tar.gz
emacs-43f5c7ae53b9afbda100ec26758ff0fb3eadfb48.zip
Fix imagemagick-filter-types for imagemagick-types-enable = t.
-rw-r--r--lisp/image.el15
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/image.el b/lisp/image.el
index 394d44c21e9..e5357742769 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -698,18 +698,19 @@ that match `imagemagick-types-enable' and do not match
698 (when (fboundp 'imagemagick-types) 698 (when (fboundp 'imagemagick-types)
699 (cond ((null imagemagick-types-enable) nil) 699 (cond ((null imagemagick-types-enable) nil)
700 ((eq imagemagick-types-inhibit t) nil) 700 ((eq imagemagick-types-inhibit t) nil)
701 ((eq imagemagick-types-enable t) (imagemagick-types))
702 (t 701 (t
703 (delq nil 702 (delq nil
704 (mapcar 703 (mapcar
705 (lambda (type) 704 (lambda (type)
706 (unless (memq type imagemagick-types-inhibit) 705 (unless (memq type imagemagick-types-inhibit)
707 (catch 'found 706 (if (eq imagemagick-types-enable t) type
708 (dolist (enable imagemagick-types-enable nil) 707 (catch 'found
709 (if (cond ((symbolp enable) (eq enable type)) 708 (dolist (enable imagemagick-types-enable nil)
710 ((stringp enable) 709 (if (cond ((symbolp enable) (eq enable type))
711 (string-match enable (symbol-name type)))) 710 ((stringp enable)
712 (throw 'found type)))))) 711 (string-match enable
712 (symbol-name type))))
713 (throw 'found type)))))))
713 (imagemagick-types))))))) 714 (imagemagick-types)))))))
714 715
715(defvar imagemagick--file-regexp nil 716(defvar imagemagick--file-regexp nil