Commit 43f5c7ae authored by Glenn Morris's avatar Glenn Morris

Fix imagemagick-filter-types for imagemagick-types-enable = t.

parent 60b5f187
...@@ -698,18 +698,19 @@ that match `imagemagick-types-enable' and do not match ...@@ -698,18 +698,19 @@ that match `imagemagick-types-enable' and do not match
(when (fboundp 'imagemagick-types) (when (fboundp 'imagemagick-types)
(cond ((null imagemagick-types-enable) nil) (cond ((null imagemagick-types-enable) nil)
((eq imagemagick-types-inhibit t) nil) ((eq imagemagick-types-inhibit t) nil)
((eq imagemagick-types-enable t) (imagemagick-types))
(t (t
(delq nil (delq nil
(mapcar (mapcar
(lambda (type) (lambda (type)
(unless (memq type imagemagick-types-inhibit) (unless (memq type imagemagick-types-inhibit)
(catch 'found (if (eq imagemagick-types-enable t) type
(dolist (enable imagemagick-types-enable nil) (catch 'found
(if (cond ((symbolp enable) (eq enable type)) (dolist (enable imagemagick-types-enable nil)
((stringp enable) (if (cond ((symbolp enable) (eq enable type))
(string-match enable (symbol-name type)))) ((stringp enable)
(throw 'found type)))))) (string-match enable
(symbol-name type))))
(throw 'found type)))))))
(imagemagick-types))))))) (imagemagick-types)))))))
(defvar imagemagick--file-regexp nil (defvar imagemagick--file-regexp nil
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment