* lisp/nnshimbun.el (nnshimbun-request-expire-articles): Fix

inhibiting the expiring when `nnshimbun-keep-unparsable-dated-articles'
is nil.

diff --git a/ChangeLog b/ChangeLog
index 887182c..59be7ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-11  Akihiro Arisawa  <ari@atesoft.advantest.co.jp>
+
+       * lisp/nnshimbun.el (nnshimbun-request-expire-articles): Fix
+       inhibiting the expiring when `nnshimbun-keep-unparsable-dated-articles'
+       is nil.
+
 2001-06-11  TSUCHIYA Masatoshi  <tsuchiya@pine.kuee.kyoto-u.ac.jp>
 
        * lisp/gnus-group.el (toplevel): Removed autoload code for

diff --git a/lisp/nnshimbun.el b/lisp/nnshimbun.el
index 94e954f..12f0fae 100644 (file)
--- 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)))))