diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-20 02:22:19 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-20 02:22:19 +0000 |
| commit | 5255e3ffc735b58bc314e2886b11e1b9ff489b22 (patch) | |
| tree | 9a4519da9ee23c61f4b136c8f9f9ecb4af263cfe /lisp | |
| parent | 3ac9198638c5655b30ce345b5fb59e10f2412209 (diff) | |
| download | emacs-5255e3ffc735b58bc314e2886b11e1b9ff489b22.tar.gz | |
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
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/nnmail.el | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 9d95f0a6c6a..e8273482fab 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -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. diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el index 71a528c0f0b..35f5476f9b4 100644 --- a/lisp/gnus/nnmail.el +++ b/lisp/gnus/nnmail.el @@ -1900,8 +1900,10 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details." ;; 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) |