From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 27 Feb 2019 22:35:51 +0000 (-0800)
Subject: Escape HTML NUL as &#0; in eww
X-Git-Tag: emacs-27.0.90~3527
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4927f94792ffaab985e0aa3c977eb19308f067cf;p=emacs.git

Escape HTML NUL as &#0; in eww

* lisp/net/eww.el (eww-display-html): Escape NUL as &#0; as this
is more appropriate for HTML.
---

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 3ec6c1cfd3b..3e9334532c6 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -471,11 +471,9 @@ Currently this means either text/html or application/xhtml+xml."
 		    (decode-coding-region (point) (point-max) encode)
 		  (coding-system-error nil))
 		(save-excursion
-		  ;; Remove CRLF and NULL before parsing.
-                  (while (re-search-forward "\\(\r$\\)\\|\\(\000\\)" nil t)
-                    (replace-match (if (match-beginning 1)
-                                       ""
-                                     "\\0") t t)))
+		  ;; Remove CRLF and replace NUL with &#0; before parsing.
+		  (while (re-search-forward "\\(\r$\\)\\|\0" nil t)
+		    (replace-match (if (match-beginning 1) "" "&#0;") t t)))
 		(libxml-parse-html-region (point) (point-max))))))
 	(source (and (null document)
 		     (buffer-substring (point) (point-max)))))