Mercurial > emacs

changeset 110259:b350cc580a0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnus-html.el (gnus-html-wash-tags): Limit end-tag matching to the current line to work around bugs in the output from w3m.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Tue, 07 Sep 2010 00:08:33 +0000
parents 1af4bf1c3af4
children 866fdd23abb5 3133b4a76e7c
files lisp/gnus/ChangeLog lisp/gnus/gnus-html.el
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog	Tue Sep 07 00:05:59 2010 +0000
+++ b/lisp/gnus/ChangeLog	Tue Sep 07 00:08:33 2010 +0000
@@ -1,5 +1,8 @@
 2010-09-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* gnus-html.el (gnus-html-wash-tags): Limit end-tag matching to the
+	current line to work around bugs in the output from w3m.
+
 	* gnus-async.el (gnus-async-article-callback): Always prefetch images
 	for groups that want that.
 
--- a/lisp/gnus/gnus-html.el	Tue Sep 07 00:05:59 2010 +0000
+++ b/lisp/gnus/gnus-html.el	Tue Sep 07 00:08:33 2010 +0000
@@ -117,7 +117,7 @@
     (while (re-search-forward " *<pre_int> *</pre_int> *\n" nil t)
       (replace-match "" t t))
     (goto-char (point-min))
-    (while (re-search-forward "<a name[^>]+>" nil t)
+    (while (re-search-forward "<a name[^\n>]+>" nil t)
       (replace-match "" t t))
     (goto-char (point-min))
     (while (re-search-forward "<\\([^ />]+\\)\\([^>]*\\)>" nil t)
@@ -127,7 +127,7 @@
       (when (plusp (length parameters))
 	(set-text-properties 0 (1- (length parameters)) nil parameters))
       (delete-region start (point))
-      (when (search-forward (concat "</" tag ">") nil t)
+      (when (search-forward (concat "</" tag ">") (line-end-position) t)
 	(delete-region (match-beginning 0) (match-end 0)))
       (setq end (point))
       (cond
@@ -224,7 +224,7 @@
     (goto-char (point-min))
     ;; The output from -halfdump isn't totally regular, so strip
     ;; off any </pre_int>s that were left over.
-    (while (re-search-forward "</pre_int>" nil t)
+    (while (re-search-forward "</pre_int>\\|</internal>" nil t)
       (replace-match "" t t))
     (when images
       (gnus-html-schedule-image-fetching (current-buffer) (nreverse images)))