procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Touch up previous shr-dom-to-xml encoding change

Browse source 
* lisp/net/shr.el (shr-dom-to-xml): Include an XML declaration if
we're encoding the data.
(shr-parse-image-data): Add comment about why encoding is necessary.
This commit is contained in:
Lars Ingebrigtsen 2019-10-03 16:15:15 +02:00
parent 0b5fe611e9
commit cbe3f5f720
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lisp/net/shr.el
View file

@ -1180,7 +1180,9 @@ Return a string with image data."
(eq content-type 'image/svg+xml))
(setq data
;; Note that libxml2 doesn't parse everything perfectly,
;; so glitches may occur during this transformation.
;; so glitches may occur during this transformation. And
;; encode as utf-8: There may be text (and other elements)
;; that are non-ASCII.
(shr-dom-to-xml
(libxml-parse-xml-region (point) (point-max)) 'utf-8)))
;; SVG images often do not have a specified foreground/background
@ -1342,7 +1344,10 @@ ones, in case fg and bg are nil."
(with-temp-buffer
(shr-dom-print dom)
(when charset
(encode-coding-region (point-min) (point-max) charset))
(encode-coding-region (point-min) (point-max) charset)
(goto-char (point-min))
(insert (format "<?xml version=\"1.0\" encoding=\"%s\"?>\n"
charset)))
(buffer-string)))
(defun shr-dom-print (dom)