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
This commit is contained in:
Miles Bader 2007-10-20 02:22:19 +00:00
parent 3ac9198638
commit 5255e3ffc7
2 changed files with 9 additions and 2 deletions

View file

@ -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.

View file

@ -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)