Commit e69df516 authored by Stefan Monnier's avatar Stefan Monnier

* lisp/image.el (imagemagick-register-types): Use regexp-opt.

parent b41c3a35
2011-09-16 Stefan Monnier <monnier@iro.umontreal.ca>
* image.el (imagemagick-register-types): Use regexp-opt.
2011-09-15 Chong Yidong <cyd@stupidchicken.com>
* 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 <rrt@sc3d.org>
* 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 <juri@jurta.org>
......
......@@ -695,16 +695,14 @@ Emacs visits them in Image mode.
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)
......
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