From: yamaoka <yamaoka>
Date: Mon, 30 Jul 2001 02:56:11 +0000 (+0000)
Subject: Fix.
X-Git-Tag: t-gnus-6_15_3-03-last-
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ea1fbfd31b26f1813818b1a516673bddb74e5af9;p=elisp%2Fgnus.git-

Fix.
---

diff --git a/lisp/nnshimbun.el b/lisp/nnshimbun.el
index b10fff2..9d4fc51 100644
--- a/lisp/nnshimbun.el
+++ b/lisp/nnshimbun.el
@@ -675,11 +675,11 @@ and the NOV is open.  The optional fourth argument FORCE is ignored."
 	       ;; how does it work.  If the group's parameter is not
 	       ;; specified by user, the shimbun's default value will
 	       ;; be used.
-	       (nnmail-expiry-wait
+	       (expiry-wait
 		(or (nnshimbun-find-parameter name 'expiry-wait t)
-		    (shimbun-article-expiration-days nnshimbun-shimbun)
-		    nnmail-expiry-wait))
-	       (nnmail-expiry-wait-function (if nnmail-expiry-wait
+		    (shimbun-article-expiration-days nnshimbun-shimbun)))
+	       (nnmail-expiry-wait (or expiry-wait nnmail-expiry-wait))
+	       (nnmail-expiry-wait-function (if expiry-wait
 						nil
 					      nnmail-expiry-wait-function))
 	       article end time)