From 25f963854bc1f7956276b3c656f48b089b9ea63c Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 31 Dec 2002 13:20:48 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 13 +++++++++++++ lisp/spam.el | 11 +++-------- texi/ChangeLog | 5 +++++ texi/gnus-ja.texi | 7 +++++++ texi/gnus.texi | 7 +++++++ 5 files changed, 35 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a689811..9e4af25 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,16 @@ +2002-12-31 Teodor Zlatanov + + patches from Michael Shields + + * spam.el (spam-bogofilter-articles): Select the article + body using gnus-summary-show-article t instead of + gnus-summary-select-article; this presents the raw text + without running any hooks. + + * spam.el (spam-bogofilter-articles): Use message-remove-header + to remove headers; the old way incorrectly removed just the first + line of folded headers. + 2002-12-31 Katsumi Yamaoka * gnus-start.el (gnus-load): Replace `ding-file' with `file'. diff --git a/lisp/spam.el b/lisp/spam.el index cbbad60..216cb16 100644 --- a/lisp/spam.el +++ b/lisp/spam.el @@ -538,20 +538,15 @@ spamicity coefficient of each, and the overall article spamicity." (message "%s %d" prefix counter)) (setq article (pop articles)) (gnus-summary-goto-subject article) - (gnus-summary-select-article) + (gnus-summary-show-article t) (gnus-eval-in-buffer-window article-copy (insert-buffer-substring gnus-original-article-buffer) ;; Remove spam classification redundant headers: they may induce ;; unwanted biases in later analysis. - (goto-char (point-min)) - (while (not (or (eobp) (= (following-char) ?\n))) - (if (looking-at remove-regexp) - (delete-region (point) - (save-excursion (forward-line 1) (point))) - (forward-line 1))) - (goto-char (point-min)) + (message-remove-header remove-regexp t) ;; Bogofilter really wants From envelopes for counting articles. ;; Fake one at the beginning, make sure there will be no other. + (goto-char (point-min)) (if (looking-at "From ") (forward-line 1) (insert "From nobody " (current-time-string) "\n")) diff --git a/texi/ChangeLog b/texi/ChangeLog index 5880afa..81efada 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,8 @@ +2002-12-31 Kai Gro,A_(Bjohann + + * gnus.texi (Top): Add pointers to related manuals. Suggested by + Reiner Steib. + 2002-12-30 Lars Magne Ingebrigtsen * gnus.texi (Saving Articles): Addition. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 7f72514..9d27452 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -490,6 +490,13 @@ Emacs $B$,J8>O$rJT=8$9$k?M$KNO$rM?$($k$h$&$K!"(Bgnus $B$O%K%e!<%9$rFI$`?M$KNO * Index:: $BJQ?t!"4X?t!"35G0$N:w0z(B * Key Index:: $B%-!<:w0z(B +Other related manuals + +* Message:(message). Composing messages. +* Emacs-MIME:(emacs-mime). Composing messages; MIME-specific parts. +* Sieve:(sieve). Managing Sieve scripts in Emacs. +* PGG:(pgg). PGP/MIME with Gnus. + @detailmenu --- The Detailed Node Listing --- diff --git a/texi/gnus.texi b/texi/gnus.texi index 9c59319..f366f8e 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -435,6 +435,13 @@ the program. * Index:: Variable, function and concept index. * Key Index:: Key Index. +Other related manuals + +* Message:(message). Composing messages. +* Emacs-MIME:(emacs-mime). Composing messages; MIME-specific parts. +* Sieve:(sieve). Managing Sieve scripts in Emacs. +* PGG:(pgg). PGP/MIME with Gnus. + @detailmenu --- The Detailed Node Listing --- -- 1.7.10.4