Mercurial > emacs
changeset 110284:60d36a04fc87
Tiny image.el fixes.
* lisp/image.el (imagemagick-types-inhibit): Add :type, :version, :group.
(imagemagick-register-types): Doc fix.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 08 Sep 2010 19:25:12 -0700 |
| parents | 1021c96a663e |
| children | dc71fe13a42c |
| files | lisp/ChangeLog lisp/image.el |
| diffstat | 2 files changed, 16 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Sep 08 19:21:12 2010 -0700 +++ b/lisp/ChangeLog Wed Sep 08 19:25:12 2010 -0700 @@ -1,3 +1,8 @@ +2010-09-09 Glenn Morris <rgm@gnu.org> + + * image.el (imagemagick-types-inhibit): Add :type, :version, :group. + (imagemagick-register-types): Doc fix. + 2010-09-08 Stefan Monnier <monnier@iro.umontreal.ca> * progmodes/octave-mod.el (electric-indent-chars): Silence bytecomp.
--- a/lisp/image.el Wed Sep 08 19:21:12 2010 -0700 +++ b/lisp/image.el Wed Sep 08 19:25:12 2010 -0700 @@ -697,21 +697,28 @@ (defcustom imagemagick-types-inhibit '(C HTML HTM TXT PDF) - "Types the imagemagick loader should not try to handle.") + ;; FIXME what are the possible options? + ;; Are these actually file-name extensions? + ;; Why are these upper-case when eg image-types is lower-case? + "Types the ImageMagick loader should not try to handle." + :type '(choice (const :tag "Let ImageMagick handle all the types it can" nil) + (repeat symbol)) + :version "24.1" + :group 'image) ;;;###autoload (defun imagemagick-register-types () - "Register file types that imagemagick is able to handle." + "Register the file types that ImageMagick is able to handle." (let ((im-types (imagemagick-types))) (dolist (im-inhibit imagemagick-types-inhibit) (setq im-types (remove im-inhibit im-types))) (dolist (im-type im-types) (let ((extension (downcase (symbol-name im-type)))) (push - (cons (concat "\\." extension "\\'") 'image-mode) + (cons (concat "\\." extension "\\'") 'image-mode) auto-mode-alist) (push - (cons (concat "\\." extension "\\'") 'imagemagick) + (cons (concat "\\." extension "\\'") 'imagemagick) image-type-file-name-regexps)))))