X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fspam.el;h=5a47b7e1f0ac75174e37f6ce5cbf1d10653cae63;hb=4cacb5f23eb830e6950dba987063f413977708d7;hp=23ebda714472d24fcec309ee937e9d9044499aa9;hpb=8c2a5a5cf5226f37cbe192d6aee9df67d8ec93c9;p=elisp%2Fgnus.git-

diff --git a/lisp/spam.el b/lisp/spam.el
index 23ebda7..5a47b7e 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -1,8 +1,10 @@
 ;;; spam.el --- Identifying spam
+
 ;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
-;; Keywords: network
+;; Maintainer: Ted Zlatanov <tzz@lifelogs.com>
+;; Keywords: network, spam, mail, bogofilter, BBDB, dspam, dig, whitelist, blacklist, gmane, hashcash, spamassassin, bsfilter, ifile, stat, crm114, spamoracle
 
 ;; This file is part of GNU Emacs.
 
@@ -40,6 +42,7 @@
 
 (eval-when-compile (require 'cl))
 (eval-when-compile (require 'spam-report))
+(eval-when-compile (require 'hashcash))
 
 (require 'path-util)
 (require 'gnus-sum)
@@ -58,6 +61,8 @@
 ;; autoload spam-report
 (eval-and-compile
   (autoload 'spam-report-gmane "spam-report")
+  (autoload 'spam-report-gmane-spam "spam-report")
+  (autoload 'spam-report-gmane-ham "spam-report")
   (autoload 'spam-report-resend "spam-report"))
 
 ;; autoload gnus-registry
@@ -1054,11 +1059,10 @@ backends)."
 			      nil)
 
 (spam-install-nocheck-backend 'spam-use-gmane
-			      nil
+			      'spam-report-gmane-unregister-routine
 			      'spam-report-gmane-register-routine
-			      ;; does Gmane support unregistration?
-			      nil
-			      nil)
+			      'spam-report-gmane-register-routine
+			      'spam-report-gmane-unregister-routine)
 
 (spam-install-nocheck-backend 'spam-use-resend
 			      'spam-report-resend-register-ham-routine
@@ -2020,18 +2024,10 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 
 ;;{{{ Hashcash.
 
-(eval-when-compile
-  (autoload 'mail-check-payment "hashcash"))
-
-(condition-case nil
-    (progn
-      (require 'hashcash)
-
-      (defun spam-check-hashcash ()
-	"Check the headers for hashcash payments."
-	(mail-check-payment)))	 ;mail-check-payment returns a boolean
+(defun spam-check-hashcash ()
+  "Check the headers for hashcash payments."
+  (ignore-errors (mail-check-payment)))	 ;mail-check-payment returns a boolean
 
-  (file-error))
 ;;}}}
 
 ;;{{{ BBDB
@@ -2434,7 +2430,11 @@ REMOVE not nil, remove the ADDRESSES."
 ;;{{{ Spam-report glue (gmane and resend reporting)
 (defun spam-report-gmane-register-routine (articles)
   (when articles
-    (apply 'spam-report-gmane articles)))
+    (apply 'spam-report-gmane-spam articles)))
+
+(defun spam-report-gmane-unregister-routine (articles)
+  (when articles
+    (apply 'spam-report-gmane-ham articles)))
 
 (defun spam-report-resend-register-ham-routine (articles)
   (spam-report-resend-register-routine articles t))