diff options
Diffstat (limited to 'lisp/gnus/spam.el')
| -rw-r--r-- | lisp/gnus/spam.el | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el index 063ba28d6eb..8d689bf26bd 100644 --- a/lisp/gnus/spam.el +++ b/lisp/gnus/spam.el @@ -50,7 +50,6 @@ ;;; for the definitions of group content classification and spam processors (require 'gnus) -(eval-when-compile (require 'spam-report)) (eval-when-compile (require 'hashcash)) ;; for nnimap-split-download-body-default @@ -60,11 +59,10 @@ (autoload 'query-dig "dig") ;; 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 '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 (autoload 'gnus-registry-group-count "gnus-registry") @@ -94,14 +92,14 @@ Note that setting the `spam-use-move' or `spam-use-copy' backends on a group through group/topic parameters overrides this mechanism." :type '(choice (const - 'default - :tag "Move spam out of all groups and ham out of spam groups.") + :tag "Move spam out of all groups and ham out of spam groups" + default) (const - 'move-all - :tag "Move spam out of all groups and ham out of all groups.") + :tag "Move spam out of all groups and ham out of all groups" + move-all) (const - 'move-none - :tag "Never move spam or ham out of any groups.")) + :tag "Never move spam or ham out of any groups" + move-none)) :group 'spam) (defcustom spam-directory (nnheader-concat gnus-directory "spam/") @@ -2473,7 +2471,10 @@ With a non-nil REMOVE, remove the ADDRESSES." (defun spam-report-resend-register-ham-routine (articles) (spam-report-resend-register-routine articles t)) +(defvar spam-report-resend-to) + (defun spam-report-resend-register-routine (articles &optional ham) + (require 'spam-report) (let* ((resend-to-gp (if ham (gnus-parameter-ham-resend-to gnus-newsgroup-name) |