Mercurial > emacs
changeset 68944:5e2a9bb28073
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
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 17 Feb 2006 02:38:14 +0000 |
| parents | 09f294c6700a |
| children | 527adfc4611d |
| files | lisp/gnus/ChangeLog lisp/gnus/gnus-art.el |
| diffstat | 2 files changed, 18 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Fri Feb 17 01:59:49 2006 +0000 +++ b/lisp/gnus/ChangeLog Fri Feb 17 02:38:14 2006 +0000 @@ -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
--- a/lisp/gnus/gnus-art.el Fri Feb 17 01:59:49 2006 +0000 +++ b/lisp/gnus/gnus-art.el Fri Feb 17 02:38:14 2006 +0000 @@ -2611,19 +2611,19 @@ ;; 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."