aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Ingebrigtsen2019-09-29 13:32:30 +0200
committerLars Ingebrigtsen2019-09-29 13:32:30 +0200
commitab2a8f70775ff1c51e3b3b5f7b337c3fe5132db2 (patch)
tree757fe3c2f7649cf726e401989ef058c4660e97f8
parentf19879c36a1613ffe15d13457791817c57faa82e (diff)
downloademacs-ab2a8f70775ff1c51e3b3b5f7b337c3fe5132db2.tar.gz
emacs-ab2a8f70775ff1c51e3b3b5f7b337c3fe5132db2.zip
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
2161but Emacs should not). To disable ImageMagick entirely, change 2161but Emacs should not). To disable ImageMagick entirely, change
2162@code{imagemagick-types-inhibit} to @code{t}. 2162@code{imagemagick-types-inhibit} to @code{t}.
2163 2163
2164@vindex convert-images-externally
2165 If Emacs doesn't have native support for the image format in
2166question, and @code{convert-images-externally} is non-@code{nil},
2167Emacs will try to determine whether there are external utilities that
2168can be used to transform the image in question to @acronym{PNG} before
2169displaying. GraphicsMagick, ImageMagick and @command{ffmpeg} are
2170currently supported for image conversions.
2171
2172
2164@findex thumbs-mode 2173@findex thumbs-mode
2165@cindex mode, Thumbs 2174@cindex mode, Thumbs
2166 The Image-Dired package can also be used to view images as 2175 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,
6044(create-image "foo.xpm" 'xpm nil :heuristic-mask t) 6044(create-image "foo.xpm" 'xpm nil :heuristic-mask t)
6045@end example 6045@end example
6046 6046
6047@vindex convert-images-externally
6048If Emacs doesn't have native support for the image format in question,
6049and @code{convert-images-externally} is non-@code{nil}, Emacs will try
6050to determine whether there are external utilities that can be used to
6051transform the image in question to @acronym{PNG} before displaying.
6052GraphicsMagick, ImageMagick and @command{ffmpeg} are currently
6053supported for image conversions.
6054
6055The function returns @code{nil} if images of this type are not 6047The function returns @code{nil} if images of this type are not
6056supported. Otherwise it returns an image descriptor. 6048supported. Otherwise it returns an image descriptor.
6057@end defun 6049@end defun