# HG changeset patch
# User ShengHuo ZHU <zsh@cs.rochester.edu>
# Date 1030073578 0
# Node ID b87254142b98ced89a1625dd1354ea420dec0b23
# Parent  66b6d19633ed594ec759bba659e0695f8de93752
	* nnfolder.el (nnfolder-request-expire-articles): expiry-target.

	* nnbabyl.el (nnbabyl-request-expire-articles): Ditto.

	* nnmbox.el (nnmbox-request-expire-articles): Ditto.

	* nnmh.el (nnmh-request-expire-articles): Implemented
	expiry-target for nnmh backend.

diff -r 66b6d19633ed -r b87254142b98 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Thu Aug 22 19:40:12 2002 +0000
+++ b/lisp/gnus/ChangeLog	Fri Aug 23 03:32:58 2002 +0000
@@ -1,3 +1,14 @@
+2002-08-23  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* nnfolder.el (nnfolder-request-expire-articles): expiry-target.
+
+	* nnbabyl.el (nnbabyl-request-expire-articles): Ditto.
+
+	* nnmbox.el (nnmbox-request-expire-articles): Ditto.
+
+	* nnmh.el (nnmh-request-expire-articles): Implemented
+	expiry-target for nnmh backend.
+
 2002-08-20  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* gnus-art.el (gnus-button-url-regexp): Use POSIX regexp if possible.
diff -r 66b6d19633ed -r b87254142b98 lisp/gnus/nnbabyl.el
--- a/lisp/gnus/nnbabyl.el	Thu Aug 22 19:40:12 2002 +0000
+++ b/lisp/gnus/nnbabyl.el	Fri Aug 23 03:32:58 2002 +0000
@@ -280,6 +280,14 @@
 		     (buffer-substring
 		      (point) (progn (end-of-line) (point))) force))
 	      (progn
+		(unless (eq nnmail-expiry-target 'delete)
+		  (with-temp-buffer
+		    (nnbabyl-request-article (car articles) 
+					     newsgroup server 
+					     (current-buffer))
+		    (let ((nnml-current-directory nil))
+		      (nnmail-expiry-target-group
+		       nnmail-expiry-target newsgroup))))
 		(nnheader-message 5 "Deleting article %d in %s..."
 				  (car articles) newsgroup)
 		(nnbabyl-delete-mail))
diff -r 66b6d19633ed -r b87254142b98 lisp/gnus/nnfolder.el
--- a/lisp/gnus/nnfolder.el	Thu Aug 22 19:40:12 2002 +0000
+++ b/lisp/gnus/nnfolder.el	Fri Aug 23 03:32:58 2002 +0000
@@ -34,6 +34,7 @@
 (require 'nnoo)
 (eval-when-compile (require 'cl))
 (require 'gnus-util)
+(require 'gnus-range)
 
 (nnoo-declare nnfolder)
 
@@ -349,7 +350,14 @@
 		       (buffer-substring
 			(point) (progn (end-of-line) (point)))
 		       force nnfolder-inhibit-expiry))
-	    (nnheader-message 5 "Deleting article %d..."
+	    (unless (eq nnmail-expiry-target 'delete)
+	      (with-temp-buffer
+		(nnfolder-request-article (car maybe-expirable) 
+					  newsgroup server (current-buffer))
+		(let ((nnml-current-directory nil))
+		  (nnmail-expiry-target-group
+		   nnmail-expiry-target newsgroup))))
+	    (nnheader-message 5 "Deleting article %d in %s..."
 			      (car maybe-expirable) newsgroup)
 	    (nnfolder-delete-mail)
 	    ;; Must remember which articles were actually deleted
diff -r 66b6d19633ed -r b87254142b98 lisp/gnus/nnmbox.el
--- a/lisp/gnus/nnmbox.el	Thu Aug 22 19:40:12 2002 +0000
+++ b/lisp/gnus/nnmbox.el	Fri Aug 23 03:32:58 2002 +0000
@@ -262,6 +262,14 @@
 		     (buffer-substring
 		      (point) (progn (end-of-line) (point))) force))
 	      (progn
+		(unless (eq nnmail-expiry-target 'delete)
+		  (with-temp-buffer
+		    (nnmbox-request-article (car articles) 
+					     newsgroup server 
+					     (current-buffer))
+		    (let ((nnml-current-directory nil))
+		      (nnmail-expiry-target-group
+		       nnmail-expiry-target newsgroup))))
 		(nnheader-message 5 "Deleting article %d in %s..."
 				  (car articles) newsgroup)
 		(nnmbox-delete-mail))
diff -r 66b6d19633ed -r b87254142b98 lisp/gnus/nnmh.el
--- a/lisp/gnus/nnmh.el	Thu Aug 22 19:40:12 2002 +0000
+++ b/lisp/gnus/nnmh.el	Fri Aug 23 03:32:58 2002 +0000
@@ -265,6 +265,13 @@
 		 (setq is-old
 		       (nnmail-expired-article-p newsgroup mod-time force)))
 	    (progn
+	      ;; Allow a special target group. -- jcn
+	      (unless (eq nnmail-expiry-target 'delete)
+		(with-temp-buffer
+		  (nnmh-request-article (car articles)
+					newsgroup server (current-buffer))
+		  (nnmail-expiry-target-group
+		   nnmail-expiry-target newsgroup)))
 	      (nnheader-message 5 "Deleting article %s in %s..."
 				article newsgroup)
 	      (condition-case ()