Synch with Oort Gnus.

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