diff options
| author | Miles Bader <miles@gnu.org> | 2006-02-17 02:38:14 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-02-17 02:38:14 +0000 |
| commit | d71c0855f97b186dceaca2fafd7e1e28e036b527 (patch) | |
| tree | adf4a5d6480d90dc1b5e27472c9fa98b2913c79a | |
| parent | 6ce2b6ab1568acee7935b98263b0403e8319c28b (diff) | |
| download | emacs-d71c0855f97b186dceaca2fafd7e1e28e036b527.tar.gz emacs-d71c0855f97b186dceaca2fafd7e1e28e036b527.tar.bz2 emacs-d71c0855f97b186dceaca2fafd7e1e28e036b527.zip | |
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
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/gnus-art.el | 26 |
2 files changed, 18 insertions, 13 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 4ac3982fb44..903be005174 100644 --- 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 0d9b5f4be5a..0c9cb18506a 100644 --- 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." |