aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorEli Zaretskii2019-09-29 10:09:56 +0300
committerEli Zaretskii2019-09-29 10:09:56 +0300
commit82c79220f58caa8ee6b78c8704aa97191c2352c7 (patch)
tree2b648d9ce6ab47a0e7df1687616fbde59719a22e /doc
parent8b5e92921ed9748e13433acf176b03488bc8bedb (diff)
downloademacs-82c79220f58caa8ee6b78c8704aa97191c2352c7.tar.gz
emacs-82c79220f58caa8ee6b78c8704aa97191c2352c7.zip
Improve documentation of image conversion feature
* lisp/image/image-converter.el (image-converter) (image-convert-p, image-convert): * lisp/image.el (convert-images-externally): * etc/NEWS: * doc/lispref/display.texi (Defining Images): Fix recently added documentation.
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/display.texi3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index ec288b1c47d..a661eca13f0 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -6049,7 +6049,8 @@ If Emacs doesn't have native support for the image format in question,
6049and @code{convert-images-externally} is non-@code{nil}, Emacs will try 6049and @code{convert-images-externally} is non-@code{nil}, Emacs will try
6050to determine whether there are external utilities that can be used to 6050to determine whether there are external utilities that can be used to
6051transform the image in question to @acronym{PNG} before displaying. 6051transform the image in question to @acronym{PNG} before displaying.
6052GraphicsMagick, ImageMagick and ffmpeg are currently supported. 6052GraphicsMagick, ImageMagick and @command{ffmpeg} are currently
6053supported for image conversions.
6053 6054
6054The function returns @code{nil} if images of this type are not 6055The function returns @code{nil} if images of this type are not
6055supported. Otherwise it returns an image descriptor. 6056supported. Otherwise it returns an image descriptor.