Mercurial > emacs
changeset 79157:7bb8a742f977
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 259-260)
- Merge from emacs--rel--22
- Update from CVS
2007-10-18 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnmail.el (nnmail-fancy-expiry-target): Use rmail-dont-reply-to to
exclude address matching message-dont-reply-to-names.
Revision: emacs@sv.gnu.org/emacs--rel--22--patch-130
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sat, 20 Oct 2007 02:22:19 +0000 |
| parents | 5fbccaf0a88c |
| children | 6a30435bc190 13362e3adf7c |
| files | lisp/gnus/ChangeLog lisp/gnus/nnmail.el |
| diffstat | 2 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Fri Oct 19 15:09:49 2007 +0000 +++ b/lisp/gnus/ChangeLog Sat Oct 20 02:22:19 2007 +0000 @@ -1,3 +1,8 @@ +2007-10-18 Katsumi Yamaoka <yamaoka@jpl.org> + + * nnmail.el (nnmail-fancy-expiry-target): Use rmail-dont-reply-to to + exclude address matching message-dont-reply-to-names. + 2007-10-15 Katsumi Yamaoka <yamaoka@jpl.org> * gnus-util.el (gnus-string<): New function.
--- a/lisp/gnus/nnmail.el Fri Oct 19 15:09:49 2007 +0000 +++ b/lisp/gnus/nnmail.el Sat Oct 20 02:22:19 2007 +0000 @@ -1900,8 +1900,10 @@ ;; To or From header ((and (equal header 'to-from) (or (string-match (cadr regexp-target-pair) from) - (and (string-match message-dont-reply-to-names from) - (string-match (cadr regexp-target-pair) to)))) + (and (string-match (cadr regexp-target-pair) to) + (let ((rmail-dont-reply-to-names + message-dont-reply-to-names)) + (equal (rmail-dont-reply-to from) ""))))) (setq target (format-time-string (caddr regexp-target-pair) date))) ((and (not (equal header 'to-from)) (string-match (cadr regexp-target-pair)