Synch to Gnus 200311201619.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c2e70d5..ade3500 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2003-11-20  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * spam.el (spam-ham-copy-or-move-routine): add respooling
+       support, not working well yet
+
+       * gnus.el (ham-process-destination): make 'respool option the
+       only one, so it can't be chosen together with other groups
+

 2003-11-19  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * gnus-registry.el (gnus-registry-track-extra): make it a set of
 2003-11-19  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * gnus-registry.el (gnus-registry-track-extra): make it a set of

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 0262463..e87781b 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -2013,9 +2013,7 @@ mail groups."
      :tag "Destination for ham articles at summary exit from a spam group"
      (string :tag "Move to a group")
      (repeat :tag "Move to multiple groups"
      :tag "Destination for ham articles at summary exit from a spam group"
      (string :tag "Move to a group")
      (repeat :tag "Move to multiple groups"

-            (choice
-             (string :tag "Destination group")
-             (const  :tag "Respool" respool)))
+            (string :tag "Destination group"))

      (const :tag "Respool" respool)
      (const :tag "Do nothing" nil))
    :function-document
      (const :tag "Respool" respool)
      (const :tag "Do nothing" nil))
    :function-document

@@ -2039,9 +2037,7 @@ mail groups, and only works in spam groups."
        :tag "Destination for ham articles at summary exit from spam group"
        (string :tag "Move to a group")
        (repeat :tag "Move to multiple groups"
        :tag "Destination for ham articles at summary exit from spam group"
        (string :tag "Move to a group")
        (repeat :tag "Move to multiple groups"

-              (choice
-               (string :tag "Destination group")
-               (const  :tag "Respool" respool)))
+               (string :tag "Destination group"))

        (const :tag "Respool" respool)
        (const :tag "Expire" nil))))
    :parameter-document
        (const :tag "Respool" respool)
        (const :tag "Expire" nil))))
    :parameter-document

diff --git a/lisp/spam.el b/lisp/spam.el
index 1d8beb1..4280e26 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -600,12 +600,17 @@ spamoracle database."
        (backend-supports-deletions
         (gnus-check-backend-function
          'request-move-article gnus-newsgroup-name))
        (backend-supports-deletions
         (gnus-check-backend-function
          'request-move-article gnus-newsgroup-name))

-       article mark todo deletep)
+       (respool-method (gnus-find-method-for-group gnus-newsgroup-name))
+       article mark todo deletep respool)

     (dolist (article articles)
       (when (spam-group-ham-mark-p gnus-newsgroup-name
                                   (gnus-summary-article-mark article))
        (push article todo)))
 
     (dolist (article articles)
       (when (spam-group-ham-mark-p gnus-newsgroup-name
                                   (gnus-summary-article-mark article))
        (push article todo)))
 

+    (when (member 'respool groups)
+      (setq respool t)                 ; boolean for later
+      (setq groups '("fake"))) ; when respooling, groups are dynamic so fake it
+

     ;; now do the actual move
     (dolist (group groups)
       (when (and todo (stringp group))
     ;; now do the actual move
     (dolist (group groups)
       (when (and todo (stringp group))

@@ -614,12 +619,14 @@ spamoracle database."
            (gnus-summary-mark-article article gnus-unread-mark))
          (gnus-summary-set-process-mark article))
 
            (gnus-summary-mark-article article gnus-unread-mark))
          (gnus-summary-set-process-mark article))
 

-       (if (or (not backend-supports-deletions)
-               (> (length groups) 1))
-           (progn 
-             (gnus-summary-copy-article nil group)
-             (setq deletep t))
-         (gnus-summary-move-article nil group))))
+       (if respool                        ; respooling is with a "fake" group
+           (gnus-summary-respool-article nil respool-method)
+         (if (or (not backend-supports-deletions) ; else, we are not respooling
+                 (> (length groups) 1))
+             (progn                    ; if copying, copy and set deletep
+               (gnus-summary-copy-article nil group)
+               (setq deletep t))
+           (gnus-summary-move-article nil group))))) ; else move articles

     
     ;; now delete the articles, unless a) copy is t, and there was a copy done
     ;;                                 b) a move was done to a single group
     
     ;; now delete the articles, unless a) copy is t, and there was a copy done
     ;;                                 b) a move was done to a single group

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 5029c51..e9bf8cb 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,12 @@
+2003-11-20  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * gnus.texi (Debugging IMAP): minor corrections
+
+2003-11-20  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * gnus.texi (Finding the Parent): nnml does supports fetching by
+       MID.
+

 2003-11-20  Simon Josefsson  <jas@extundo.com>
 
        * gnus.texi (Debugging IMAP): Add.
 2003-11-20  Simon Josefsson  <jas@extundo.com>
 
        * gnus.texi (Debugging IMAP): Add.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 27f41e3..5a12f93 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -9016,11 +9016,10 @@ gnus \e$B$G%a!<%k$rFI$`$3$H$NM-Mx$JE@$O!"C1=c$J%P%0$rAG@2$i$7$$IT>rM}$KCV$-\e(B
 
 \e$B$[$H$s$I$N%a!<%k%P%C%/%(%s%I$O\e(B @code{Message-ID} \e$B$G$N<hF@$,2DG=$G$9$,!"\e(B
 \e$B$"$^$jM%2m$JJ}K!$G$d$C$F$$$k$o$1$G$O$"$j$^$;$s!#\e(B@code{nnmbox},
 
 \e$B$[$H$s$I$N%a!<%k%P%C%/%(%s%I$O\e(B @code{Message-ID} \e$B$G$N<hF@$,2DG=$G$9$,!"\e(B
 \e$B$"$^$jM%2m$JJ}K!$G$d$C$F$$$k$o$1$G$O$"$j$^$;$s!#\e(B@code{nnmbox},

-@code{nnbabyl} \e$B$*$h$S\e(B @code{nnmaildir} \e$B$O$I$N%0%k!<%W$+$i$N5-;v$b0LCV$r\e(B
-\e$BF@$k$3$H$,$G$-$^$9$,!"\e(B@code{nnml}, @code{nnfolder} \e$B$*$h\e(B
-\e$B$S\e(B @code{nnimap} \e$B$O8=:_$N%0%k!<%W$KEj9F$7$?5-;v$N0LCV$7$+F@$k;v$,$G$-$^\e(B
-\e$B$;$s!#\e(B(\e$B$=$NB>$N$b$N$O;~4V$,$+$+$j$9$.$^$9!#\e(B) @code{nnmh} \e$B$G$OA4$/IT2DG=\e(B
-\e$B$G$9!#\e(B
+@code{nnbabyl}, @code{nnmaildir} \e$B$*$h$S\e(B @code{nnml} \e$B$O$I$N%0%k!<%W$+$i$N\e(B
+\e$B5-;v$b0LCV$rF@$k$3$H$,$G$-$^$9$,!"\e(B@code{nnfolder} \e$B$H\e(B @code{nnimap} \e$B$O8=\e(B
+\e$B:_$N%0%k!<%W$KEj9F$7$?5-;v$N0LCV$7$+F@$k;v$,$G$-$^$;$s!#\e(B(\e$B$=$NB>$N$b$N$O\e(B
+\e$B;~4V$,$+$+$j$9$.$^$9!#\e(B) @code{nnmh} \e$B$G$OA4$/IT2DG=$G$9!#\e(B

 
 @node Alternative Approaches
 @section \e$BBeBX<jCJ\e(B
 
 @node Alternative Approaches
 @section \e$BBeBX<jCJ\e(B

@@ -15622,28 +15621,31 @@ ACL \e$B$O\e(B Access Control List (\e$B;HMQ@)8B0lMw\e(B) \e$B$NN,$G$9!#\e(B@acronym{I
 @cindex IMAP debugging
 @cindex protocol dump (IMAP)
 
 @cindex IMAP debugging
 @cindex protocol dump (IMAP)
 

-@acronym{IMAP} \e$B$O>/$J$/$H$b\e(B @acronym{NNTP} \e$B$d\e(B @acronym{POP3} \e$B$HHf$Y$k$H\e(B
-\e$BJ#;($J%W%m%H%3%k$G$9!#$?$V$s$=$NM}M3$N$?$a$K!"<BAu>e$N%P%0$,L5$$$H$O8@$$\e(B
-\e$B@Z$l$^$;$s!#$"$J$?$,4qL/$J?6$kIq$$$K=P2q$C$?$H$7$?$i!"%5!<%P!<$+\e(B Gnus \e$B$N\e(B
-\e$B$I$A$i$+$K%P%0$,$"$k2DG=@-$,$"$j$^$9!#$"$J$?$,0lHLE*$J%M%C%H%o!<%/!&%W%m\e(B
-\e$B%H%3%k$K@:DL$7$F$$$k$J$i$P!"\e(BGnus \e$B$H%5!<%P!<$N4V$G$d$j$H$j$5$l$k%W%m%H%3\e(B
-\e$B%k!&%@%s%W$rFI$`$3$H$K$h$C$F!"$*$=$i$/$$$/$D$+$N<j3]$+$j$rCj=P$9$k$3$H$,\e(B
-\e$B$G$-$k$G$7$g$&!#@:DL$7$F$$$J$/$F$b!"%W%m%H%3%k$N$d$j$H$j$r\e(B IMAP \e$B$K4X$9$k\e(B
-\e$B%P%0Js9p$K4^$a$k$3$H$O!"$=$NLdBj$N2r7h$K$H$C$F=EMW$+$b$7$l$^$;$s!#\e(B
+@acronym{IMAP} \e$B$O\e(B @acronym{NNTP} \e$B$d\e(B @acronym{POP3} \e$B$h$j$b$C$HJ#;($J%W%m\e(B
+\e$B%H%3%k$G$9!#<BAu>e$N%P%0$,L5$$$H$O8@$$@Z$l$J$$$N$G!";d$?$A$O!"$9$0$K$=$l\e(B
+\e$B$i$rD>$9$?$a$K:GA1$r?T$/$7$^$9!#$"$J$?$,4qL/$J?6$kIq$$$K=P2q$C$?$H$7$?$i!"\e(B
+\e$B%5!<%P!<$+\e(B gnus \e$B$N$I$A$i$+$K%P%0$,$"$k2DG=@-$,$"$j$^$9!#\e(B
+
+\e$B$"$J$?$,0lHLE*$J%M%C%H%o!<%/!&%W%m%H%3%k$K@:DL$7$F$$$k$J$i$P!"\e(BGnus \e$B$H%5!<\e(B
+\e$B%P!<$N4V$G$d$j$H$j$5$l$k%W%m%H%3%k!&%@%s%W$rFI$`$3$H$K$h$C$F!"$*$=$i$/$$\e(B
+\e$B$/$D$+$N<j3]$+$j$rCj=P$9$k$3$H$,$G$-$k$G$7$g$&!#@:DL$7$F$$$J$/$F$b!"%W%m\e(B
+\e$B%H%3%k!&%@%s%W$r\e(B IMAP \e$B$K4X$9$k%P%0Js9p$K4^$a$l$P!"$=$NLdBj$N2r7h$K$H$C$F\e(B
+\e$B=EMW$J%G!<%?$G;d$?$A$r=u$1$^$9!#$7$?$,$C$F!"\e(Bgnus \e$B$N\e(B IMAP \e$B%P%0$rJs9p$9$k\e(B
+\e$B$H$-$K!"%W%m%H%3%k!&%@%s%W$r4^$a$k$3$H$r6/$/>)Ne$7$^$9!#\e(B

 
 @vindex imap-log
 
 @vindex imap-log

-\e$B$3$N%W%m%H%3%k!&%@%s%W$OBg$-$J%P%C%U%!$r:n$j$,$A$J$N$G!"%G%#%U%)%k%H$G$O\e(B
-\e$B:n$i$J$$$h$&$K$J$C$F$$$^$9!#:n$k$h$&$K$9$k$K$O!"\e(B@code{imap-log} \e$B$r0J2<$N\e(B
-\e$B$h$&$K@Z$j49$($F2<$5$$\e(B:
+\e$B%W%m%H%3%k!&%@%s%W$O!"$=$l$rM-8z$K$7$F$$$k$H$?$/$5$s$N%G!<%?$r@8@.$9$k$N\e(B
+\e$B$G!"%G%#%U%)%k%H$G$OL58z$K$J$C$F$$$^$9!#M-8z$K$9$k$K$O!"0J2<$N$h$&\e(B
+\e$B$K\e(B @code{imap-log} \e$B$r@_Dj$7$F2<$5$$\e(B:

 
 @lisp
 (setq imap-log t)
 @end lisp
 
 
 @lisp
 (setq imap-log t)
 @end lisp
 

-\e$B$3$l$O\e(B @code{imap.el} \e$B%Q%C%1!<%8$K!"%5!<%P!<$KAw$i$l$k$9$Y$F$N$b$N$H!"$9\e(B
-\e$B$Y$F$N<u$1<h$k$b$N$r%@%s%W$5$;$^$9!#$=$N=PNO$O\e(B @samp{*imap-log*} \e$B$H$$$&\e(B
-\e$B%P%C%U%!$K3JG<$5$l$^$9!#$H$-$K\e(B @code{BAD} \e$B$H$$$&;%$,IU$1$i$l$k!"%(%i!<%a%C\e(B
-\e$B%;!<%8$rC5$7$F2<$5$$!#\e(B
+\e$B$3$l$O\e(B @code{imap.el} \e$B%Q%C%1!<%8$K!"%5!<%P!<$H$N$d$j$H$j$r2?$G$b5-O?$5$;\e(B
+\e$B$^$9!#$=$N5-O?$O\e(B @samp{*imap-log*} \e$B$H$$$&%P%C%U%!$K3JG<$5$l$^$9!#$H$-$H\e(B
+\e$B$7$F\e(B @code{BAD} \e$B$H$$$&;%$,IU$1$i$l$k!"%(%i!<%a%C%;!<%8$rC5$7$F2<$5$$!#$G\e(B
+\e$B$b!"%P%0$rDs=P$9$k$H$-$O!"$9$Y$F$N%G!<%?$r4^$a$k$h$&$K$7$F2<$5$$!#\e(B

 
 @node Other Sources
 @section \e$B$=$NB>$N%0%k!<%W8;\e(B
 
 @node Other Sources
 @section \e$B$=$NB>$N%0%k!<%W8;\e(B

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 57b083e..80eccc0 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -9622,10 +9622,10 @@ then ask Google if that fails:
         (nnweb "google" (nnweb-type google))))
 @end lisp
 
         (nnweb "google" (nnweb-type google))))
 @end lisp
 

-Most of the mail back ends support fetching by @code{Message-ID}, but
-do not do a particularly excellent job at it.  That is, @code{nnmbox},
-@code{nnbabyl}, and @code{nnmaildir} are able to locate articles from
-any groups, while @code{nnml}, @code{nnfolder}, and @code{nnimap} are
+Most of the mail back ends support fetching by @code{Message-ID}, but do
+not do a particularly excellent job at it.  That is, @code{nnmbox},
+@code{nnbabyl}, @code{nnmaildir}, @code{nnml}, are able to locate
+articles from any groups, while @code{nnfolder}, and @code{nnimap} are

 only able to locate articles that have been posted to the current group.
 (Anything else would be too time consuming.)  @code{nnmh} does not
 support this at all.
 only able to locate articles that have been posted to the current group.
 (Anything else would be too time consuming.)  @code{nnmh} does not
 support this at all.

@@ -16437,30 +16437,34 @@ tool and should be used only if you are sure what the effects are.
 @cindex IMAP debugging
 @cindex protocol dump (IMAP)
 
 @cindex IMAP debugging
 @cindex protocol dump (IMAP)
 

-@acronym{IMAP} is a complex protocol, at least compared to
-@acronym{NNTP} or @acronym{POP3}.  Perhaps for that reason,
-implementation bugs are not unlikely.  If you encounter an odd
-behaviour, chances are that either the server or Gnus is buggy.  If
-you are familiar with network protocols in general, you will probably
-be able to extract some clues from reading the protocol dump of the
+@acronym{IMAP} is a complex protocol, more so than @acronym{NNTP} or
+@acronym{POP3}.  Implementation bugs are not unlikely, and we do our
+best to fix them right away.  If you encounter odd behaviour, chances
+are that either the server or Gnus is buggy.
+
+If you are familiar with network protocols in general, you will
+probably be able to extract some clues from the protocol dump of the

 exchanges between Gnus and the server.  Even if you are not familiar
 exchanges between Gnus and the server.  Even if you are not familiar

-with network protocols, including the protocol exchange in
-@acronym{IMAP}-related bug reports may be critical for solving the
-problem.
+with network protocols, when you include the protocol dump in
+@acronym{IMAP}-related bug reports you are helping us with data
+critical to solving the problem.  Therefore, we strongly encourage you
+to include the protocol dump when reporting IMAP bugs in Gnus.
+

 
 @vindex imap-log
 
 @vindex imap-log

-Because this protocol dump generates potentially large buffers, it is
-not enabled by default.  You can enable it by toggling @code{imap-log}
-as follows:
+Because the protocol dump, when enabled, generates lots of data, it is
+disabled by default.  You can enable it by setting @code{imap-log} as
+follows: 

 
 @lisp
 (setq imap-log t)
 @end lisp
 
 
 @lisp
 (setq imap-log t)
 @end lisp
 

-This instructs the @code{imap.el} package to dump everything sent to
-the server, and everything received from the server.  The output is
-stored in the buffer @samp{*imap-log*}.  Look for error messages,
-which sometimes are tagged with the keyword @code{BAD}.
+This instructs the @code{imap.el} package to log any exchanges with
+the server.  The log is stored in the buffer @samp{*imap-log*}.  Look
+for error messages, which sometimes are tagged with the keyword
+@code{BAD} - but when submitting a bug, make sure to include all the
+data.

 
 @node Other Sources
 @section Other Sources
 
 @node Other Sources
 @section Other Sources