From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Mon, 30 Sep 2019 04:00:52 +0000 (+0200)
Subject: Rename the new convert-images-externally variable
X-Git-Tag: emacs-27.0.90~1361
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=88250102707799bf961c3f1a3d80607b99502704;p=emacs.git

Rename the new convert-images-externally variable

* doc/emacs/files.texi (File Conveniences): Adjust documentation.

* lisp/image.el (image-use-external-converter): Rename from
convert-images-externally.
---

diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 35ba30adb34..0ff64d529c0 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -2161,9 +2161,9 @@ 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
+@vindex image-use-external-converter
   If Emacs doesn't have native support for the image format in
-question, and @code{convert-images-externally} is non-@code{nil},
+question, and @code{image-use-external-converter} 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
diff --git a/lisp/image.el b/lisp/image.el
index 07ffefcbc5b..eaa6ed3b0ea 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -141,7 +141,7 @@ based on the font pixel size."
                  (const :tag "Automatically compute" auto))
   :version "26.1")
 
-(defcustom convert-images-externally nil
+(defcustom image-use-external-converter nil
   "If non-nil, `create-image' will use external converters for exotic formats.
 Emacs handles most of the common image formats (SVG, JPEG, PNG, GIF
 and some others) internally, but images that don't have native
@@ -386,7 +386,7 @@ Optional DATA-P non-nil means SOURCE is a string containing image data."
 		   (image-type-from-data source)
 		 (or (image-type-from-file-header source)
 		     (image-type-from-file-name source)
-                     (and convert-images-externally
+                     (and image-use-external-converter
                           (progn
                             (require 'image-converter)
                             (image-convert-p source))))))