2000-11-29 20:00:00 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.

2000-11-22  Jan Nieuwenhuizen  <janneke@gnu.org>

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8bb8fbc..5f9f7e5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2000-11-29 20:00:00  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.
+
+2000-11-22  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * nnmh.el (nnmh-request-expire-articles): Implemented
+       expiry-target for nnmh backend.
+
 2000-11-30  Simon Josefsson  <sj@extundo.com>
 
        * mm-decode.el (mm-security-from): New variable.

diff --git a/lisp/nnbabyl.el b/lisp/nnbabyl.el
index ee82489..40fa4dd 100644 (file)
--- a/lisp/nnbabyl.el
+++ b/lisp/nnbabyl.el
@@ -278,6 +278,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/nnfolder.el b/lisp/nnfolder.el
index f096112..a200ad9 100644 (file)
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -35,6 +35,7 @@
 (require 'nnoo)
 (eval-when-compile (require 'cl))
 (require 'gnus-util)
+(require 'gnus-range)
 
 (nnoo-declare nnfolder)
 
@@ -373,7 +374,14 @@ all.  This may very well take some time.")
                       (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)
            (unless (or gnus-nov-is-evil nnfolder-nov-is-evil)

diff --git a/lisp/nnmbox.el b/lisp/nnmbox.el
index 5f6ecd1..db98899 100644 (file)
--- a/lisp/nnmbox.el
+++ b/lisp/nnmbox.el
@@ -260,6 +260,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/nnmh.el b/lisp/nnmh.el
index da72c95..22555f8 100644 (file)
--- a/lisp/nnmh.el
+++ b/lisp/nnmh.el
@@ -263,6 +263,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 ()