[Emacs-diffs] /srv/bzr/emacs/trunk r108369: * lisp/image.el (imagemagick-types-inhibit): Doc fix.

[Glenn Morris]

------------------------------------------------------------
revno: 108369
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2012-05-25 16:24:58 -0400
message:
  * lisp/image.el (imagemagick-types-inhibit): Doc fix.
  * etc/NEWS: Related edits.
modified:
  etc/NEWS
  lisp/ChangeLog
  lisp/image.el

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-05-25 00:55:40 +0000
+++ b/etc/NEWS  2012-05-25 20:24:58 +0000
@@ -60,10 +60,11 @@
 ** ImageMagick support, if available, is automatically enabled.
 It is no longer necessary to call `imagemagick-register-types'
 explicitly to install ImageMagick image types; that function is called
-automatically when setting `imagemagick-types-inhibit'.
+automatically at startup or when customizing `imagemagick-types-inhibit'.
 
 *** Setting `imagemagick-types-inhibit' to t now disables the use of
-ImageMagick to view images, set
+ImageMagick to view images.  You must call imagemagick-register-types
+afterwards if you do not use customize to change this.
 
 ** String values for `initial-buffer-choice' also apply to emacsclient
 frames, if emacsclient is only told to open a new frame without

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-25 18:57:51 +0000
+++ b/lisp/ChangeLog    2012-05-25 20:24:58 +0000
@@ -1,5 +1,7 @@
 2012-05-25  Glenn Morris  <address@hidden>
 
+       * image.el (imagemagick-types-inhibit): Doc fix.
+
        * version.el: Remove no-byte-compile and associated formatting.
        * loadup.el: No need to load version.el uncompiled.  AFAICS, this
        is ancient code from when there was an "inc-vers.el".

=== modified file 'lisp/image.el'
--- a/lisp/image.el     2012-04-26 08:43:20 +0000
+++ b/lisp/image.el     2012-05-25 20:24:58 +0000
@@ -735,6 +735,9 @@
 
 If the value is t, inhibit the use of ImageMagick for images.
 
+If you change this without using customize, you must call
+`imagemagick-register-types' afterwards.
+
 If Emacs is compiled without ImageMagick support, this variable
 has no effect."
   :type '(choice (const :tag "Support all ImageMagick types" nil)