From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Tue, 16 Feb 2016 06:38:58 +0000 (+1100)
Subject: Fix display of <pre> elements
X-Git-Tag: emacs-25.0.92~107
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b1a3ebedba88689d26f44cf7db338104b849ae99;p=emacs.git

Fix display of <pre> elements

* lisp/net/eww.el (eww-display-html): Remove CRLF before
parsing so that <pre> elements don't render with ^M at the end
of the lines.
---

diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index da920c14aec..551517b9d64 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -402,6 +402,10 @@ Currently this means either text/html or application/xhtml+xml."
 		(condition-case nil
 		    (decode-coding-region (point) (point-max) encode)
 		  (coding-system-error nil))
+                (save-excursion
+                  ;; Remove CRLF before parsing.
+                  (while (re-search-forward "\r$" nil t)
+                    (replace-match "" t t)))
 		(libxml-parse-html-region (point) (point-max))))))
 	(source (and (null document)
 		     (buffer-substring (point) (point-max)))))