(spam-bogofilter-score): check bogofilter headers before

checking bogofilter itself

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a82003..6e946cc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-16  Teodor Zlatanov  <tzz@lifelogs.com>
+       From John Wiegley <johnw@gnu.org>
+
+       * spam.el (spam-bogofilter-score): check bogofilter headers before
+       checking bogofilter itself
+
 2003-04-16  Dave Love  <fx@gnu.org>
 
        * nnmail.el (gnus): Require.

diff --git a/lisp/spam.el b/lisp/spam.el
index a286a16..e39524b 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -980,7 +980,8 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)."
   (save-window-excursion
     (gnus-summary-show-article t)
     (set-buffer gnus-article-buffer)
-    (let ((score (spam-check-bogofilter t)))
+    (let ((score (or (spam-check-bogofilter-headers t)
+                    (spam-check-bogofilter t))))
       (message "Spamicity score %s" score)
       (or score "0"))))