From: Robert Pluim <rpluim@gmail.com>
Date: Tue, 24 Dec 2019 16:21:06 +0000 (+0100)
Subject: Fix problem with emacs -nw / eww / svg
X-Git-Tag: emacs-27.0.90~293
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a9fe6dfa90c780d9dcebae6312ab623ad7e5a2bd;p=emacs.git

Fix problem with emacs -nw / eww / svg

* lisp/net/shr.el (shr-parse-image-data): Don't bug out on
non-visual Emacs versions on SVG images (bug#38507).
---

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 22d4cde34a7..97f8bed88c1 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1197,7 +1197,8 @@ Return a string with image data."
 	     (libxml-parse-xml-region (point) (point-max)) 'utf-8)))
     ;; SVG images often do not have a specified foreground/background
     ;; color, so wrap them in styles.
-    (when (eq content-type 'image/svg+xml)
+    (when (and (display-images-p)
+               (eq content-type 'image/svg+xml))
       (setq data (svg--wrap-svg data)))
     (list data content-type)))