Revision: emacs@sv.gnu.org/emacs--devo--0--patch-94

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 35-36)

   - Merge from emacs--devo--0
   - Update from CVS

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4ac3982fb44bab1a3f8fbf5114fda93a1f962af7..903be00517425c1ad4d0b2170b85899750e4b57c 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -7,6 +7,11 @@
 
        * gnus-cus.el: Revert 2005-10-17 change.
 
+2006-02-17  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-art.el (article-strip-banner): Call
+       article-really-strip-banner only when the regexp match is made.
+
 2006-02-16  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (article-strip-banner): Use

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 0d9b5f4be5a2597d33abdc076c27a8042cad4592..0c9cb18506acf1f0c093f632f08c7cd60d31d08c 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2611,19 +2611,19 @@ always hide."
          ;; Note that the From header is decoded here, so it is
          ;; required that the *-extract-address-components function
          ;; supports non-ASCII text.
-         (article-really-strip-banner
-          (let ((from (save-restriction
-                        (widen)
-                        (article-narrow-to-head)
-                        (mail-fetch-field "from"))))
-            (when (and from
-                       (setq from
-                             (cadr (funcall gnus-extract-address-components
-                                            from))))
-              (catch 'found
-                (dolist (pair gnus-article-address-banner-alist)
-                  (when (string-match (car pair) from)
-                    (throw 'found (cdr pair)))))))))))))
+         (let ((from (save-restriction
+                       (widen)
+                       (article-narrow-to-head)
+                       (mail-fetch-field "from"))))
+           (when (and from
+                      (setq from
+                            (cadr (funcall gnus-extract-address-components
+                                           from))))
+             (catch 'found
+               (dolist (pair gnus-article-address-banner-alist)
+                 (when (string-match (car pair) from)
+                   (throw 'found
+                          (article-really-strip-banner (cdr pair)))))))))))))
 
 (defun article-really-strip-banner (banner)
   "Strip the banner specified by the argument."