summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2012-02-06 20:55:20 -0800
committerGlenn Morris <rgm@gnu.org>2012-02-06 20:55:20 -0800
commitfe93bc91f85bce40cdaff32c58fda75d185e5f33 (patch)
treed6ff1184998905e691daa4e9b73681fc4662fecd
parente80e18250175382ecb6233ec0184c75ffb776a3c (diff)
downloademacs-fe93bc91f85bce40cdaff32c58fda75d185e5f33.tar.gz
* doc/emacs/files.texi (File Conveniences): Mention ImageMagick images.
-rw-r--r--doc/emacs/ChangeLog4
-rw-r--r--doc/emacs/files.texi21
2 files changed, 16 insertions, 9 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index ab4161c75b8..a5a54dad049 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-07 Glenn Morris <rgm@gnu.org>
+
+ * files.texi (File Conveniences): Mention ImageMagick images.
+
2012-02-05 Glenn Morris <rgm@gnu.org>
* trouble.texi (Checklist): Mention debug-on-event.
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index b2eb68d2812..b34b96126ad 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1915,15 +1915,18 @@ point. Partial Completion mode offers other features extending
mode allows you to toggle between displaying the file as an image in
the Emacs buffer, and displaying its underlying text representation,
using the command @kbd{C-c C-c} (@code{image-toggle-display}). This
-works only when Emacs can display the specific image type. If the
-displayed image is wider or taller than the frame, the usual point
-motion keys (@kbd{C-f}, @kbd{C-p}, and so forth) cause different parts
-of the image to be displayed. If the image can be animated, then
-the command @kbd{RET} (@code{image-toggle-animation}), will start (or
-stop) animating it. Animation plays once, unless the option
-@code{image-animate-loop} is non-@code{nil}. Currently, Emacs only
-supports animated GIF files (@pxref{Animated Images,,, elisp, The Emacs
-Lisp Reference Manual}).
+works only when Emacs can display the specific image type@footnote{If
+your Emacs was compiled with ImageMagick support, then after using
+@code{imagemagick-register-types}, you can view in Image mode any
+image type that ImageMagick supports; @pxref{ImageMagick Images,,,
+elisp, The Emacs Lisp Reference Manual}}. If the displayed image is wider
+or taller than the frame, the usual point motion keys (@kbd{C-f},
+@kbd{C-p}, and so forth) cause different parts of the image to be
+displayed. If the image can be animated, then the command @kbd{RET}
+(@code{image-toggle-animation}), will start (or stop) animating it.
+Animation plays once, unless the option @code{image-animate-loop} is
+non-@code{nil}. Currently, Emacs only supports animated GIF files
+(@pxref{Animated Images,,, elisp, The Emacs Lisp Reference Manual}).
@findex thumbs-mode
@findex mode, thumbs