[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108470: * etc/NEWS: Update for renamed variable.

[Glenn Morris]

------------------------------------------------------------
revno: 108470
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2012-06-03 16:07:48 -0700
message:
  * etc/NEWS: Update for renamed variable.
  * lisp/image.el (imagemagick-types-inhibit): Bump :version.
modified:
  etc/NEWS
  lisp/image.el

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-06-03 10:54:22 +0000
+++ b/etc/NEWS  2012-06-03 23:07:48 +0000
@@ -63,14 +63,14 @@
 ** 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 at startup, or when customizing imagemagick-types-enable
-or imagemagick-types-inhibit.
+automatically at startup, or when customizing a relevant imagemagick-
+option.
 
 *** Setting `imagemagick-types-inhibit' to t now disables the use of
 ImageMagick to view images.  You must call imagemagick-register-types
 afterwards if you do not use customize to change this.
 
-*** The new variable `imagemagick-types-enable' also affects which
+*** The new variable `imagemagick-enabled-types' also affects which
 ImageMagick types are treated as images.  The function
 `imagemagick-filter-types' returns the list of types that will be
 treated as images.

=== modified file 'lisp/image.el'
--- a/lisp/image.el     2012-06-02 07:30:07 +0000
+++ b/lisp/image.el     2012-06-03 23:07:48 +0000
@@ -770,7 +770,7 @@
   :set (lambda (symbol value)
         (set-default symbol value)
         (imagemagick-register-types))
-  :version "24.1"
+  :version "24.2"
   :group 'image)
 
 (defcustom imagemagick-enabled-types