[Emacs-diffs] /srv/bzr/emacs/trunk r101393: Tiny image.el fixes.

[Glenn Morris]

------------------------------------------------------------
revno: 101393
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2010-09-08 19:25:12 -0700
message:
  Tiny image.el fixes.
  * lisp/image.el (imagemagick-types-inhibit): Add :type, :version, :group.
  (imagemagick-register-types): Doc fix.
modified:
  lisp/ChangeLog
  lisp/image.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-09-08 16:21:23 +0000
+++ b/lisp/ChangeLog    2010-09-09 02:25:12 +0000
@@ -1,3 +1,8 @@
+2010-09-09  Glenn Morris  <address@hidden>
+
+       * image.el (imagemagick-types-inhibit): Add :type, :version, :group.
+       (imagemagick-register-types): Doc fix.
+
 2010-09-08  Stefan Monnier  <address@hidden>
 
        * progmodes/octave-mod.el (electric-indent-chars): Silence bytecomp.

=== modified file 'lisp/image.el'
--- a/lisp/image.el     2010-08-29 16:17:13 +0000
+++ b/lisp/image.el     2010-09-09 02:25:12 +0000
@@ -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)))))