Synch to Gnus 200311170916.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6cf27d1..432d393 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * html2text.el (html2text-remove-tags): Remove the tag in a
+       simpler way to avoid inflooping.
+
 2003-11-17  Simon Josefsson  <jas@extundo.com>
 
        * imap.el (imap-gssapi-auth-p): Don't check capability (some

diff --git a/lisp/html2text.el b/lisp/html2text.el
index 4b89f8f..41fea4b 100644 (file)
--- a/lisp/html2text.el
+++ b/lisp/html2text.el
@@ -463,9 +463,7 @@ See the documentation for that variable."
   (dolist (tag tag-list)
     (html2text-buffer-head)
     (while (re-search-forward (format "\\(</?%s[^>]*>\\)" tag) (point-max) t)
-      (let ((p1 (point)))
-       (search-backward "<")
-       (delete-region (point) p1)))))
+      (delete-region (match-beginning 0) (match-end 0)))))
 
 (defun html2text-format-tags ()
   "See the variable \"html2text-format-tag-list\" for documentation"