Make inline SVGs work in shr again

* net/shr.el (shr-dom-print): Don't print comments.
(shr-tag-svg): Give inline SVG images the right type.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e2dbe92c66384766d0eb375904e105ff892c8566..54ada6e448c721a3bc98db8e5672d096b8a5fb59 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2014-12-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * net/shr.el (shr-dom-print): Don't print comments.
+       (shr-tag-svg): Give inline SVG images the right type.
+
        * net/eww.el (eww-update-header-line-format): Mark valid/invalid
        certificates in the header line.
        (eww-invalid-certificate, eww-valid-certificate): New faces.

diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index e23fd0b0ca50ce501944bdb3f93dbfe2cb86cba6..186c9f5757d7fd0ac3d29fc2489115462e43dee3 100644 (file)
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1019,6 +1019,8 @@ ones, in case fg and bg are nil."
       (cond
        ((stringp elem)
        (insert elem))
+       ((eq (dom-tag elem) 'comment)
+       )
        ((or (not (eq (dom-tag elem) 'image))
            ;; Filter out blocked elements inside the SVG image.
            (not (setq url (dom-attr elem ':xlink:href)))
@@ -1031,7 +1033,8 @@ ones, in case fg and bg are nil."
 (defun shr-tag-svg (dom)
   (when (and (image-type-available-p 'svg)
             (not shr-inhibit-images))
-    (funcall shr-put-image-function (shr-dom-to-xml dom) "SVG Image")))
+    (funcall shr-put-image-function (list (shr-dom-to-xml dom) 'image/svg+xml)
+            "SVG Image")))
 
 (defun shr-tag-sup (dom)
   (let ((start (point)))