[Emacs-diffs] /srv/bzr/emacs/trunk r105793: * lisp/image.el (imagemagick-register-types): Use regexp-opt.

[Stefan Monnier]

------------------------------------------------------------
revno: 105793
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2011-09-16 09:46:42 -0400
message:
  * lisp/image.el (imagemagick-register-types): Use regexp-opt.
modified:
  lisp/ChangeLog
  lisp/image.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-15 15:12:15 +0000
+++ b/lisp/ChangeLog    2011-09-16 13:46:42 +0000
@@ -1,3 +1,7 @@
+2011-09-16  Stefan Monnier  <address@hidden>
+
+       * image.el (imagemagick-register-types): Use regexp-opt.
+
 2011-09-15  Chong Yidong  <address@hidden>
 
        * window.el (display-buffer-base-action): Rename from
@@ -13,8 +17,8 @@
        with an older version, remove it.
        (package-menu-mark-delete, package-menu-mark-install)
        (package-menu-mark-unmark): Make unused args optional.
-       (package-menu-mark-obsolete-for-deletion): Use
-       package-menu-get-status instead of a regexp search.
+       (package-menu-mark-obsolete-for-deletion):
+       Use package-menu-get-status instead of a regexp search.
        (package-menu-get-status): Use tabulated-list-entry.
        (package-menu-mark-upgrades): New command.
        (package-menu-mode-map): Bind it to U.  Add it to menu bar.
@@ -296,7 +300,8 @@
 
 2011-09-10  Reuben Thomas  <address@hidden>
 
-       * simple.el (count-words-region): Use buffer if there's no region.
+       * simple.el (count-words-region): Use buffer if there's no region
+       (bug#9429).
 
 2011-09-09  Juri Linkov  <address@hidden>
 

=== modified file 'lisp/image.el'
--- a/lisp/image.el     2011-07-25 01:44:10 +0000
+++ b/lisp/image.el     2011-09-16 13:46:42 +0000
@@ -695,16 +695,14 @@
 
 If Emacs is compiled without ImageMagick support, do nothing."
   (when (fboundp 'imagemagick-types)
-    (let ((im-types (imagemagick-types)))
-      (dolist (im-inhibit imagemagick-types-inhibit)
-       (setq im-types (delq im-inhibit im-types)))
-      (dolist (im-type im-types)
-       (let ((extension
-              (concat "\\." (downcase (symbol-name im-type))
-                      "\\'")))
-         (push (cons extension 'image-mode) auto-mode-alist)
-         (push (cons extension 'imagemagick)
-               image-type-file-name-regexps))))))
+    (let ((im-types '()))
+      (dolist (im-type (imagemagick-types))
+        (unless (memq im-type imagemagick-types-inhibit)
+          (push (downcase (symbol-name im-type)) im-types)))
+      (let ((extension (concat "\\." (regexp-opt im-types) "\\'")))
+        (push (cons extension 'image-mode) auto-mode-alist)
+        (push (cons extension 'imagemagick)
+              image-type-file-name-regexps)))))
 
 (provide 'image)