gnus-html.el: Remove more white space before <pre_int> image spacers; Decode entities...

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 922cef18b8f93aeb4f85d206c39a3e41d5d642a9..4ad4fe4e11773869e32f2bbacc0b923fe788e440 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -5,6 +5,10 @@
        (gnus-html-insert-image): New command and keystroke.
        (gnus-html-redisplay-with-images): New command and keystroke.
        (gnus-html-show-images): Renamed command.
+       (gnus-html-wash-tags): Remove more white space before <pre_int> image
+       spacers.
+       (gnus-html-wash-tags): Decode entities at the end, so that entities
+       inside the tags don't mess up the rest of the "parsing".
 
        * gnus-agent.el (gnus-agent-auto-agentize-methods): Change the default
        so that nnimap methods aren't agentized by default.  There's apparently

diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index c0e0ed7339126146236484401b4dfe50ca2ff416..1e6cdc5c9b7926280938a60b642f067413979d14 100644 (file)
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -113,7 +113,7 @@ fit these criteria."
   (let (tag parameters string start end images url)
     (mm-url-decode-entities)
     (goto-char (point-min))
-    (while (re-search-forward "<pre_int> *</pre_int>\n" nil t)
+    (while (re-search-forward " *<pre_int> *</pre_int>\n" nil t)
       (replace-match "" t t))
     (goto-char (point-min))
     (while (re-search-forward "<\\([^ />]+\\)\\([^>]*\\)>" nil t)