From: Teodor Zlatanov <tzz@lifelogs.com>
Date: Mon, 14 Sep 2009 19:19:41 +0000 (+0000)
Subject: (spam-unregister-on-reregister): Add boolean variable.
X-Git-Url: https://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=37ef2726014e0b6b39ddf32a68ea374d892b2d0c;hp=2202ffbdb738b7fa306d5ad8fbf5f2a4860cdd23

(spam-unregister-on-reregister): Add boolean variable.
(spam-resolve-registrations-routine): Use it to unregister articles
that change status.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7a6862024..e12780aec 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-14  Adam Sjøgren  <asjo@koldfront.dk>
+
+	* spam.el (spam-unregister-on-reregister): Add boolean variable.
+	(spam-resolve-registrations-routine): Use it to unregister articles
+	that change status.
+
 2009-09-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* parse-time.el (parse-time-syntax): Restore it to keep compatibility
diff --git a/lisp/spam.el b/lisp/spam.el
index 2d2fafa3f..c98fcf6ad 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -660,12 +660,12 @@ order for SpamAssassin to recognize the new registered spam."
   :type 'string
   :group 'spam-crm114)
 
-(defcustom spam-crm114-spam-strong-switch "--UNKNOWN"
+(defcustom spam-crm114-spam-strong-switch "--unlearn"
   "The switch that CRM114 Mailfilter uses to unregister ham messages."
   :type 'string
   :group 'spam-crm114)
 
-(defcustom spam-crm114-ham-strong-switch "--UNKNOWN"
+(defcustom spam-crm114-ham-strong-switch "--unlearn"
   "The switch that CRM114 Mailfilter uses to unregister spam messages."
   :type 'string
   :group 'spam-crm114)
@@ -1152,10 +1152,8 @@ backends)."
 				  'spam-check-crm114
 				  'spam-crm114-register-ham-routine
 				  'spam-crm114-register-spam-routine
-				  ;; does CRM114 Mailfilter support unregistration?
-				  nil
-				  nil)
-
+				  'spam-crm114-unregister-ham-routine
+				  'spam-crm114-unregister-spam-routine)
 ;;}}}
 
 ;;{{{ scoring and summary formatting