From 3b8833a07c1159aefdde93cd92ee3396abb120e7 Mon Sep 17 00:00:00 2001 From: ari Date: Mon, 11 Jun 2001 12:33:55 +0000 Subject: [PATCH] * lisp/nnshimbun.el (nnshimbun-request-expire-articles): Fix inhibiting the expiring when `nnshimbun-keep-unparsable-dated-articles' is nil. --- ChangeLog | 6 ++++++ lisp/nnshimbun.el | 15 ++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 887182c..59be7ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2001-06-11 Akihiro Arisawa + + * lisp/nnshimbun.el (nnshimbun-request-expire-articles): Fix + inhibiting the expiring when `nnshimbun-keep-unparsable-dated-articles' + is nil. + 2001-06-11 TSUCHIYA Masatoshi * lisp/gnus-group.el (toplevel): Removed autoload code for diff --git a/lisp/nnshimbun.el b/lisp/nnshimbun.el index 94e954f..12f0fae 100644 --- a/lisp/nnshimbun.el +++ b/lisp/nnshimbun.el @@ -546,13 +546,14 @@ and the NOV is open. The optional fourth argument FORCE is ignored." (if (search-forward "\t" end t) (1- (point)) end))))) - (when (and (or (setq time (condition-case nil - (apply 'encode-time time) - (error nil))) - ;; Inhibit expiration if there's no parsable - ;; date and the following option is non-nil. - (not nnshimbun-keep-unparsable-dated-articles)) - (nnmail-expired-article-p name time nil)) + (when (cond ((setq time (condition-case nil + (apply 'encode-time time) + (error nil))) + (nnmail-expired-article-p name time nil)) + (t + ;; Inhibit expiration if there's no parsable + ;; date and the following option is non-nil. + (not nnshimbun-keep-unparsable-dated-articles))) (beginning-of-line) (delete-region (point) (1+ end)) (setq articles (delq article articles))))) -- 1.7.10.4