From 0563df167689ba46e219f7915c6f5b321da614ce Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 7 Jun 2001 11:48:54 +0000 Subject: [PATCH] * nnshimbun.el (nnshimbun-request-expire-articles): Prefer the group parameter `expiry-wait' when expiring a closed group. --- ChangeLog | 5 +++++ lisp/nnshimbun.el | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 34333f1..0d41196 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2001-06-07 Katsumi Yamaoka + * lisp/nnshimbun.el (nnshimbun-request-expire-articles): Prefer the + group parameter `expiry-wait' when expiring a closed group. + +2001-06-07 Katsumi Yamaoka + * lisp/nnshimbun.el (nnshimbun-request-article-1): Replace a date string in `gnus-newsgroup-data' based on the newly retrieved article. diff --git a/lisp/nnshimbun.el b/lisp/nnshimbun.el index 0c75a0c..2d3faa5 100644 --- a/lisp/nnshimbun.el +++ b/lisp/nnshimbun.el @@ -511,13 +511,16 @@ However, the optional FORCE if it is non-nil (it is supposed to be specified by the command `nnshimbun-expire-nov-databases'), it does expire for the SERVER:GROUP even if whose NOV is not open." (let ((buffer (cdr (assoc group nnshimbun-nov-buffer-alist))) + (nnmail-expiry-wait-function nnmail-expiry-wait-function) + (nnmail-expiry-wait nnmail-expiry-wait) (progress-msg (format "Expiring NOV database for nnshimbun+%s:%s " server group)) (pinwheel "-/|\\") (counter 0) - should-close-nov name article expirable end time) + name should-close-nov article expirable end time) (if (and server + (setq name (concat "nnshimbun+" server ":" group)) (or (let ((current (nnoo-current-server 'nnshimbun))) (and current (string-equal server current) @@ -527,6 +530,12 @@ expire for the SERVER:GROUP even if whose NOV is not open." buffer (gnus-get-buffer-create (format " *nnshimbun overview %s %s*" server group))) + (let ((expiry-wait (gnus-group-find-parameter name + 'expiry-wait))) + (when expiry-wait + ;; Prefer the group parameter `expiry-wait'. + (setq nnmail-expiry-wait-function nil + nnmail-expiry-wait expiry-wait))) (save-excursion (set-buffer buffer) (set (make-local-variable 'nnshimbun-nov-buffer-file-name) @@ -544,7 +553,6 @@ expire for the SERVER:GROUP even if whose NOV is not open." t))) (prog1 (save-excursion - (setq name (concat "nnshimbun+" server ":" group)) (set-buffer buffer) (when (eq 'all articles) (setq articles nil) -- 1.7.10.4