From 482becd7cffdecffabbc2532dd37f67db48b266f Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 21 Nov 2005 23:19:16 +0000 Subject: [PATCH] Synch to No Gnus 200511212318. --- lisp/ChangeLog | 12 +++++++++++- lisp/nnmail.el | 10 ++++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8bb6dcc..7d01d64 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2005-11-22 Katsumi Yamaoka + + * nnmail.el (nnmail-fancy-expiry-target): Use current-time instead + of current-time-string. + +2005-11-20 Stefan Schimanski (tiny change) + + * nnmail.el (nnmail-fancy-expiry-target): Protect against invalid + date header. + 2005-11-19 Kevin Greiner * gnus-sum.el (gnus-fetch-old-headers): Updated docs to warn that @@ -18,7 +28,7 @@ 2005-11-17 Lars Magne Ingebrigtsen - * flow-fill.el (fill-flowed): Bind adaptive-fill-mode to nil. + * flow-fill.el (fill-flowed): Bind adaptive-fill-mode to nil. 2005-11-16 Boris Samorodov (tiny patch) diff --git a/lisp/nnmail.el b/lisp/nnmail.el index cf3f794..355508c 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -1866,9 +1866,15 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details." (case-fold-search nil) (from (or (message-fetch-field "from") "")) (to (or (message-fetch-field "to") "")) - (date (date-to-time - (or (message-fetch-field "date") (current-time-string)))) + (date (message-fetch-field "date")) (target 'delete)) + (setq date (if date + (condition-case err + (date-to-time date) + (error + (message "%s" (error-message-string err)) + (current-time))) + (current-time))) (dolist (regexp-target-pair (reverse nnmail-fancy-expiry-targets) target) (setq header (car regexp-target-pair)) (cond -- 1.7.10.4