Synch to No Gnus 200411021158.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9206c5a..5a9d404 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-02  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * html2text.el (html2text-get-attr): Remove unused argument `tag'.
+       (html2text-format-tags): Remove unused variable `attr'.
+
 2004-11-01  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus-msg.el (gnus-summary-resend-default-address): Add :version.

diff --git a/lisp/html2text.el b/lisp/html2text.el
index f5e0e58..91d8426 100644 (file)
--- a/lisp/html2text.el
+++ b/lisp/html2text.el
@@ -144,7 +144,7 @@ formatting, and then moved afterward.")
   "Get value of ATTRIBUTE from LIST."
   (nth 1 (assoc attribute list)))
 
-(defun html2text-get-attr (p1 p2 tag)
+(defun html2text-get-attr (p1 p2)
   (goto-char p1)
   (re-search-forward " +[^ ]" p2 t)
   (let* ((attr-string (buffer-substring-no-properties (1- (point)) (1- p2)))
@@ -320,7 +320,7 @@ formatting, and then moved afterward.")
   ;; If someone can explain how to make the URL clickable I will surely
   ;; improve upon this.
   ;; Maybe `goto-addr.el' can be used here.
-  (let* ((attr-list (html2text-get-attr p1 p2 "a"))
+  (let* ((attr-list (html2text-get-attr p1 p2))
         (href (html2text-attr-value attr-list "href")))
     (delete-region p1 p4)
     (when href
@@ -417,8 +417,7 @@ See the documentation for that variable."
                                (point-max) t)
        (let ((p1)
              (p2 (point))
-             (p3) (p4)
-             (attr (match-string 0)))
+             (p3) (p4))
          (search-backward "<" (point-min) t)
          (setq p1 (point))
          (search-forward (format "</%s>" tag) (point-max) t)