[Emacs-diffs] /srv/bzr/emacs/trunk r110529: Document 24.3 ImageMagick changes.

[Chong Yidong]

------------------------------------------------------------
revno: 110529
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2012-10-13 09:18:52 +0800
message:
  Document 24.3 ImageMagick changes.
  
  * doc/emacs/files.texi (File Conveniences): ImageMagick enabled by default.
  
  * doc/lispref/display.texi (ImageMagick Images): ImageMagick enabled by 
default.
modified:
  doc/emacs/ChangeLog
  doc/emacs/files.texi
  doc/lispref/ChangeLog
  doc/lispref/display.texi
  etc/NEWS

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2012-10-10 02:52:55 +0000
+++ b/doc/emacs/ChangeLog       2012-10-13 01:18:52 +0000
@@ -1,3 +1,7 @@
+2012-10-13  Chong Yidong  <address@hidden>
+
+       * files.texi (File Conveniences): ImageMagick enabled by default.
+
 2012-10-10  Dani Moncayo  <address@hidden>
 
        * basic.texi (Arguments): Fix typos.

=== modified file 'doc/emacs/files.texi'
--- a/doc/emacs/files.texi      2012-09-23 10:46:50 +0000
+++ b/doc/emacs/files.texi      2012-10-13 01:18:52 +0000
@@ -1931,15 +1931,22 @@
 files.
 
 @cindex ImageMagick support
-  If your Emacs was compiled with ImageMagick support, it is possible
-to view a much wider variety of image types in Image mode, by
-rendering the images via ImageMagick.  However, this feature is
-currently disabled by default.  To enable it, add the following line
-to your init file:
-
address@hidden
-(imagemagick-register-types)
address@hidden example
address@hidden imagemagick-enabled-types
address@hidden imagemagick-types-inhibit
+  If Emacs was compiled with support for the ImageMagick library, it
+can use ImageMagick to render a wide variety of images.  The variable
address@hidden lists the image types that Emacs may
+render using ImageMagick; each element in the list should be an
+internal ImageMagick name for an image type, as a symbol or an
+equivalent string (e.g.@: @code{BMP} for @file{.bmp} images).  To
+enable ImageMagick for all possible image types, change
address@hidden to @code{t}.  The variable
address@hidden lists the image types which should
+never be rendered using ImageMagick, regardless of the value of
address@hidden (the default list includes types like
address@hidden and @code{HTML}, which ImageMagick can render as an ``image''
+but Emacs should not).  To disable ImageMagick entirely, change
address@hidden to @code{t}.
 
 @findex thumbs-mode
 @findex mode, thumbs

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-10-10 02:52:55 +0000
+++ b/doc/lispref/ChangeLog     2012-10-13 01:18:52 +0000
@@ -1,3 +1,7 @@
+2012-10-13  Chong Yidong  <address@hidden>
+
+       * display.texi (ImageMagick Images): ImageMagick enabled by default.
+
 2012-10-05  Chong Yidong  <address@hidden>
 
        * minibuf.texi (Basic Completion): Clarify list form of completion

=== modified file 'doc/lispref/display.texi'
--- a/doc/lispref/display.texi  2012-09-18 05:14:42 +0000
+++ b/doc/lispref/display.texi  2012-10-13 01:18:52 +0000
@@ -4579,57 +4579,35 @@
 @cindex images, support for more formats
 
   If you build Emacs with ImageMagick support, you can use the
-ImageMagick library to load many image formats.  The image type symbol
+ImageMagick library to load many image formats (@pxref{File
+Conveniences,,, emacs, The GNU Emacs Manual}).  The image type symbol
 for images loaded via ImageMagick is @code{imagemagick}, regardless of
 the actual underlying image format.
 
 @defun imagemagick-types
 This function returns a list of image file extensions supported by the
-current ImageMagick installation.
address@hidden defun
-
-  By default, Emacs does not use ImageMagick to display images in
-Image mode, e.g.@: when visiting such files with @kbd{C-x C-f}.  This
-feature is enabled by calling @code{imagemagick-register-types}.
-
address@hidden imagemagick-register-types
-This function enables using Image mode to visit image files supported
-by ImageMagick.  @xref{File Conveniences,,, emacs, The GNU Emacs
-Manual}.  It also causes @code{create-image} and other helper
-functions to associate such file names with the @code{imagemagick}
-image type (@pxref{Defining Images}).
-
-All image file extensions supported by ImageMagick are registered,
-except those specified in @code{imagemagick-types-inhibit}.  If Emacs
-was not compiled with ImageMagick support, this function does nothing.
address@hidden defun
+current ImageMagick installation.  Each list element is a symbol
+representing an internal ImageMagick name for an image type, such as
address@hidden for @file{.bmp} images.
address@hidden defun
+
address@hidden imagemagick-enabled-types
+The value of this variable is a list of ImageMagick image types which
+Emacs may attempt to render using ImageMagick.  Each list element
+should be one of the symbols in the list returned by
address@hidden, or an equivalent string.  Alternatively, a
+value of @code{t} enables ImageMagick for all possible image types.
+Regardless of the value of this variable,
address@hidden (see below) takes precedence.
address@hidden defopt
 
 @defopt imagemagick-types-inhibit
-This variable specifies a list of image types that should @emph{not}
-be registered by @code{imagemagick-register-types}.  Each entry in
-this list should be one of the symbols returned by
address@hidden  The default value lists several file types
-that are considered ``images'' by ImageMagick, but which should not be
-considered as images by Emacs, including C files and HTML files.
+The value of this variable lists the ImageMagick image types which
+should never be rendered using ImageMagick, regardless of the value of
address@hidden  A value of @code{t} disables
+ImageMagick entirely.
 @end defopt
 
address@hidden
address@hidden I don't know what this means.  I suspect it means eg loading jpg
address@hidden images via libjpeg or ImageMagick.  But it doesn't work.
address@hidden If you don't have libjpeg support compiled in, you cannot
address@hidden view jpeg images, even if you have imagemagick support:
address@hidden http://debbugs.gnu.org/9045
address@hidden And if you have both compiled in, then you always get
address@hidden the libjpeg version:
address@hidden http://debbugs.gnu.org/10746
-There may be overlap between image loaders in your Emacs installation,
-and you may prefer to use a different one for a given image type
-(which loader will be used in practice depends on the priority of the
-loaders).  
-For example, if you never want to use the ImageMagick loader to view
-JPEG files, add @code{JPG} to this list.
address@hidden ignore
-
   Images loaded with ImageMagick support the following additional
 image descriptor properties:
 

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-10-08 16:20:59 +0000
+++ b/etc/NEWS  2012-10-13 01:18:52 +0000
@@ -137,16 +137,16 @@
 explicitly to install ImageMagick image types; that function is called
 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-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.
-
+---
 *** Images displayed via ImageMagick now support transparency and the
 :background image spec property.