From 399653d69713b1eb4b1c6cd38b7d3a99270387dc Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 8 Sep 2010 19:25:12 -0700 Subject: [PATCH] Tiny image.el fixes. * lisp/image.el (imagemagick-types-inhibit): Add :type, :version, :group. (imagemagick-register-types): Doc fix. --- lisp/ChangeLog | 5 +++++ lisp/image.el | 15 +++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4cfab866c82..5608a04d4c8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-09-09 Glenn Morris + + * image.el (imagemagick-types-inhibit): Add :type, :version, :group. + (imagemagick-register-types): Doc fix. + 2010-09-08 Stefan Monnier * progmodes/octave-mod.el (electric-indent-chars): Silence bytecomp. diff --git a/lisp/image.el b/lisp/image.el index 20e3d5f85aa..2ca2971b4aa 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -697,21 +697,28 @@ shall be displayed." (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))))) -- 2.11.4.GIT