[Emacs-diffs] /srv/bzr/emacs/trunk r107155: Small imagemagick doc fixes

[Glenn Morris]

------------------------------------------------------------
revno: 107155
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-02-06 19:46:18 -0800
message:
  Small imagemagick doc fixes
  
  * lisp/image.el (imagemagick-types-inhibit): Doc fix.
  
  * src/image.c (Fimagemagick_types): Doc fix.
modified:
  lisp/ChangeLog
  lisp/image.el
  src/ChangeLog
  src/image.c

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-07 03:31:29 +0000
+++ b/lisp/ChangeLog    2012-02-07 03:46:18 +0000
@@ -1,5 +1,7 @@
 2012-02-07  Glenn Morris  <address@hidden>
 
+       * image.el (imagemagick-types-inhibit): Doc fix.
+
        * cus-start.el (imagemagick-render-type): Add it.
 
 2012-02-06  Lars Ingebrigtsen  <address@hidden>

=== modified file 'lisp/image.el'
--- a/lisp/image.el     2012-02-04 02:09:34 +0000
+++ b/lisp/image.el     2012-02-07 03:46:18 +0000
@@ -686,7 +686,7 @@
   '(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'.
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-02-07 03:31:29 +0000
+++ b/src/ChangeLog     2012-02-07 03:46:18 +0000
@@ -1,5 +1,7 @@
 2012-02-07  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'src/image.c'
--- a/src/image.c       2012-02-07 03:31:29 +0000
+++ b/src/image.c       2012-02-07 03:46:18 +0000
@@ -7983,6 +7983,7 @@
 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'.  */)