Merge from trunk.

diff --git a/etc/NEWS b/etc/NEWS
index b097757..68744dc 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -60,10 +60,11 @@ name, group names known to the system (where possible).
 ** 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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b346182..36d8123 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-05-25  Glenn Morris  <rgm@gnu.org>
 
+       * 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".

diff --git a/lisp/image.el b/lisp/image.el
index 27e41a5..087cd14 100644 (file)
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -735,6 +735,9 @@ image types are not registered by `imagemagick-register-types'.
 
 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)