[PATCH] Simplify and correct header trimming before feeding to bogofilter

[PATCH] Simplify and correct header trimming before feeding to bogofilter

[Michael Shields]

I sent this patch a few days ago, but mail.gnus.org ate it.

2002-12-19  Michael Shields  <shields@msrl.com>
	
	* spam.el (spam-bogofilter-articles): Use message-remove-header
	to remove headers; the old way incorrectly removed just the first
	line of folded headers.

--- /home/shields/gnus-CURRENT-20021216/lisp/spam.el.orig	2002-12-31 06:34:23.000000000 +0000
+++ /home/shields/gnus-CURRENT-20021216/lisp/spam.el	2002-12-31 06:34:23.000000000 +0000
@@ -530,15 +530,10 @@
 	      (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"))

-- 
Shields.

Re: [PATCH] Simplify and correct header trimming before feeding to bogofilter

[Ted Zlatanov]

On Tue, 31 Dec 2002, shields@msrl.com wrote:
> I sent this patch a few days ago, but mail.gnus.org ate it.
> 
> 2002-12-19  Michael Shields  <shields@msrl.com>
> 	
> 	* spam.el (spam-bogofilter-articles): Use
> 	message-remove-header to remove headers; the old way
> 	incorrectly removed just the first line of folded headers.

Applied, thanks.

Ted