(nnmail-fancy-expiry-target): Use rmail-dont-reply-to to exclude address

 matching message-dont-reply-to-names.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e525ee2..d54e5c4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/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/nnmail.el b/lisp/nnmail.el
index f3f9e55..66dcbab 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -1910,8 +1910,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)