From c3ea511964facdd86cc41c15f352e995a8061820 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Tue, 9 Dec 2014 05:18:12 +0100 Subject: [PATCH] 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. --- lisp/ChangeLog | 3 +++ lisp/net/shr.el | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e2dbe92c663..54ada6e448c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2014-12-09 Lars Magne Ingebrigtsen + * 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 e23fd0b0ca5..186c9f5757d 100644 --- 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))) -- 2.11.4.GIT