Mercurial > emacs
diff lisp/gnus/gnus-art.el @ 90299:9e490faa9f6b
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-17
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 85-96)
- Update from CVS
- Merge from erc--emacs--0
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 30-36)
- Merge from emacs--devo--0
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 17 Feb 2006 09:10:23 +0000 |
| parents | c5406394f567 5e2a9bb28073 |
| children | e3bacb89536a |
line wrap: on
line diff
--- a/lisp/gnus/gnus-art.el Wed Feb 15 00:49:52 2006 +0000 +++ b/lisp/gnus/gnus-art.el Fri Feb 17 09:10:23 2006 +0000 @@ -2608,18 +2608,22 @@ (article-really-strip-banner (gnus-parameter-banner gnus-newsgroup-name))) (when gnus-article-address-banner-alist - (article-really-strip-banner - (let ((from (save-restriction - (widen) - (article-narrow-to-head) - (mail-fetch-field "from")))) - (when (and from - (setq from - (caar (mail-header-parse-addresses from)))) - (catch 'found - (dolist (pair gnus-article-address-banner-alist) - (when (string-match (car pair) from) - (throw 'found (cdr pair))))))))))))) + ;; Note that the From header is decoded here, so it is + ;; required that the *-extract-address-components function + ;; supports non-ASCII text. + (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."