2001-06-16 Simon Josefsson <jas@extundo.com>

	* nnimap.el (nnimap-split-articles): Support 'junk to-groups.
	(nnimap-expunge-search-string): New variable.
	(nnimap-request-expire-articles): Use it.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b1d242d..9775754 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-16  Simon Josefsson  <jas@extundo.com>
+
+       * nnimap.el (nnimap-split-articles): Support 'junk to-groups.
+       (nnimap-expunge-search-string): New variable.
+       (nnimap-request-expire-articles): Use it.
+
 2001-06-15 19:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * message.el (message-send-mail-with-qmail): wrong exit status is

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index dddb85d..31611f1 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -237,7 +237,8 @@ There are two wildcards * and %. * matches everything, % matches
 everything in the current hierarchy.")
 
 (defvoo nnimap-news-groups nil
-  "IMAP support a news-like mode, also known as bulletin board mode, where replies is sent via IMAP instead of SMTP.
+  "IMAP support a news-like mode, also known as bulletin board mode,
+where replies is sent via IMAP instead of SMTP.
 
 This variable should contain a regexp matching groups where you wish
 replies to be stored to the mailbox directly.
@@ -252,6 +253,16 @@ news-like mailboxes.  If you wish to have a group with todo items or
 similar which you wouldn't want to set up a mailing list for, you can
 use this to make replies go directly to the group.")
 
+(defvoo nnimap-expunge-search-string "UID %s NOT SINCE %s"
+  "*IMAP search command to use for articles that are to be expired.
+The first %s is replaced by a UID set of articles to search on,
+and the second %s is replaced by a date criterium.
+
+One useful (and perhaps the only useful) value to change this to would
+be `UID %s NOT SENTSINCE %s' to make nnimap use the Date: header
+instead of the internal date of messages.  See section 6.4.4 of RFC
+2060 for more information on valid strings.")
+
 (defvoo nnimap-server-address nil
   "Obsolete.  Use `nnimap-address'.")
 
@@ -1024,16 +1035,20 @@ function is generally only called when Gnus is shutting down."
                ;; copy article to right group(s)
                (setq removeorig nil)
                (dolist (to-group (nnimap-split-to-groups rule))
-                 (if (imap-message-copy (number-to-string article)
-                                        to-group nil 'nocopyuid)
-                     (progn
-                       (message "IMAP split moved %s:%s:%d to %s" server inbox
-                                article to-group)
-                       (setq removeorig t)
-                       ;; Add the group-art list to the history list.
-                       (push (list (cons to-group 0)) nnmail-split-history))
-                   (message "IMAP split failed to move %s:%s:%d to %s" server
-                            inbox article to-group)))
+                 (cond ((eq to-group 'junk)
+                        (message "IMAP split removed %s:%s:%d" server inbox
+                                 article)
+                        (setq removeorig t))
+                       ((imap-message-copy (number-to-string article)
+                                           to-group nil 'nocopyuid)
+                        (message "IMAP split moved %s:%s:%d to %s" server
+                                 inbox article to-group)
+                        (setq removeorig t)
+                        ;; Add the group-art list to the history list.
+                        (push (list (cons to-group 0)) nnmail-split-history))
+                       (t
+                        (message "IMAP split failed to move %s:%s:%d to %s"
+                                 server inbox article to-group))))
                ;; remove article if it was successfully copied somewhere
                (and removeorig
                     (imap-message-flags-add (format "%d" article)
@@ -1133,7 +1148,7 @@ function is generally only called when Gnus is shutting down."
                     (setq articles nil)))
                  ((numberp days)
                   (let ((oldarts (imap-search
-                                  (format "UID %s NOT SINCE %s"
+                                  (format nnimap-expunge-search-string
                                           (imap-range-to-message-set artseq)
                                           (nnimap-date-days-ago days))))
                         (imap-fetch-data-hook