From 82c6196c14fefc853a52e60cd67430915d52e612 Mon Sep 17 00:00:00 2001 From: Reiner Steib Date: Tue, 14 Feb 2006 14:58:55 +0000 Subject: [PATCH] (spam-check-spamassassin-headers): Adapt format for Spamassassin 3.0 or later. Reported by ARISAWA Akihiro . (spam-list-of-processors): Add spam-use-gmane. --- lisp/ChangeLog | 7 +++++++ lisp/spam.el | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6fc001dfe..a05faed86 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2006-02-14 Reiner Steib + + * spam.el (spam-check-spamassassin-headers): Adapt format for + Spamassassin 3.0 or later. Reported by ARISAWA Akihiro + . + (spam-list-of-processors): Add spam-use-gmane. + 2006-02-14 Katsumi Yamaoka * mm-util.el (mm-make-temp-file): Import the Emacs 22 version of diff --git a/lisp/spam.el b/lisp/spam.el index 14a6a831e..cb7578be0 100644 --- a/lisp/spam.el +++ b/lisp/spam.el @@ -1247,6 +1247,7 @@ Will not return a nil score." (gnus-group-spam-exit-processor-stat spam spam-use-stat) (gnus-group-spam-exit-processor-spamoracle spam spam-use-spamoracle) (gnus-group-spam-exit-processor-spamassassin spam spam-use-spamassassin) + (gnus-group-spam-exit-processor-report-gmane spam spam-use-gmane) ;; Buggy? (gnus-group-ham-exit-processor-ifile ham spam-use-ifile) (gnus-group-ham-exit-processor-bogofilter ham spam-use-bogofilter) (gnus-group-ham-exit-processor-bsfilter ham spam-use-bsfilter) @@ -2614,7 +2615,8 @@ REMOVE not nil, remove the ADDRESSES." (if score ; scoring mode (let ((header (message-fetch-field spam-spamassassin-spam-status-header))) (when header - (if (string-match "hits=\\(-?[0-9.]+\\)" header) + (if (string-match "\\(?:score\\|hits\\)=\\(-?[0-9.]+\\)" header) + ;; "score" for Spamassassin 3.0 or later. (match-string 1 header) "0"))) ;; spam detection mode -- 2.34.1