(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 7a68620..e12780a 100644 (file)
--- 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 2d2fafa..c98fcf6 100644 (file)
--- 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