(nnshimbun-find-parameter): New macro.

(nnshimbun-generate-nov-database): Use `nnshimbun-find-parameter'.
(nnshimbun-request-expire-articles): Fixed.

diff --git a/ChangeLog b/ChangeLog
index c1374d9..617277d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-12  TSUCHIYA Masatoshi  <tsuchiya@pine.kuee.kyoto-u.ac.jp>
+
+       * lisp/nnshimbun.el (nnshimbun-find-parameter): New macro.
+       (nnshimbun-generate-nov-database): Use `nnshimbun-find-parameter'.
+       (nnshimbun-request-expire-articles): Fixed.
+
 2001-06-12  Katsumi Yamaoka <yamaoka@jpl.org>
 
        * lisp/nnshimbun.el (Gnus-p): Use `file-exists-p' instead of

diff --git a/lisp/nnshimbun.el b/lisp/nnshimbun.el
index 18f0946..325c8f6 100644 (file)
--- a/lisp/nnshimbun.el
+++ b/lisp/nnshimbun.el
@@ -409,24 +409,32 @@ also be nil."
       (insert " "))
     (forward-line 1)))
 
+(defmacro nnshimbun-find-parameter (group variable)
+  `(or (let ((v (gnus-group-find-parameter
+                (concat "nnshimbun+"
+                        (nnoo-current-server 'nnshimbun)
+                        ":" ,group)
+                (quote ,variable)
+                'allow-list)))
+        (if (listp v) (car v) v))
+       ,variable))
+
 (defun nnshimbun-generate-nov-database (group)
   (nnshimbun-possibly-change-group group)
   (with-current-buffer (nnshimbun-open-nov group)
     (goto-char (point-max))
     (forward-line -1)
-    (let ((i (or (ignore-errors (read (current-buffer))) 0)))
-      (dolist (header (shimbun-headers
-                      nnshimbun-shimbun
-                      (or (gnus-group-find-parameter
-                           (concat "nnshimbun+"
-                                   (nnoo-current-server 'nnshimbun)
-                                   ":" group)
-                           'nnshimbun-index-range)
-                          nnshimbun-index-range)))
+    (let ((i (or (ignore-errors (read (current-buffer))) 0))
+         (pre-fetch
+          (nnshimbun-find-parameter group nnshimbun-pre-fetch-article)))
+      (dolist (header
+              (shimbun-headers
+               nnshimbun-shimbun
+               (nnshimbun-find-parameter group nnshimbun-index-range)))
        (unless (nnshimbun-search-id group (shimbun-header-id header))
          (goto-char (point-max))
          (nnshimbun-insert-nov (setq i (1+ i)) header)
-         (when nnshimbun-pre-fetch-article
+         (when pre-fetch
            (nnshimbun-request-article-1 i group nil nnshimbun-buffer)))))
   (nnshimbun-write-nov group)))
 
@@ -525,10 +533,9 @@ and the NOV is open.  The optional fourth argument FORCE is ignored."
               ;; Prefer the shimbun's default to `nnmail-expiry-wait'
               ;; only when the group's parameter is nil.
               (nnmail-expiry-wait
-               (if (gnus-group-find-parameter name 'expiry-wait)
-                   nnmail-expiry-wait
-                 (or (shimbun-article-expiration-days nnshimbun-shimbun)
-                     nnmail-expiry-wait)))
+               (or (gnus-group-find-parameter name 'expiry-wait)
+                   (shimbun-article-expiration-days nnshimbun-shimbun)
+                   nnmail-expiry-wait))
               article end time)
          (save-excursion
            (set-buffer buffer)