# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1192846939 0
# Node ID 7bb8a742f9777c2c6c7637ea0a33ec2d942657b3
# Parent  5fbccaf0a88cd5a4f65663140fb79c34fabb85df
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

diff -r 5fbccaf0a88c -r 7bb8a742f977 lisp/gnus/ChangeLog
--- 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.
diff -r 5fbccaf0a88c -r 7bb8a742f977 lisp/gnus/nnmail.el
--- 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)