* nnmaildir.el (nnmaildir-request-expire-articles): Use

nnmail-expiry-wait* if expire-age parameter is not set.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 00f1a34..bcebb73 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-21  Paul Jarc  <prj@po.cwru.edu>
+
+       * nnmaildir.el (nnmaildir-request-expire-articles): Use
+       nnmail-expiry-wait* if expire-age parameter is not set.
+
 2002-02-21  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-group.el (gnus-group-sort-groups-by-real-name): New
@@ -25,7 +30,7 @@
 
        * mm-decode.el (mm-inlined-types): Add application/x-emacs-lisp.
        (mm-automatic-display): Ditto.
-       
+
        * mailcap.el (mailcap-mime-data): Ditto.
        From: Reiner Steib <4uce.02.r.steib@gmx.net>
 

diff --git a/lisp/nnmaildir.el b/lisp/nnmaildir.el
index 1f58d16..25b15a8 100644 (file)
--- a/lisp/nnmaildir.el
+++ b/lisp/nnmaildir.el
@@ -1472,7 +1472,11 @@ by nnmaildir-request-article.")
            pgname (nnmaildir--grp-get-pname group))
       (if (nnmaildir--param pgname 'read-only)
          (throw 'return (gnus-uncompress-range ranges)))
-      (setq time (or (nnmaildir--param pgname 'expire-age) 604800))
+      (setq time (or (nnmaildir--param pgname 'expire-age)
+                    (* 86400 ;; seconds per day
+                       (or (and nnmail-expiry-wait-function
+                                (funcall nnmail-expiry-wait-function gname))
+                           nnmail-expiry-wait))))
       (if (or force (integerp time)) nil
        (throw 'return (gnus-uncompress-range ranges)))
       (setq boundary (current-time)