From e0574aa905d86ed0277c9767dc648116b2913e7b Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 27 Mar 2003 22:41:19 +0000 Subject: [PATCH] Synch to Oort Gnus 200303271920. --- lisp/ChangeLog | 13 +++++++++---- lisp/gnus-art.el | 31 ++++++++++++++++++++++--------- texi/ChangeLog | 35 ++++++++++++++++++++++------------- texi/gnus-ja.texi | 13 ++++++++----- texi/gnus.texi | 23 +++++++++++++---------- 5 files changed, 74 insertions(+), 41 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7988961..7cc5fb1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2003-03-27 Simon Josefsson + + * gnus-art.el (article-decode-group-name): Be correct instead of + smart. + 2003-03-27 Katsumi Yamaoka * lpath.el: Bind url-current-object for FSF Emacs; bind @@ -18,11 +23,11 @@ * gnus-sum.el (gnus-summary-find-for-reselect): Renamed from gnus-summary-find-uncancelled, skip temporary articles inserted by "refer" functions. - + 2003-03-26 Vasily Korytov * smiley.el (smiley-buffer): New function. - + 2003-03-26 Kevin Greiner * gnus-agent.el (gnus-agent-fetch-selected-article): Replaced @@ -30,14 +35,14 @@ gnus-summary-update-download-mark (which updates the article's face by calling gnus-summary-update-line AND updates the download mark to show that the article was fetched). - + 2003-03-23 Kevin Greiner * gnus-agent.el (gnus-agent-expire-unagentized-dirs): Provides option of deleting agent directories for groups/servers that are not currently agentized. (gnus-agent-expire): Use gnus-agent-expire-unagentized-dirs. - + * gnus-int.el (gnus-open-server): Report backend errors in condition handler. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index f3cf451..63a1962 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -2260,23 +2260,36 @@ If PROMPT (the prefix), prompt for a coding system to use." gnus-group-name-charset-group-alist) (gnus-buffer-live-p gnus-original-article-buffer)) (save-restriction - (goto-char (point-min)) (article-narrow-to-head) - (while (re-search-forward (concat "^\\(Newsgroups\\|Followup-To\\): " - "\\(\\(.\\|\n[\t ]\\)*\\)\n[^\t ]") + (with-current-buffer gnus-original-article-buffer + (goto-char (point-min))) + (while (re-search-forward "^Newsgroups:\\(\\(.\\|\n[\t ]\\)*\\)\n[^\t ]" + nil t) + (replace-match (save-match-data + (gnus-decode-newsgroups + ;; XXX how to use data in article buffer? + (with-current-buffer gnus-original-article-buffer + (re-search-forward + "^Newsgroups:\\(\\(.\\|\n[\t ]\\)*\\)\n[^\t ]" + nil t) + (match-string 1)) + gnus-newsgroup-name method)) + t t nil 1)) + (goto-char (point-min)) + (with-current-buffer gnus-original-article-buffer + (goto-char (point-min))) + (while (re-search-forward "^Followup-To:\\(\\(.\\|\n[\t ]\\)*\\)\n[^\t ]" nil t) (replace-match (save-match-data (gnus-decode-newsgroups - ;; XXX how to use data in this buffer? + ;; XXX how to use data in article buffer? (with-current-buffer gnus-original-article-buffer - (goto-char (point-min)) (re-search-forward - (concat "^\\(Newsgroups\\|Followup-To\\): " - "\\(\\(.\\|\n[\t ]\\)*\\)\n[^\t ]") + "^Followup-To:\\(\\(.\\|\n[\t ]\\)*\\)\n[^\t ]" nil t) - (match-string 2)) + (match-string 1)) gnus-newsgroup-name method)) - t t nil 2)))))) + t t nil 1)))))) (autoload 'idna-to-unicode "idna") diff --git a/texi/ChangeLog b/texi/ChangeLog index 2b727f6..ba2c8df 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,12 @@ +2003-03-27 Paul Jarc + + * gnus.texi (Comparing Mail Back Ends): Note nnmaildir's + incompatibilities more prominently. + +2003-03-27 Paul Jarc + + * gnus.texi (Maildir): Note nnmail-expiry-target incompatibility. + 2003-03-27 Jesper Harder * gnus.texi (Adaptive Scoring): Fix. @@ -39,11 +48,11 @@ (Agent Expiry): Expanded description. (Agent Variables): Fixed and new descriptions. - * infohack.el (batch-makeinfo): Provide local implementation of + * infohack.el (batch-makeinfo): Provide local implementation of subst-char-in-region as the built-in implementation is unreliable on Windows XP (Intermittent failure results in build looping forever). - + 2003-03-18 Paul Jarc * gnus.texi (Maildir): Replace create-directory with @@ -217,7 +226,7 @@ (Mail Group Commands): do. * gnus.texi: Mark-up fixes. - + 2003-01-27 Teodor Zlatanov * gnus.texi: replace `H' mark with `$' mark @@ -275,7 +284,7 @@ (gnus-agent-mark-unread-after-downloaded): New variable. (gnus-agent-consider-all-articles): New variable. (gnus-agent-max-fetch-size): New variable. - + 2003-01-22 Jesper Harder * gnusref.tex (subsection*{Notes}): do. @@ -296,11 +305,11 @@ * gnus.texi: Markup fixes: use @code for nil and t, use @file for files. - + * message.texi: do. * emacs-mime.texi: do. - + 2003-01-19 Jesper Harder * dir (File): Add pgg. @@ -325,9 +334,9 @@ 2003-01-15 ShengHuo ZHU - * gnus.texi: Don't use `path' in some cases. + * gnus.texi: Don't use `path' in some cases. From the GNU coding standards: - + Please do not use the term ``pathname'' that is used in Unix documentation; use ``file name'' (two words) instead. We use the term ``path'' only for search paths, which are lists of @@ -402,7 +411,7 @@ 2003-01-09 Teodor Zlatanov - * gnus.texi (Filtering Spam Using spam.el, ifile spam filtering) + * gnus.texi (Filtering Spam Using spam.el, ifile spam filtering) (spam-stat spam filtering): added new functionality and explained old functionality better, especially where it has changed in ham/spam/unclassified group exit processing. @@ -454,8 +463,8 @@ 2003-01-05 Teodor Zlatanov - * gnus.texi (Filtering Spam Using spam.el) - (Blacklists and Whitelists, BBDB Whitelists, Blackholes) + * gnus.texi (Filtering Spam Using spam.el) + (Blacklists and Whitelists, BBDB Whitelists, Blackholes) (Bogofilter, Ifile spam filtering, Extending spam.el): updated documentation for the new spam.el functionality @@ -518,7 +527,7 @@ 2002-12-29 Lars Magne Ingebrigtsen * gnus.texi (Loose Threads): add - gnus-summary-make-false-root-always. + gnus-summary-make-false-root-always. (Finding the Parent): Change name of nnweb server. 2002-12-22 Jesper Harder @@ -536,7 +545,7 @@ * gnus.texi (Optional Back End Functions): nnchoke-request-update-info need not return the info object. - + 2002-12-15 Jesper Harder * gnusref.tex: Additions. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 8134cdf..c3f8065 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -14020,6 +14020,9 @@ nnmaildir $B$O$$$/$D$+$N%0%k!<%W%Q%i%a!<%?$r;H$$$^$9!#$3$l$i$N$9$Y$F$rL5;k(B $B%/%H%k<0$r;H$&$H!":G=i$NMWAG$,0l2s!"$=$l$>$l$N5-;v$K$D$$$FI>2A$5$l$^$9!#(B $B$7$?$,$C$F!"5-;v$r$I$3$KCV$/$+$r7h$a$k$?$a$K!"$=$N<0(B $B$O(B @code{nnmaildir-article-file-name} $B$J$I$K>H2q$9$k$3$H$,$G$-$^$9!#(B +@emph{$B$3$N%Q%i%a!<%?$,@_Dj$5$l$F$$$J$$$H!"(B +nnmaildir $B$O(B @code{expiry-target} $B%0%k!<%W%Q%i%a!<%?(B +$B$d(B @code{nnmail-expiry-target} $BJQ?t$r8\$_$^$;$s!#(B} @item read-only $B$3$l$,(B @code{t} $B$K@_Dj$5$l$F$$$k$H!"(Bnnmaildir $B$O$=$N5-;v$r$3$N%0%k!<%W$G(B @@ -14329,6 +14332,9 @@ Rand MH $B%a!<%k1\Mw%7%9%F%`$O(B UNIX $B%7%9%F%`$K$+$J$jD9$$4VB8:_$7$F$$$^$9! @item nnmaildir +$B4|8B@Z$l>C5n$dB>$N$3$H$,$i$r@_Dj$9$k$N$K!"(B@code{nnmaildir} $B$OB>$N%a!<%k(B +$B%P%C%/%(%s%I$H$O>/!90[$J$C$?!"8_49@-$NL5$$%0%k!<%W%Q%i%a!<%?$r;H$$$^$9!#(B + @code{nnmaildir} $B$OBgJ}(B @code{nnml} $B$H;w$?$b$N$G$9$,!"$$$/$i$+82Cx$J0c$$(B $B$,$"$j$^$9!#$=$l$>$l$N%a%C%;!<%8$OJL!9$N%U%!%$%k$K3JG<$5$l$^$9$,!"%U%!%$(B $B%kL>$O(B gnus $B$N5-;vHV9f$H4X78$,$"$j$^$;$s!#$^(B @@ -14358,9 +14364,6 @@ maildir $B$OC5n$dB>$N$b$N$r@_Dj$9$k$?$a$K(B @code{nnmaildir} $B$O%0%k!<%W%Q%i%a!<(B -$B%?$r;H$$$^$9$,!"B>$N%a!<%k%P%C%/%(%s%I$H$O>/$70c$$$^$9!#(B - @code{nnmaildir} $B$OB.EY$r>e$2$k$?$a$K$+$J$j$NNL$N%a%b%j$r;H$$$^$9!#(B (@code{nnml} $B$N>l9g$O%U%!%$%k$K3JG<$7!"(B@code{nnmh} $B$G$O2?EY$b5-;v%U%!%$(B $B%k$r2r@O$7$FF@$k$b$N$4$H$r!"$=$l$O%a%b%j>e$KJ];}$7$^$9!#(B) $B$3$l$,$"$J$?$K(B @@ -14369,8 +14372,8 @@ maildir $B$O/$J$$%a%b%j$r;H$&$h$&$K$9$k$3$H$,$G$-$^$9!#$3$N%-%c%C%7%e5!9=$O!"$*$=$i(B $B$/>-Mh$O:o=|$5$l$k$G$7$g$&!#(B -$B5/F0$OB>$N%P%C%/%(%s%I$h$j$b(B @code{nnmaildir} $B$,CY$$$G$7$g$&!#$=$N4V$K$"(B -$B$k$9$Y$F$N%U%!%$%k%7%9%F%`$K0MB8$7$F$$$kItJ,$OB.$$$G$7$g$&!#(B +$B5/F0$OB>$N%P%C%/%(%s%I$h$j$b(B @code{nnmaildir} $B$,CY$$$G$7$g$&!#%U%!%$%k%7(B +$B%9%F%`$K0MB8$7$F$$$kItJ,0J30$N$9$Y$F$OB.$$$G$7$g$&!#(B @code{nnmaildir} $B$O(B @code{nnoo} $B$r;H$o$J$$$N$G!"(B@code{nnmaildir} $B$+$iGI(B $B@8$7$?%P%C%/%(%s%I$r=q$/$N$K(B @code{nnoo} $B$O;H$($^$;$s!#(B diff --git a/texi/gnus.texi b/texi/gnus.texi index 79e8ab5..f6e47fe 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -14683,13 +14683,15 @@ the name of the same group that the parameter belongs to, then articles will be moved to the specified group during expiry before being deleted. @emph{If this is set to an nnmaildir group, the article will be just as old in the destination group as it was in the -source group.} So be careful with @code{expire-age} in the destination -group. If this is set to the name of the same group that the -parameter belongs to, then the article is not expired at all. If you -use the vector form, the first element is evaluated once for each +source group.} So be careful with @code{expire-age} in the +destination group. If this is set to the name of the same group that +the parameter belongs to, then the article is not expired at all. If +you use the vector form, the first element is evaluated once for each article. So that form can refer to @code{nnmaildir-article-file-name}, etc., to decide where to put the -article. +article. @emph{If this parameter is not set, nnmaildir does not fall +back to the @code{expiry-target} group parameter or the +@code{nnmail-expiry-target} variable.} @item read-only If this is set to @code{t}, nnmaildir will treat the articles in this @@ -15018,6 +15020,10 @@ friendly mail back end all over. @item nnmaildir +For configuring expiry and other things, @code{nnmaildir} uses +incompatible group parameters, slightly different from those of other +mail back ends. + @code{nnmaildir} is largely similar to @code{nnml}, with some notable differences. Each message is stored in a separate file, but the filename is unrelated to the article number in Gnus. @code{nnmaildir} @@ -15047,9 +15053,6 @@ else, and still have your marks. @code{nnml} also stores marks, but it's not as easy to work with them from outside Gnus as with @code{nnmaildir}. -For configuring expiry and other things, @code{nnmaildir} uses group -parameters slightly different from those of other mail back ends. - @code{nnmaildir} uses a significant amount of memory to speed things up. (It keeps in memory some of the things that @code{nnml} stores in files and that @code{nnmh} repeatedly parses out of message files.) If this @@ -15059,8 +15062,8 @@ would) to make it use less memory. This caching will probably be removed in the future. Startup is likely to be slower with @code{nnmaildir} than with other -back ends. Everything in between is likely to be faster, depending in -part on your file system. +back ends. Everything else is likely to be faster, depending in part +on your file system. @code{nnmaildir} does not use @code{nnoo}, so you cannot use @code{nnoo} to write an @code{nnmaildir}-derived back end. -- 1.7.10.4