2004-11-23 Daishi Kato <daishi@axlight.com>

	* elsp-spamoracle.el (elmo-spam-spamoracle-spam-header-regexp):
	New user option.
	(elmo-spam-spamoracle-call): Use it.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index ea8d644..885c4a0 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-23  Daishi Kato <daishi@axlight.com>
+
+       * elsp-spamoracle.el (elmo-spam-spamoracle-spam-header-regexp):
+       New user option.
+       (elmo-spam-spamoracle-call): Use it.
+
 2004-11-23  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
        * elmo.el (elmo-message-accessible-p): Message in dop spool

diff --git a/elmo/elsp-spamoracle.el b/elmo/elsp-spamoracle.el
index a20926d..1c57b10 100644 (file)
--- a/elmo/elsp-spamoracle.el
+++ b/elmo/elsp-spamoracle.el
@@ -50,6 +50,11 @@
   :type '(file :tag "Filename of the SpamOracle database")
   :group 'elmo-spam-spamoracle)
 
+(defcustom elmo-spam-spamoracle-spam-header-regexp "^X-Spam: yes;"
+  "Regexp of the SpamOracle spam header."
+  :type '(string :tag "Regexp of the SpamOracle spam header")
+  :group 'elmo-spam-spamoracle)
+
 (eval-and-compile
   (luna-define-class elsp-spamoracle (elsp-generic)))
 
@@ -81,7 +86,8 @@
          (goto-char (point-min))
          (let ((body-point (re-search-forward "^$" nil t)))
            (goto-char (point-min))
-           (re-search-forward "^X-Spam: yes;" body-point t)))
+           (re-search-forward elmo-spam-spamoracle-spam-header-regexp
+                              body-point t)))
       t)))
 
 (luna-define-method elmo-spam-buffer-spam-p ((processor elsp-spamoracle)