Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a689811..9e4af25 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2002-12-31  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       patches from Michael Shields  <shields@msrl.com>
+
+       * 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  <yamaoka@jpl.org>
 
        * gnus-start.el (gnus-load): Replace `ding-file' with `file'.

diff --git a/lisp/spam.el b/lisp/spam.el
index cbbad60..216cb16 100644 (file)
--- 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 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-31  Kai Gro\e,A_\e(Bjohann  <kai.grossjohann@uni-duisburg.de>
+
+       * gnus.texi (Top): Add pointers to related manuals.  Suggested by
+       Reiner Steib.
+
 2002-12-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus.texi (Saving Articles): Addition.

diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi
index 7f72514..9d27452 100644 (file)
--- a/texi/gnus-ja.texi
+++ b/texi/gnus-ja.texi
@@ -490,6 +490,13 @@ Emacs \e$B$,J8>O$rJT=8$9$k?M$KNO$rM?$($k$h$&$K!"\e(Bgnus \e$B$O%K%e!<%9$rFI$`?M$KNO
 * Index::                       \e$BJQ?t!"4X?t!"35G0$N:w0z\e(B
 * Key Index::                   \e$B%-!<:w0z\e(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 (file)
--- 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 ---