* spam.el (spam-bogofilter-articles): Use message-remove-header

to remove headers; the old way incorrectly removed just the first
line of folded headers.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4d1e044..9e4af25 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,11 +1,16 @@
 2002-12-31  Teodor Zlatanov  <tzz@lifelogs.com>
-       patch from Michael Shields  <shields@msrl.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 433aba0..216cb16 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -543,15 +543,10 @@ spamicity coefficient of each, and the overall article spamicity."
              (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"))