From: ShengHuo ZHU <zsh@cs.rochester.edu>
Date: Fri, 23 Aug 2002 03:32:58 +0000 (+0000)
Subject: * nnfolder.el (nnfolder-request-expire-articles): expiry-target.
X-Git-Tag: ttn-vms-21-2-B4~13593
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0d9724864aa5cee53a6f92c9c0e9848316504e44;p=emacs.git

* 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 --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index f24be89a850..e6aab31e4cd 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -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 --git a/lisp/gnus/nnbabyl.el b/lisp/gnus/nnbabyl.el
index fa5e25aafa8..8389e17fb04 100644
--- a/lisp/gnus/nnbabyl.el
+++ b/lisp/gnus/nnbabyl.el
@@ -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 --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index 6a4a7f794c5..369e4ccf279 100644
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -34,6 +34,7 @@
 (require 'nnoo)
 (eval-when-compile (require 'cl))
 (require 'gnus-util)
+(require 'gnus-range)
 
 (nnoo-declare nnfolder)
 
@@ -349,7 +350,14 @@ If nil, `nnfolder-file-coding-system' is used.")
 		       (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 --git a/lisp/gnus/nnmbox.el b/lisp/gnus/nnmbox.el
index 4c340b2547f..555d0a793ce 100644
--- a/lisp/gnus/nnmbox.el
+++ b/lisp/gnus/nnmbox.el
@@ -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 --git a/lisp/gnus/nnmh.el b/lisp/gnus/nnmh.el
index aa4a3cd04f0..27ff9f11f52 100644
--- a/lisp/gnus/nnmh.el
+++ b/lisp/gnus/nnmh.el
@@ -265,6 +265,13 @@ as unread by Gnus.")
 		 (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 ()