X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fnnmail.el;h=2aa740b767c3f0cc3d3431f3f261a44dfa78fd79;hp=1b90143c44ca4fd823a72359a4790bdb54eaf7ec;hb=0932272ab0210df34c2c37fae672b84b139c49f0;hpb=e01063f3bc6b04bd84cf23161fdc6168dafee893

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 1b90143c4..2aa740b76 100644
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -166,6 +166,13 @@ Eg.:
   :type '(choice (const :tag "nnmail-expiry-wait" nil)
 		 (function :format "%v" nnmail-)))
 
+(defcustom nnmail-expiry-target 'delete
+  "*Variable that says where expired messages should end up."
+    :group 'nnmail-expire
+    :type '(choice (const delete)
+		   (function :format "%v" nnmail-)
+		   string))
+
 (defcustom nnmail-cache-accepted-message-ids nil
   "If non-nil, put Message-IDs of Gcc'd articles into the duplicate cache."
   :group 'nnmail
@@ -1521,6 +1528,12 @@ See the documentation for the variable `nnmail-split-fancy' for documentation."
 	     ;; Compare the time with the current time.
 	     (ignore-errors (time-less-p days (time-since time))))))))
 
+(defun nnmail-expiry-target-group (target group)
+  (when (nnheader-functionp target)
+    (setq target (funcall target group)))
+  (unless (eq target 'delete)
+    (gnus-request-accept-article target)))
+
 (defun nnmail-check-syntax ()
   "Check (and modify) the syntax of the message in the current buffer."
   (save-restriction