Mercurial > emacs
comparison lisp/gnus/nnmail.el @ 91058:4b09bb044f38
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 899-900)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 129-130)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 259-260)
- Merge from emacs--rel--22
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-272
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sat, 20 Oct 2007 02:22:59 +0000 |
parents | f55f9811f5d7 7bb8a742f977 |
children | 880960b70474 |
comparison
equal
deleted
inserted
replaced
91057:5e056bb0109f | 91058:4b09bb044f38 |
---|---|
1898 (cond | 1898 (cond |
1899 ;; If the header is to-from then match against the | 1899 ;; If the header is to-from then match against the |
1900 ;; To or From header | 1900 ;; To or From header |
1901 ((and (equal header 'to-from) | 1901 ((and (equal header 'to-from) |
1902 (or (string-match (cadr regexp-target-pair) from) | 1902 (or (string-match (cadr regexp-target-pair) from) |
1903 (and (string-match message-dont-reply-to-names from) | 1903 (and (string-match (cadr regexp-target-pair) to) |
1904 (string-match (cadr regexp-target-pair) to)))) | 1904 (let ((rmail-dont-reply-to-names |
1905 message-dont-reply-to-names)) | |
1906 (equal (rmail-dont-reply-to from) ""))))) | |
1905 (setq target (format-time-string (caddr regexp-target-pair) date))) | 1907 (setq target (format-time-string (caddr regexp-target-pair) date))) |
1906 ((and (not (equal header 'to-from)) | 1908 ((and (not (equal header 'to-from)) |
1907 (string-match (cadr regexp-target-pair) | 1909 (string-match (cadr regexp-target-pair) |
1908 (or | 1910 (or |
1909 (message-fetch-field header) | 1911 (message-fetch-field header) |