merge from trunk

2 files changed, 4 insertions, 4 deletions

diff --git a/lisp/image.el b/lisp/image.el
index de69490f5b6..d213c5d6d79 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -99,11 +99,11 @@ AUTODETECT can be
  - maybe  auto-detect only if the image type is available
             (see `image-type-available-p').")
 
-(defvar image-content-type-suffixes
+(defvar image-format-suffixes
   '((image/x-icon "ico"))
   "Alist of MIME Content-Type headers to file name suffixes.
 This is used as a hint by the ImageMagick library when detecting
-image types.  If `create-image' is called with a :content-type
+image types.  If `create-image' is called with a :format
 matching found in this alist, the ImageMagick library will be
 told that the data would have this suffix if saved to a file.")
 
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index ed47c502e11..3283712bf0a 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -747,7 +747,7 @@ element is the data blob and the second element is the content-type."
              (image (cond
                      ((eq size 'original)
                       (create-image data nil t :ascent 100
-                                    :content-type content-type))
+                                    :format content-type))
                      ((eq size 'full)
                       (ignore-errors
                         (shr-rescale-image data t content-type)))
@@ -791,7 +791,7 @@ If FORCE, rescale the image anyway."
                                (- (nth 2 edges) (nth 0 edges))))
        :max-height (truncate (* shr-max-image-proportion
                                 (- (nth 3 edges) (nth 1 edges))))
-       :content-type content-type))))
+       :format content-type))))
 
 ;; url-cache-extract autoloads url-cache.
 (declare-function url-cache-create-filename "url-cache" (url))