[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108439: Fix imagemagick-filter-ty
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108439: Fix imagemagick-filter-types for imagemagick-types-enable = t. |
Date: |
Fri, 02 Nov 2012 02:24:54 -0000 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108439
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2012-05-31 13:21:31 -0400
message:
Fix imagemagick-filter-types for imagemagick-types-enable = t.
modified:
lisp/image.el
=== modified file 'lisp/image.el'
--- a/lisp/image.el 2012-05-31 17:14:46 +0000
+++ b/lisp/image.el 2012-05-31 17:21:31 +0000
@@ -698,18 +698,19 @@
(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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r108439: Fix imagemagick-filter-types for imagemagick-types-enable = t.,
Glenn Morris <=