summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2019-09-29 13:32:30 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2019-09-29 13:32:30 +0200
commitab2a8f70775ff1c51e3b3b5f7b337c3fe5132db2 (patch)
tree757fe3c2f7649cf726e401989ef058c4660e97f8
parentf19879c36a1613ffe15d13457791817c57faa82e (diff)
downloademacs-ab2a8f70775ff1c51e3b3b5f7b337c3fe5132db2.tar.gz
Move convert-images-externally documentation to Emacs manual
* doc/emacs/files.texi (File Conveniences): Move bit about convert-images-externally to user manual from lispref manual.
-rw-r--r--doc/emacs/files.texi9
-rw-r--r--doc/lispref/display.texi8
2 files changed, 9 insertions, 8 deletions
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 36ef1dcea21..35ba30adb34 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -2161,6 +2161,15 @@ never be rendered using ImageMagick, regardless of the value of
but Emacs should not). To disable ImageMagick entirely, change
@code{imagemagick-types-inhibit} to @code{t}.
+@vindex convert-images-externally
+ If Emacs doesn't have native support for the image format in
+question, and @code{convert-images-externally} is non-@code{nil},
+Emacs will try to determine whether there are external utilities that
+can be used to transform the image in question to @acronym{PNG} before
+displaying. GraphicsMagick, ImageMagick and @command{ffmpeg} are
+currently supported for image conversions.
+
+
@findex thumbs-mode
@cindex mode, Thumbs
The Image-Dired package can also be used to view images as
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index a661eca13f0..fd6820897f3 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -6044,14 +6044,6 @@ properties---for example,
(create-image "foo.xpm" 'xpm nil :heuristic-mask t)
@end example
-@vindex convert-images-externally
-If Emacs doesn't have native support for the image format in question,
-and @code{convert-images-externally} is non-@code{nil}, Emacs will try
-to determine whether there are external utilities that can be used to
-transform the image in question to @acronym{PNG} before displaying.
-GraphicsMagick, ImageMagick and @command{ffmpeg} are currently
-supported for image conversions.
-
The function returns @code{nil} if images of this type are not
supported. Otherwise it returns an image descriptor.
@end defun