From be8050f8941b58526319a242aefa9c2e4449563b Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 30 Sep 2005 00:23:10 +0000 Subject: [PATCH] Synch to No Gnus 200509300019. --- lisp/ChangeLog | 7 +++++++ lisp/spam.el | 15 ++++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7af7006..72db920 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2005-09-29 Simon Josefsson + + * spam.el: Load hashcash when compiling, to avoid warnings. Don't + autoload mail-check-payment. + (spam-check-hashcash): Define unconditionally, since hashcash.el + is part of Gnus now. Ignore errors from payment checking. + 2005-09-28 Reiner Steib * message.el (message-bold-region, message-unbold-region): Rename diff --git a/lisp/spam.el b/lisp/spam.el index 467bc85..5a47b7e 100644 --- a/lisp/spam.el +++ b/lisp/spam.el @@ -42,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) @@ -2023,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 -- 1.7.10.4