From ded3fe4b0f66f247c5904d5943ffba9295038ba5 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sun, 2 Mar 2003 02:59:10 +0000 Subject: [PATCH] Synch to Oort Gnus. --- lisp/ChangeLog | 4 +++ lisp/nnvirtual.el | 2 +- lisp/spam.el | 12 ++++++--- texi/ChangeLog | 13 +++++++++ texi/gnus-ja.texi | 42 +++++++++++++++++------------ texi/gnus.texi | 78 ++++++++++++++++++++++++++++++----------------------- 6 files changed, 96 insertions(+), 55 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e4fe4f2..0c0cc3c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2003-03-02 Jesper Harder + + * nnvirtual.el (nnvirtual-update-xref-header): Simplify. + 2003-03-01 Jesper Harder * gnus-art.el (gnus-article-refer-article): Be more permissive. diff --git a/lisp/nnvirtual.el b/lisp/nnvirtual.el index 855e938..76a4670 100644 --- a/lisp/nnvirtual.el +++ b/lisp/nnvirtual.el @@ -427,7 +427,7 @@ component group will show up when you enter the virtual group.") (concat (regexp-quote (gnus-group-real-name group)) ":[0-9]+") nil t) (replace-match "" t t)) - (unless (= (point) (point-max)) + (unless (eobp) (insert " ") (when (not (string= "" prefix)) (while (re-search-forward "[^ ]+:[0-9]+" nil t) diff --git a/lisp/spam.el b/lisp/spam.el index bd66baf..a3ae80d 100644 --- a/lisp/spam.el +++ b/lisp/spam.el @@ -807,10 +807,16 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)." (insert article-string) (spam-stat-buffer-is-non-spam)))))) + (defun spam-maybe-spam-stat-load () + (when spam-use-stat (spam-stat-load))) + + (defun spam-maybe-spam-stat-save () + (when spam-use-stat (spam-stat-save))) + ;; Add hooks for loading and saving the spam stats - (when spam-use-stat - (add-hook 'gnus-save-newsrc-hook 'spam-stat-save) - (add-hook 'gnus-get-new-news-hook 'spam-stat-load))) + (add-hook 'gnus-save-newsrc-hook 'spam-maybe-spam-stat-save) + (add-hook 'gnus-get-new-news-hook 'spam-maybe-spam-stat-load) + (add-hook 'gnus-startup-hook 'spam-maybe-spam-stat-load)) (file-error (progn (defalias 'spam-stat-register-ham-routine 'ignore) diff --git a/texi/ChangeLog b/texi/ChangeLog index 84556a0..6943310 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,16 @@ +2003-03-01 Jesper Harder + + * gnus.texi (Troubleshooting): Fix typo. + (Group Parameters): Markup fix. + (Article Hiding, Splitting Mail, Fancy Mail Splitting) + (Document Server Internals, Score Variables, Adaptive Scoring) + (X-Face, Hashcash): do. + +2003-02-28 Vasily Korytov + + * gnus.texi: New values, 'to-list and 'cc-list, for + gnus-boring-article-headers. + 2003-02-28 Teodor Zlatanov * gnus.texi (Extending the spam elisp package): added mention of diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 3aee8d0..ccb49b5 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -2925,8 +2925,8 @@ kiboze $B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"(Bkiboze $B%0%k!<%W$K!V4^$ $BL$FI!"4{FI5-;v$NN>J}$rA4$FI=<($7$^$9!#(B @item an integer -$B$=$N%0%k!<%W$N:G8e$N@0?t8D$N5-;v$rI=<($7$^$9!#$3$l$O(B C-u $B@0?t(B $B$G$=$N%0%k!<(B -$B%W$KF~$k$N$HF1$8$G$9!#(B +$B$=$N%0%k!<%W$N:G8e$N(B @var{integer} $B8D$N5-;v$rI=<($7$^$9!#$3$l$O(B C-u +@var{integer} $B$G$=$N%0%k!<%W$KF~$k$N$HF1$8$G$9!#(B @item default $B=i4|@_Dj$G$NI=<(5-;v$rI=<($7$^$9!#$3$l$ODL>o$OL$FI5-;v$H0uIU$-5-;v$G$9!#(B @@ -8007,14 +8007,15 @@ Fonts})$B!#F1$8%a%C%;!<%8$NCf$KJ#?t$N5-;v$+$i$N0zMQ$,$"$k$H!"(Bgnus $B$O$=$l$ @item gnus-article-address-banner-alist @vindex gnus-article-address-banner-alist $B%a!<%k%"%I%l%9$H%P%J!<$NO"A[%j%9%H$G$9!#$=$l$>$l$NMWAG(B -$B$O(B @code{(ADDRESS . BANNER)} $B$N7A<0$r;}$A!"$3$3$G(B ADDRESS $B$O(B From $B%X%C%@!<(B -$B$K$"$k%a!<%k%"%I%l%9$K%^%C%A$9$k@55,I=8=!"(BBANNER $B$O%7%s%\(B -$B%k(B @code{signature}$B!"(B@code{gnus-article-banner-alist} $B$NMWAG!"@55,I=8=$^(B -$B$?$O(B @code{nil} $B$N$&$A$N0l$D$G$9!#(BADDRESS $B$,CxC$7$^$9!#Nc$($P!"Aw?.l9g!"0J2<(B -$B$NMWAG$G$=$l$i$r>C$9$3$H$,$G$-$^$9!#(B +$B$O(B @code{(@var{address} . @var{banner})} $B$N7A<0$r;}$A!"$3$3(B +$B$G(B @var{address} $B$O(B From $B%X%C%@!<$K$"$k%a!<%k%"%I%l%9$K%^%C%A$9$k@55,I=(B +$B8=!"(B@var{banner} $B$O%7%s%\%k(B @code{signature}$B!"(B +@code{gnus-article-banner-alist} $B$NMWAG!"@55,I=8=$^$?$O(B @code{nil} $B$N$&(B +$B$A$N0l$D$G$9!#(B@var{address} $B$,CxC$7$^$9!#Nc$($P!"Aw?.l9g!"0J2<$NMWAG$G$=$l$i$r>C$9$3$H$,$G$-$^(B +$B$9!#(B @lisp ("@@yoo-hoo\\.co\\.jp\\'" . "\n_+\nDo You Yoo-hoo!\\?\n.*\n.*\n") @@ -9996,6 +9997,12 @@ Gnus $B$O%X%C%@!<$NJB$YBX$((B (sort) $B$b9T$$$^$9(B ($B$3$l$O%G%#%U%)%k%H$G @item to-address @code{To} $BMs$,8=:_$N%0%k!<%W$N(B @code{to-address} $B%Q%i%a!<%?$HF1$8$b$N$7(B $B$+4^$s$G$$$J$$>l9g$K$O>C5n$7$^$9!#(B +@item to-list +@code{To} $BMs$,8=:_$N%0%k!<%W$N(B @code{to-list} $B%Q%i%a!<%?$HF1$8$b$N$7$+4^(B +$B$s$G$$$J$$>l9g$K$O>C5n$7$^$9!#(B +@item cc-list +@code{CC} $BMs$,8=:_$N%0%k!<%W$N(B @code{to-list} $B%Q%i%a!<%?$HF1$8$b$N$7$+4^(B +$B$s$G$$$J$$>l9g$K$O>C5n$7$^$9!#(B @item date $B$=$N5-;v$,2a5n;0F|0JFb$N$b$N$G$"$l$P!"(B@code{Date} $BMs$r>C5n$7$^$9!#(B @item long-to @@ -17630,7 +17637,7 @@ Gnus $B$O2?EY$b%9%3%"O"A[%j%9%H$rFI$_9~$`$N$rHr$1$k$?$a$K!"$=$l$N%-%c%C%7%e(B @item gnus-score-file-suffix @vindex gnus-score-file-suffix $B%9%3%"%U%!%$%k$K$?$I$jCe$/$?$a$K%0%k!<%WL>$K2C$($k@\Hx8l$G$9(B ($B=i4|CM(B -$B$G(B @samp{SCORE} $B$G$9!#(B) +$B$G(B @file{SCORE} $B$G$9!#(B) @item gnus-score-uncacheable-files @vindex gnus-score-uncacheable-files @@ -18162,7 +18169,7 @@ gnus $B$K$O$3$l$i$rA4$F<+F0E*$K(B --- $B$^$k$GKbK!$G$b;H$C$?$h$&$K:n@.(B @vindex gnus-adaptive-file-suffix $BE,1~@-%9%3%"EPO?9`L\$O!"%0%k!<%WL>$K(B @code{gnus-adaptive-file-suffix} $B$r(B -$BIU2C$7$?L>A0$N%U%!%$%k$KF~$l$i$l$^$9!#=i4|@_DjCM$O(B @samp{ADAPT} $B$G$9!#(B +$BIU2C$7$?L>A0$N%U%!%$%k$KF~$l$i$l$^$9!#=i4|@_DjCM$O(B @file{ADAPT} $B$G$9!#(B @vindex gnus-score-exact-adapt-limit $BE,1~@-%9%3%"$r9T$&$H$-$O!"ItJ,J8;zNs0lCW$d%U%!%8!<$J0lCW$r9T$C$?J}$,!"$*(B @@ -20918,11 +20925,12 @@ Spam $B$H@o$&$?$a$N?7$7$$5;K!$O!"%a%C%;!<%8$rAw?.$9$k:]$K$$$/$P$/$+$NIiC4(B @item hashcash-payment-alist @vindex hashcash-payment-alist $B2??M$+$NWFM$N%S%C%H?t$G$9!#$3$l$O$^$?(B @samp{(ADDR STRING AMOUNT)} $B$NMW(B -$BAG$r;}$D$3$H$b2DG=$G!"(BSTRING $B$OJ8;zNs(B ($BDL>o$O%a!<%k%"%I%l%9$+%K%e!<%9%0(B -$B%k!<%WL>(B) $B$H$7$F;H$o$l$^$9!#(B +$BMW5a$9$k$+$b$7$l$^$;$s!#$3$NJQ?t$O(B @samp{(@var{addr} @var{amount})} $B$N7A(B +$B<0$NMWAG$N%j%9%H$G!"(B@var{addr} $B$OWFM$N%S%C%H?t$G$9!#$3$l$O$^(B +$B$?(B @samp{(@var{addr} @var{string} @var{amount})} $B$NMWAG$r;}$D$3$H$b2DG=(B +$B$G!"(B@var{string} $B$OJ8;zNs(B ($BDL>o$O%a!<%k%"%I%l%9$+%K%e!<%9%0%k!<%WL>(B) $B$H(B +$B$7$F;H$o$l$^$9!#(B @item hashcash @vindex hashcash diff --git a/texi/gnus.texi b/texi/gnus.texi index f3ded5f..40d476e 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -2832,8 +2832,8 @@ display on entering the group. Valid values are: Display all articles, both read and unread. @item an integer -Display the last INTEGER articles in the group. This is the same as -entering the group with C-u INTEGER. +Display the last @var{integer} articles in the group. This is the same as +entering the group with C-u @var{integer}. @item default Display the default visible articles, which normally includes unread and @@ -8169,14 +8169,14 @@ the sender of an article has a certain mail address specified in @item gnus-article-address-banner-alist @vindex gnus-article-address-banner-alist Alist of mail addresses and banners. Each element has the form -@code{(ADDRESS . BANNER)}, where ADDRESS is a regexp matching a mail -address in the From header, BANNER is one of a symbol @code{signature}, -an item in @code{gnus-article-banner-alist}, a regexp and @code{nil}. -If ADDRESS matches author's mail address, it will remove things like -advertisements. For example, if a sender has the mail address -@samp{hail@@yoo-hoo.co.jp} and there is a banner something like -@samp{Do You Yoo-hoo!?} in all articles he sends, you can use the -following element to remove them: +@code{(@var{address} . @var{banner})}, where @var{address} is a regexp +matching a mail address in the From header, @var{banner} is one of a +symbol @code{signature}, an item in @code{gnus-article-banner-alist}, +a regexp and @code{nil}. If @var{address} matches author's mail +address, it will remove things like advertisements. For example, if a +sender has the mail address @samp{hail@@yoo-hoo.co.jp} and there is a +banner something like @samp{Do You Yoo-hoo!?} in all articles he +sends, you can use the following element to remove them: @lisp ("@@yoo-hoo\\.co\\.jp\\'" . "\n_+\nDo You Yoo-hoo!\\?\n.*\n.*\n") @@ -10529,6 +10529,12 @@ name. @item to-address Remove the @code{To} header if it only contains the address identical to the current groups's @code{to-address} parameter. +@item to-list +Remove the @code{To} header if it only contains the address identical to +the current groups's @code{to-list} parameter. +@item cc-list +Remove the @code{CC} header if it only contains the address identical to +the current groups's @code{to-list} parameter. @item date Remove the @code{Date} header if the article is less than three days old. @@ -12818,7 +12824,7 @@ function. @vindex nnmail-mail-splitting-charset @vindex nnmail-mail-splitting-decodes -By default the splitting codes MIME decodes headers so you can match +By default the splitting codes @sc{mime} decodes headers so you can match on non-ASCII strings. The @code{nnmail-mail-splitting-charset} variable specifies the default charset for decoding. The behaviour can be turned off completely by binding @@ -13592,10 +13598,10 @@ The @samp{" *nnmail incoming*"} is narrowed to the message in question when the @code{:} function is run. @item -@code{(! @var{func} @var{split})}: If the split is a list, and the first -element is @code{!}, then SPLIT will be processed, and FUNC will be -called as a function with the result of SPLIT as argument. FUNC should -return a split. +@code{(! @var{func} @var{split})}: If the split is a list, and the +first element is @code{!}, then @var{split} will be processed, and +@var{func} will be called as a function with the result of @var{split} +as argument. @var{func} should return a split. @item @code{nil}: If the split is @code{nil}, it is ignored. @@ -16109,15 +16115,17 @@ the head from the body may contain a single space; and that the body is run through @code{nndoc-unquote-dashes} before being delivered. To hook your own document definition into @code{nndoc}, use the -@code{nndoc-add-type} function. It takes two parameters---the first is -the definition itself and the second (optional) parameter says where in -the document type definition alist to put this definition. The alist is -traversed sequentially, and @code{nndoc-TYPE-type-p} is called for a given type @code{TYPE}. So @code{nndoc-mmdf-type-p} is called to see whether a document -is of @code{mmdf} type, and so on. These type predicates should return -@code{nil} if the document is not of the correct type; @code{t} if it is -of the correct type; and a number if the document might be of the -correct type. A high number means high probability; a low number means -low probability with @samp{0} being the lowest valid number. +@code{nndoc-add-type} function. It takes two parameters---the first +is the definition itself and the second (optional) parameter says +where in the document type definition alist to put this definition. +The alist is traversed sequentially, and @code{nndoc-TYPE-type-p} is +called for a given type @code{TYPE}. So @code{nndoc-mmdf-type-p} is +called to see whether a document is of @code{mmdf} type, and so on. +These type predicates should return @code{nil} if the document is not +of the correct type; @code{t} if it is of the correct type; and a +number if the document might be of the correct type. A high number +means high probability; a low number means low probability with +@samp{0} being the lowest valid number. @node SOUP @@ -17972,14 +17980,15 @@ This is @file{~/News/} by default. @item gnus-score-file-suffix @vindex gnus-score-file-suffix Suffix to add to the group name to arrive at the score file name -(@samp{SCORE} by default.) +(@file{SCORE} by default.) @item gnus-score-uncacheable-files @vindex gnus-score-uncacheable-files @cindex score cache All score files are normally cached to avoid excessive re-loading of score files. However, if this might make your Emacs grow big and -bloated, so this regexp can be used to weed out score files unlikely to be needed again. It would be a bad idea to deny caching of +bloated, so this regexp can be used to weed out score files unlikely +to be needed again. It would be a bad idea to deny caching of @file{all.SCORE}, while it might be a good idea to not cache @file{comp.infosystems.www.authoring.misc.ADAPT}. In fact, this variable is @samp{ADAPT$} by default, so no adaptive score files will @@ -18524,7 +18533,7 @@ let you use different rules in different groups. @vindex gnus-adaptive-file-suffix The adaptive score entries will be put into a file where the name is the group name with @code{gnus-adaptive-file-suffix} appended. The default -is @samp{ADAPT}. +is @file{ADAPT}. @vindex gnus-score-exact-adapt-limit When doing adaptive scoring, substring or fuzzy matching would probably @@ -20959,7 +20968,7 @@ external programs from the @code{pbmplus} package and friends.@footnote{On a GNU/Linux system look for packages with names like @code{netpbm}, @code{libgr-progs} and @code{compface}.}) -(NOTE: @code{x-face} is used in the variable/function names, not +(Note: @code{x-face} is used in the variable/function names, not @code{xface}). Gnus provides a few convenience functions and variables to allow @@ -21393,11 +21402,12 @@ done. Suggested useful values include 17 to 29. @item hashcash-payment-alist @vindex hashcash-payment-alist Some receivers may require you to spend burn more CPU time than the -default. This variable contains a list of @samp{(ADDR AMOUNT)} cells, -where ADDR is the receiver (email address or newsgroup) and AMOUNT is -the number of bits in the collision that is needed. It can also -contain @samp{(ADDR STRING AMOUNT)} cells, where the STRING is the -string to use (normally the email address or newsgroup name is used). +default. This variable contains a list of @samp{(@var{addr} +@var{amount})} cells, where @var{addr} is the receiver (email address +or newsgroup) and @var{amount} is the number of bits in the collision +that is needed. It can also contain @samp{(@var{addr} @var{string} +@var{amount})} cells, where the @var{string} is the string to use +(normally the email address or newsgroup name is used). @item hashcash @vindex hashcash @@ -24393,7 +24403,7 @@ the elisp profiler, ELP. The profiler is (or should be) fully documented elsewhere, but to get you started there are a few steps that need to be followed. First, instrument the part of Gnus you are interested in for profiling, e.g. @kbd{M-x elp-instrument-package RET -gnus} or @kbd{M-x elp-instrument-packagre RET message}. Then perform +gnus} or @kbd{M-x elp-instrument-package RET message}. Then perform the operation that is slow and press @kbd{M-x elp-results}. You will then see which operations that takes time, and can debug them further. If the entire operation takes much longer than the time spent in the -- 1.7.10.4