2001-09-26 Simon Josefsson <jas@extundo.com>

	* nnmail.el (nnmail-expiry-target-group): Add doc warning.

	* nnimap.el (nnimap-expiry-target): Use temp buffer.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6615efb..86f2eb1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-26  Simon Josefsson  <jas@extundo.com>
+
+       * nnmail.el (nnmail-expiry-target-group): Add doc warning.
+
+       * nnimap.el (nnimap-expiry-target): Use temp buffer.
+
 2001-09-26 07:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * gnus-cus.el (gnus-group-parameters): Display as sexp.

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index f8addd5..a93bfa9 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -1147,9 +1147,9 @@ function is generally only called when Gnus is shutting down."
 
 (defun nnimap-expiry-target (arts group server)
   (unless (eq nnmail-expiry-target 'delete)
-    (with-current-buffer nntp-server-buffer
+    (with-temp-buffer
       (dolist (art (gnus-uncompress-sequence arts))
-       (nnimap-request-article art group server)
+       (nnimap-request-article art group server  (current-buffer))
        ;; hints for optimization in `nnimap-request-accept-article'
        (let ((nnimap-current-move-article art)
              (nnimap-current-move-group group)

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 7882789..94193ee 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -1690,6 +1690,8 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
             (ignore-errors (time-less-p days (time-since time))))))))
 
 (defun nnmail-expiry-target-group (target group)
+  ;; Do not invoke this from nntp-server-buffer!  At least nnfolder clears
+  ;; that buffer if the nnfolder group isn't selected.
   (let (nnmail-cache-accepted-message-ids)
     ;; Don't enter Message-IDs into cache.
     ;; Let users hack it in TARGET function.