From: yamaoka Date: Tue, 4 Jan 2005 00:25:16 +0000 (+0000) Subject: Synch to No Gnus 200501032253. X-Git-Tag: t-gnus-6_17_4-quimby-~607 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b9ce06e764d1fadc86bd37160a73b7900b4c2f9;p=elisp%2Fgnus.git- Synch to No Gnus 200501032253. --- diff --git a/GNUS-NEWS b/GNUS-NEWS index 69c68b5..3d020cf 100644 --- a/GNUS-NEWS +++ b/GNUS-NEWS @@ -31,7 +31,7 @@ and marked. The data in `~/News/marks' has priority over the same data in `~/.newsrc.eld'. ** Picons can be displayed right from the textual address, see -`gnus-picon-style' +`gnus-picon-style'. *Note Picons::. ** You can import and export your RSS subscriptions from OPML files. *Note RSS::. @@ -84,10 +84,10 @@ message-generate-hashcash t)' to enable. ** Gnus supports new limiting commands in the Summary buffer: `/ r' (`gnus-summary-limit-to-replied') and `/ R' -(`gnus-summary-limit-to-recipient'). +(`gnus-summary-limit-to-recipient'). *Note Limiting::. ** Gnus supports a new sort command in the Summary buffer: `C-c C-s C-t' -(`gnus-summary-sort-by-recipient'). +(`gnus-summary-sort-by-recipient'). *Note Summary Sorting:: ** The `nnrss' back end now supports multilingual text. Non-ASCII group names for the `nnrss' groups are also supported. *Note RSS::. @@ -98,6 +98,10 @@ key ring when you click on them. ** Gnus uses narrowing to hide headers in Message buffers. The `References' header is hidden by default. To make all headers visible, use `(setq message-hidden-headers nil)'. + +** `gnus-decay-scores' can be a regexp matching score files. This +allows to decay only adaptive score files. *Note Score Decays::. + * For older news, see Gnus info node "New Features". diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4d6b53b..d7f680a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-01-03 Reiner Steib + + * gnus-score.el (gnus-decay-scores, gnus-score-load-file): Allow + to apply decay on score files matching a regexp. + 2004-12-30 Katsumi Yamaoka * gnus-group.el (gnus-group-line-format-alist): Keep the forward diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el index 3e38771..405634f 100644 --- a/lisp/gnus-score.el +++ b/lisp/gnus-score.el @@ -146,9 +146,15 @@ will be expired along with non-matching score entries." :type 'boolean) (defcustom gnus-decay-scores nil - "*If non-nil, decay non-permanent scores." + "*If non-nil, decay non-permanent scores. + +If it is a regexp, only decay score files matching regexp." :group 'gnus-score-decay - :type 'boolean) + :type `(choice (const :tag "never" nil) + (const :tag "always" t) + (const :tag "adaptive score files" + ,(concat "\\." gnus-adaptive-file-suffix "\\'")) + (regexp))) (defcustom gnus-decay-score-function 'gnus-decay-score "*Function called to decay a score. @@ -1244,7 +1250,9 @@ If FORMAT, also format the current score file." (decay (car (gnus-score-get 'decay alist))) (eval (car (gnus-score-get 'eval alist)))) ;; Perform possible decays. - (when (and gnus-decay-scores + (when (and (if (stringp gnus-decay-scores) + (string-match gnus-decay-scores file) + gnus-decay-scores) (or cached (file-exists-p file)) (or (not decay) (gnus-decay-scores alist decay))) diff --git a/texi/ChangeLog b/texi/ChangeLog index 5fed338..c0c3cc3 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,12 @@ +2005-01-03 Reiner Steib + + * gnus-news.texi: Mention change new behavior of + `gnus-decay-scores'. Added some references. + + * gnus.texi (Score Decays): `gnus-decay-scores' can be a regexp + matching score files as well. + (Picons): Describe `gnus-picon-style'. + 2005-01-02 Romain Francoise * gnus-news.texi: Mention the new method used to hide headers. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index b34cb7f..1b56660 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -19723,9 +19723,11 @@ Redmondo $B$,>C$($?7$2<$K$D$$$F=q$$$?$H$-$K%U%)%m!<%"%C%W$7$?A4$F$N?M$O%9(B Gnus $B$O$3$NLdBj$N2r7h$r=u$1$k$?$a$K%9%3%"$rIe$i$;$k5!9=$rDs6!$7$^$9!#%9(B $B%3%"%U%!%$%k$OFI$_9~$^$l!"(B@code{gnus-decay-scores} $B$,(B @code{nil} $B$G$J$$(B $B$H!"(Bgnus $B$O%9%3%"%U%!%$%k$rIeGT5!9=$rDL$7!"A4$F$N1JB3$G$J$$%9%3%"K!B'$N(B -$B%9%3%"$r2<$2$^$9!#IeGT<+?H$O4X?t(B @code{gnus-decay-score-function} $B$K$h$C(B -$B$Fl=j$G$9!#$3$l$O(B @file{news}, @file{domains}, @file{users} ($B$J$I$J$I(B) $B$N%5%V%G%#%l%/%H%j!<$,4^$^$l$F$$$k%G%#%l%/%H%j!<(B $B$N%j%9%H$G$9!#(B@code{("/usr/lib/picon" "/usr/local/faces")} $B$,%G%#%U%)%k(B @@ -21296,18 +21303,18 @@ Picon $B%G!<%?%Y!<%9$N>l=j$G$9!#$3$l$O(B @file{news}, @file{domains}, @item gnus-picon-news-directories @vindex gnus-picon-news-directories -@code{gnus-picon-database} $B$+$i%K%e!<%9%0%k!<%WMQ$N%U%'!<%9$rC5$9$?$a$N(B +@code{gnus-picon-databases} $B$+$i%K%e!<%9%0%k!<%WMQ$N%U%'!<%9$rC5$9$?$a$N(B $B%5%V%G%#%l%/%H%j!<$N%j%9%H$G$9!#%G%#%U%)%k%H$O(B @code{("news")} $B$G$9!#(B @item gnus-picon-user-directories @vindex gnus-picon-user-directories -@code{gnus-picon-database} $B$+$i%f!<%6$N%U%'!<%9$rC5$9$?$a$N%5%V%G%#%l%/(B +@code{gnus-picon-databases} $B$+$i%f!<%6$N%U%'!<%9$rC5$9$?$a$N%5%V%G%#%l%/(B $B%H%j!<$N%j%9%H$G$9!#(B@code{("local" "users" "usenix" "misc")} $B$,%G%#%U%)(B $B%k%H$G$9!#(B @item gnus-picon-domain-directories @vindex gnus-picon-domain-directories -@code{gnus-picon-database} $B$+$i%I%a%$%sL>$N%U%'!<%9$rC5$9$?$a$N%5%V%G%#(B +@code{gnus-picon-databases} $B$+$i%I%a%$%sL>$N%U%'!<%9$rC5$9$?$a$N%5%V%G%#(B $B%l%/%H%j!<$N%j%9%H$G$9!#%G%#%U%)%k%H$O(B @code{("domains")} $B$G$9!#$3$N%j%9(B $B%H$K(B @samp{"unknown"} $B$rDI2C$7$F$*$-$?$/$J$k?M$b$$$k$G$7$g$&!#(B diff --git a/texi/gnus-news.texi b/texi/gnus-news.texi index 83f2a59..a5d072b 100644 --- a/texi/gnus-news.texi +++ b/texi/gnus-news.texi @@ -41,7 +41,7 @@ has priority over the same data in @file{~/.newsrc.eld}. @item Picons can be displayed right from the textual address, see -@code{gnus-picon-style} +@code{gnus-picon-style}. @ref{Picons}. @item You can import and export your @acronym{RSS} subscriptions from @@ -100,10 +100,11 @@ See the Gnus manual, section Hashcash, for more information. Use @item Gnus supports new limiting commands in the Summary buffer: @kbd{/ r} (@code{gnus-summary-limit-to-replied}) and @kbd{/ R} -(@code{gnus-summary-limit-to-recipient}). +(@code{gnus-summary-limit-to-recipient}). @ref{Limiting}. @item Gnus supports a new sort command in the Summary buffer: -@kbd{C-c C-s C-t} (@code{gnus-summary-sort-by-recipient}). +@kbd{C-c C-s C-t} (@code{gnus-summary-sort-by-recipient}). @ref{Summary +Sorting} @item The @code{nnrss} back end now supports multilingual text. Non-@acronym{ASCII} group names for the @code{nnrss} groups are also @@ -115,6 +116,9 @@ PGP key ring when you click on them. @item Gnus uses narrowing to hide headers in Message buffers. The @code{References} header is hidden by default. To make all headers visible, use @code{(setq message-hidden-headers nil)}. -@end itemize +@item @code{gnus-decay-scores} can be a regexp matching score files. +This allows to decay only adaptive score files. @ref{Score Decays}. + +@end itemize @c gnus-news.texi ends here. diff --git a/texi/gnus.texi b/texi/gnus.texi index 118ece5..4a4e988 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -20534,9 +20534,12 @@ Gnus provides a mechanism for decaying scores to help with this problem. When score files are loaded and @code{gnus-decay-scores} is non-@code{nil}, Gnus will run the score files through the decaying mechanism thereby lowering the scores of all non-permanent score rules. -The decay itself if performed by the @code{gnus-decay-score-function} -function, which is @code{gnus-decay-score} by default. Here's the -definition of that function: +If @code{gnus-decay-scores} is a regexp, only score files matching this +regexp are treated. E.g. you may set it to @samp{\\.ADAPT\\'} if only +@emph{adaptive} score files should be decayed. The decay itself if +performed by the @code{gnus-decay-score-function} function, which is +@code{gnus-decay-score} by default. Here's the definition of that +function: @lisp (defun gnus-decay-score (score) @@ -22179,6 +22182,11 @@ To enable displaying picons, simply make sure that @code{gnus-picon-databases} points to the directory containing the Picons databases. +@vindex gnus-picon-style +The variable @code{gnus-picon-style} controls how picons are displayed. +If @code{inline}, the textual representation is replaced. If +@code{right}, picons are added right to the textual representation. + The following variables offer control over where things are located. @table @code