2006-04-16 João Cachopo <joao.cachopo@inesc-id.pt> (tiny change)

	* spam.el (spam-necessary-extra-headers): Add X-CRM114-Status.
	(spam-extra-header-to-number): Return the CRM114 number as a
	number instead of a string.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e805e76..d1ad499 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-16  Jo\e,Ac\e(Bo Cachopo  <joao.cachopo@inesc-id.pt>  (tiny change)
+
+       * spam.el (spam-necessary-extra-headers): Add X-CRM114-Status. 
+       (spam-extra-header-to-number): Return the CRM114 number as a
+       number instead of a string.
+
 2006-04-16  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-art.el (gnus-face-properties-alist): Moved here from

diff --git a/lisp/spam.el b/lisp/spam.el
index a9d0ac4..ff2227b 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -1156,6 +1156,8 @@ backends)."
       (push 'X-Spam-Status list))
     (when spam-use-bogofilter
       (push 'X-Bogosity list))
+    (when spam-use-crm114
+      (push 'X-CRM114-Status list))
     list))
 
 (defun spam-user-format-function-S (headers)
@@ -1186,24 +1188,25 @@ The first group must match the number.")
 (defun spam-extra-header-to-number (header headers)
   "Transform an extra HEADER to a number, using list of HEADERS.
 Note this has to be fast."
-  (if (gnus-extra-header header headers)
-      (cond
-       ((eq header 'X-Spam-Status)
-       (string-to-number (gnus-replace-in-string
-                          (gnus-extra-header header headers)
-                          spam-spamassassin-score-regexp
-                          "\\1")))
-       ;; for CRM checking, it's probably faster to just do the string match
-       ((and spam-use-crm114 (string-match "( pR: \\([0-9.-]+\\)" header))
-       (match-string 1 header))
-       ((eq header 'X-Bogosity)
-       (string-to-number (gnus-replace-in-string
-                          (gnus-replace-in-string
-                           (gnus-extra-header header headers)
-                           ".*spamicity=" "")
-                          ",.*" "")))
-       (t nil))
-    nil))
+  (let ((header-content (gnus-extra-header header headers)))
+    (if header-content
+        (cond
+         ((eq header 'X-Spam-Status)
+          (string-to-number (gnus-replace-in-string
+                             header-content
+                             spam-spamassassin-score-regexp
+                             "\\1")))
+         ;; for CRM checking, it's probably faster to just do the string match
+         ((and spam-use-crm114 (string-match "( pR: \\([0-9.-]+\\)" header-content))
+          (string-to-number (match-string 1 header-content)))
+         ((eq header 'X-Bogosity)
+          (string-to-number (gnus-replace-in-string
+                             (gnus-replace-in-string
+                              header-content
+                              ".*spamicity=" "")
+                             ",.*" "")))
+         (t nil))
+      nil)))
 
 (defun spam-summary-score (headers &optional specific-header)
   "Score an article for the summary buffer, as fast as possible.