From 0418ec47d3bb0eb589377301c54d3b4b91774f91 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 16 Jan 2003 23:29:41 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 10 ++++++++++ lisp/gnus-fun.el | 8 ++++---- lisp/gnus-sum.el | 5 ++++- texi/ChangeLog | 1 + texi/gnus-ja.texi | 48 +++++++++++++++++++++++++++++++----------------- texi/gnus.texi | 15 +++++++++++++++ 6 files changed, 65 insertions(+), 22 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 02a7d6e..696fbc8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2003-01-16 ShengHuo ZHU + + * gnus-sum.el (gnus-alter-header-function): Add type and group. + +2003-01-16 Simon Josefsson + + * gnus-fun.el (gnus-convert-image-to-x-face-command) + (gnus-convert-image-to-face-command, gnus-x-face-from-file) + (gnus-face-from-file): Doc fix; don't mention image format. + 2003-01-16 Teodor Zlatanov * spam.el (spam-get-article-as-filename): new function (unused for now) diff --git a/lisp/gnus-fun.el b/lisp/gnus-fun.el index 2fc39f5..ef73c09 100644 --- a/lisp/gnus-fun.el +++ b/lisp/gnus-fun.el @@ -36,12 +36,12 @@ :type 'string) (defcustom gnus-convert-image-to-x-face-command "giftopnm %s | ppmnorm | pnmscale -width 48 -height 48 | ppmtopgm | pgmtopbm | pbmtoxbm | compface" - "Command for converting a GIF to an X-Face." + "Command for converting an image to an X-Face." :group 'gnus-fun :type 'string) (defcustom gnus-convert-image-to-face-command "djpeg %s | ppmnorm | pnmscale -width 48 -height 48 | ppmquant %d | pnmtopng" - "Command for converting a GIF to an X-Face." + "Command for converting an image to an X-Face." :group 'gnus-fun :type 'string) @@ -85,7 +85,7 @@ Output to the current buffer, replace text, and don't mingle error." ;;;###autoload (defun gnus-x-face-from-file (file) - "Insert an X-Face header based on a GIF image file." + "Insert an X-Face header based on an image file." (interactive "fImage file name: ") (when (file-exists-p file) (gnus-shell-command-to-string @@ -94,7 +94,7 @@ Output to the current buffer, replace text, and don't mingle error." ;;;###autoload (defun gnus-face-from-file (file) - "Return an Face header based on a JPEG image file." + "Return an Face header based on an image file." (interactive "fImage file name: ") (when (file-exists-p file) (let ((done nil) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 36ac20b..e6d72c8 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -948,7 +948,10 @@ mark: The articles mark." (defcustom gnus-alter-header-function nil "Function called to allow alteration of article header structures. The function is called with one parameter, the article header vector, -which it may alter in any way.") +which it may alter in any way." + :type '(choice (const :tag "None" nil) + function) + :group 'gnus-summary) (defvar gnus-decode-encoded-word-function (mime-find-field-decoder 'From 'nov) diff --git a/texi/ChangeLog b/texi/ChangeLog index 1c43a17..4fec9c3 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -5,6 +5,7 @@ gnus-ham-process-destinations variables (Extending the spam elisp package): fixed typo in node name (Bogofilter): new functionality and variables noted + (Filtering Spam Using The Spam ELisp Package): added mention of nnimap-split-download-body 2003-01-15 ShengHuo ZHU diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index aedfea4..e2afb52 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -10448,6 +10448,9 @@ gnus $B$O>o$KEj9F$K$I$NJ}K!$r;H$&$+$r$"$J$?$K?R$M$^$9!#(B @lisp (setq message-send-mail-function 'smtpmail-send-it smtpmail-default-smtp-server "YOUR SMTP HOST") +;; FLIM $BHG$N(B smtpmail.el $B$N$?$a$K!"0J2<$NJQ?t$r@_Dj$9$kI,MQ$,$"$j$^$9!#(B +;; $B$I$A$i$N(B smtpmail.el $B$,;H$o$l$k$+$O(B `load-path' $B$K0M$j$^$9!#(B +(setq smtp-default-smtp-server "YOUR SMTP HOST") @end lisp $B$3$l$H;w$?$b$N$K(B @code{message-smtpmail-send-it} $B$,$"$j$^$9!#(B @@ -21106,6 +21109,18 @@ Spam $B%0%k!<%W$G$O!"%G%#%U%)%k%H$G$9$Y$F$N%a%C%;!<%8$,(B spam $B$G$"$k$H2r$O(B @samp{spam} $B$G$9$,!"%+%9%?%^%$%:$9$k$3$H$O(B $B2DG=$G$9!#(B +@emph{IMAP $BMxMQl9g$O!"%V!<(B +$B%kJQ?t(B @code{nnimap-split-download-body} $B$,@_Dj$5$l$kI,MW$,$"$j$^$9!#%G%#(B +$B%U%)%k%H$G$O!"(Bnnimap $B%P%C%/%(%s%I$O%a%C%;!<%8%X%C%@!<$@$1$rpJs$rF@$k(B) $B$r;H$&$J$i$P!"$3$NJQ?t$r@_Dj(B +$B$7$J$1$l$P$J$j$^$;$s!#(BIMAP $B$NF0:n$rCY$/$7$F$7$^$&$N$G!"%G%#%U%)%k%H$G$O(B +$B@_Dj$5$l$F$$$^$;$s!#(B + +@xref{Splitting in IMAP}. + @emph{TODO: $B8=>u(B spam.el $B$O5-;v$r%P%C%/%(%s%I$KEjF~$9$k$3$H$@$1$r%5%]!<(B $B%H$7$^$9!#5-;v$,$b$O$d(B spam $B$^$?$O(B ham $B$G$O$J$$$H(B spam.el $B$KEA$($kJ}K!$O(B $B$"$j$^$;$s!#(B} @@ -21304,31 +21319,30 @@ Path $B$K(B @code{bogofilter} $B$Nl9g!"(BBogofilter $B$N $B$?5-;v$,(B bogofilter $B$N(B spam $B%G!<%?%Y!<%9$K2C$($i$^$9!#(B @end defvar -@c TRANSLATEME! @defvar gnus-group-ham-exit-processor-bogofilter -Add this symbol to a group's @code{spam-process} parameter by -customizing the group parameters or the -@code{gnus-spam-process-newsgroups} variable. When this symbol is -added to a group's @code{spam-process} parameter, the ham-marked -articles in @emph{ham} groups will be added to the Bogofilter database -of non-spam messages. Note that this ham processor has no effect in -@emph{spam} or @emph{unclassified} groups. +$B$3$N%7%s%\%k$r!"%0%k!<%W%Q%i%a!<%?$N%+%9%?%^%$%:$K$h$C$F%0%k!<%W(B +$B$N(B @code{spam-process} $B%Q%i%a!<%?$K2C$($k$+!"$^$?(B +$B$O(B @code{gnus-spam-process-newsgroups} $BJQ?t$K2C$($F2<$5$$!#$3$N%7%s%\%k(B +$B$,%0%k!<%W$N(B @code{spam-process} $B%Q%i%a!<%?$K2C$($i$l$k$H!"(Bham $B0u$,IU$$(B +$B$?(B @emph{ham} $B%0%k!<%W$N5-;v$,Hs(B-spam $B5-;vMQ$N(B Bogofilter $B%G!<%?%Y!<%9$K(B +$BDI2C$5$l$^$9!#$3$N(B ham $B%W%m%;%C%5!<$O(B @emph{spam} $B$+(B @emph{$BL$J,N`(B} $B%0%k!<(B +$B%W$K$O8z2L$r5Z$\$5$J$$$3$H$KCm0U$7$F2<$5$$!#(B @end defvar @defvar spam-bogofilter-database-directory -This is the directory where Bogofilter will store its databases. It -is not specified by default, so Bogofilter will use its own default -database directory. +$B$3$l$O(B Bogofilter $B$,$=$N%G!<%?%Y!<%9$r3JG<$9$k%G%#%l%/%H%j$G$9!#%G%#%U%)(B +$B%k%H$G$O@_Dj$5$l$F$$$J$$$N$G!"(BBogofilter $B$O$=$l<+?H$N%G%#%U%)%k%H$N%G!<(B +$B%?%Y!<%9!&%G%#%l%/%H%j$r;H$$$^$9!#(B @end defvar -The Bogofilter mail classifier is similar to ifile in intent and -purpose. A ham and a spam processor are provided, plus the -@code{spam-use-bogofilter} and @code{spam-use-bogofilter-headers} -variables to indicate to spam-split that Bogofilter should either be -used, or has already been used on the article. The 0.9.2.1 version of -Bogofilter was used to test this functionality. +Bogofilter $B$N%a!<%kJ,N`4o$O!"0U?^$HL\E*$NE@$G(B ifile $B$K;w$F$$$^$9!#(B +Spam $B$H(B ham $B$N%W%m%;%C%5!<$,Ds6!$5$l!"2C$($F(B spam-$BJ,3d(B (spam-split) $B$K(B +$B$b(B Bogofilter $B$,;H$o$l$k$Y$-$G$"$k$3$H!"$^$?$O$9$G$K5-;v$K;H$o$l$?$3$H$r(B +$B<($9(B @code{spam-use-bogofilter} $B$*$h(B +$B$S(B @code{spam-use-bogofilter-headers} $BJQ?t$,Ds6!$5$l$^$9!#$3$N5!G=$r8!::(B +$B$9$k$?$a$K(B Bogofilter $B$N%P!<%8%g%s(B 0.9.2.1 $B$,;H$o$l$^$7$?!#(B @node ifile spam filtering @subsubsection ifile $B$K$h$k(B spam $B$N_I2a(B diff --git a/texi/gnus.texi b/texi/gnus.texi index c9be0b1..f828262 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -10987,6 +10987,9 @@ package correctly. An example: @lisp (setq message-send-mail-function 'smtpmail-send-it smtpmail-default-smtp-server "YOUR SMTP HOST") +;; The following variable needs to be set because of the FLIM version of +;; smtpmail.el. Which smtpmail.el is used depends on the `load-path'. +(setq smtp-default-smtp-server "YOUR SMTP HOST") @end lisp To the thing similar to this, there is @code{message-smtpmail-send-it}. @@ -21592,6 +21595,18 @@ mail considered to be spam into the group name given by the variable @code{spam-split-group}. By default that group name is @samp{spam}, but you can customize it. +@emph{Note for IMAP users} + +The boolean variable @code{nnimap-split-download-body} needs to be +set, if you want to split based on the whole message instead of just +the headers. By default, the nnimap backend will only retrieve the +message headers. If you use spam-check-bogofilter, spam-check-ifile, +or spam-check-stat (the splitters that can benefit from the full +message body), you should set this variable. It is not set by default +because it will slow IMAP down. + +@xref{Splitting in IMAP}. + @emph{TODO: Currently, spam.el only supports insertion of articles into a backend. There is no way to tell spam.el that an article is no longer spam or ham.} -- 1.7.10.4