From: Glenn Morris <rgm@gnu.org>
Date: Thu, 31 May 2012 17:21:31 +0000 (-0400)
Subject: Fix imagemagick-filter-types for imagemagick-types-enable = t.
X-Git-Tag: emacs-24.2.90~471^2~6^2~37
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=43f5c7ae53b9afbda100ec26758ff0fb3eadfb48;p=emacs.git

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

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
   (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