procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Glenn Morris 2012-05-31 13:21:31 -04:00
parent 60b5f1870c
commit 43f5c7ae53
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lisp/image.el
View file

@ -698,18 +698,19 @@ that match `imagemagick-types-enable' and do not match
(when (fboundp 'imagemagick-types)
(cond ((null imagemagick-types-enable) nil)
((eq imagemagick-types-inhibit t) nil)
((eq imagemagick-types-enable t) (imagemagick-types))
(t
(delq nil
(mapcar
(lambda (type)
(unless (memq type imagemagick-types-inhibit)
(catch 'found
(dolist (enable imagemagick-types-enable nil)
(if (cond ((symbolp enable) (eq enable type))
((stringp enable)
(string-match enable (symbol-name type))))
(throw 'found type))))))
(if (eq imagemagick-types-enable t) type
(catch 'found
(dolist (enable imagemagick-types-enable nil)
(if (cond ((symbolp enable) (eq enable type))
((stringp enable)
(string-match enable
(symbol-name type))))
(throw 'found type)))))))
(imagemagick-types)))))))
(defvar imagemagick--file-regexp nil