Small imagemagick doc fixes

* lisp/image.el (imagemagick-types-inhibit): Doc fix.

* src/image.c (Fimagemagick_types): Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c90d0ac7ea19fbe295cf5a0b20b51157c1e20114..66025e2ec91960eb905b773ce7102ad14e59d1ea 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-02-07  Glenn Morris  <rgm@gnu.org>
 
+       * image.el (imagemagick-types-inhibit): Doc fix.
+
        * cus-start.el (imagemagick-render-type): Add it.
 
 2012-02-06  Lars Ingebrigtsen  <larsi@gnus.org>

diff --git a/lisp/image.el b/lisp/image.el
index c4b51716dad809f45531db544fbf664cc6410d65..53df590b0912fadecb137532c764f9d4697e81e5 100644 (file)
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -686,7 +686,7 @@ The minimum delay between successive frames is 0.01s."
   '(C HTML HTM TXT PDF)
   "ImageMagick types that Emacs should not use ImageMagick to handle.
 This should be a list of symbols, each of which has the same
-names as one of the format tags used internally by ImageMagick;
+name as one of the format tags used internally by ImageMagick;
 see `imagemagick-types'.  Entries in this list are excluded from
 being registered by `imagemagick-register-types'.
 

diff --git a/src/ChangeLog b/src/ChangeLog
index 6438f054432873938690942ad527907f3d61f3d6..5e4d995d8577d8d07a8e359fe9f9cea878d31bcc 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2012-02-07  Glenn Morris  <rgm@gnu.org>
 
+       * image.c (Fimagemagick_types): Doc fix.
+
        * image.c (imagemagick-render-type): Change it from a lisp object
        to an integer.  Move the doc here from the lisp manual.
        Treat all values not equal to 0 the same.

diff --git a/src/image.c b/src/image.c
index 21f97c32a0cda1848adcca1a628c291af05f0f86..b2951dd70fbc2f99b4e3688ba391e1cfda1e6262 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -7983,6 +7983,7 @@ DEFUN ("imagemagick-types", Fimagemagick_types, Simagemagick_types, 0, 0, 0,
 Each entry in this list is a symbol named after an ImageMagick format
 tag.  See the ImageMagick manual for a list of ImageMagick formats and
 their descriptions (http://www.imagemagick.org/script/formats.php).
+You can also try the shell command: `identify -list format'.
 
 Note that ImageMagick recognizes many file-types that Emacs does not
 recognize as images, such as C.  See `imagemagick-types-inhibit'.  */)