From 7b67c0d98888f0160f5d1be8b3459fbbff1efdcf Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Wed, 26 Sep 2001 22:26:17 +0000
Subject: [PATCH] Synch with Oort Gnus.

---
 lisp/ChangeLog    |    6 ++++++
 lisp/nnimap.el    |    4 ++--
 lisp/nnmail.el    |    2 ++
 texi/gnus-ja.texi |   10 +++++-----
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 081d1fb..0cdd346 100644
--- 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 18ab8b7..2f4f7ea 100644
--- 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 7c927f6..a7ca27f 100644
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -1691,6 +1691,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.
diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 56955b7..adb6b8c 100644
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -7492,13 +7492,13 @@ Fonts})$B!#F1$8%a%C%;!<%8$NCf$KJ#?t$N5-;v$+$i$N0zMQ$,$"$k$H!"(Bgnus $B$O$=$l$
 @cindex stripping advertisements
 @cindex advertisements
 @code{banner} $B%0%k!<%W%Q%i%a!<%?$G;XDj$5$l$?%P%J!<$r<h$j=|$-$^(B
-$B$9(B (@code{gnus-article-strip-banner})$B!#$3$l$O<g$K!"$$$/$D$+$N%a!<%j%s%0%j%9(B
-$B%H$d;J2q<TIU$-$N%0%k!<%W$,A4$F$N5-;v$KDI2C$9$k!"15F+$7$$%P%J!<$H(B/$B$b(B
+$B$9(B (@code{gnus-article-strip-banner})$B!#$3$l$O<g$K!"$$$/$D$+$N%a!<%j%s%0(B
+$B%j%9%H$d;J2q<TIU$-$N%0%k!<%W$,A4$F$N5-;v$KDI2C$9$k!"15F+$7$$%P%J!<$H(B/$B$b(B
 $B$7$/$O=pL>$r1#$9$?$a$K;HMQ$5$l$^$9!#$3$N4X?t$r;H$&J}K!(B
 $B$O(B @code{banner} $B%0%k!<%W%Q%i%a!<%?(B (@pxref{Group Parameters}) $B$r%P%J!<(B
-$B$r<h$j=|$-$?$$%0%k!<%W$KDI2C$7$^$9!#%Q%i%a!<%?$O!">C5n$5$l$k%F%-%9%H$K9gCW$9(B
-$B$k@55,I=8=$H$7$F2r<a$5$l$kJ8;zNs$+!"(B($B:G8e$N(B) $B=pL>$,>C5n$5$l$k$H$$$&0UL#(B
-$B$G$"$k%7%s%\%k(B @code{signature}$B!"$^$?(B
+$B$r<h$j=|$-$?$$%0%k!<%W$KDI2C$7$^$9!#%Q%i%a!<%?$O!">C5n$5$l$k%F%-%9%H$K9g(B
+$BCW$9$k@55,I=8=$H$7$F2r<a$5$l$kJ8;zNs$+!"(B($B:G8e$N(B) $B=pL>$,>C5n$5$l$k$H$$$&(B
+$B0UL#$G$"$k%7%s%\%k(B @code{signature}$B!"$^$?(B
 $B$O(B @code{gnus-article-banner-alist} $B$N@55,I=8=$KBP1~$7$?%7%s%\%k$G$"$k$3(B
 $B$H$,$G$-$^$9!#(B
 
-- 
1.7.10.4