* gnus-agent.el (gnus-agent-fetch-selected-article): Added call to

[gnus] / lisp / spam.el

diff --git a/lisp/spam.el b/lisp/spam.el
index e12df84..bb399c4 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -39,9 +39,6 @@
 (require 'dns)
 (require 'message)
 
-(eval-and-compile
-  (autoload 'bbdb-records "bbdb-com"))
-
 ;; Attempt to load BBDB macros
 (eval-when-compile
   (condition-case nil
@@ -62,20 +59,20 @@
 (defvar spam-use-blacklist t
   "True if the blacklist should be used.")
 
-(defvar spam-use-whitelist t
+(defvar spam-use-whitelist nil
   "True if the whitelist should be used.")
 
 (defvar spam-use-blackholes nil
   ;; FIXME!  Turned off for now.  The DNS routines are said to be flaky.
   "True if blackholes should be used.")
 
-(defvar spam-use-bogofilter t
+(defvar spam-use-bogofilter nil
   "True if bogofilter should be used.")
 
-(defvar spam-use-bbdb t
+(defvar spam-use-bbdb nil
   "True if BBDB should be used.")
 
-(defvar spam-use-ifile t
+(defvar spam-use-ifile nil
   "True if ifile should be used.")
 
 (defvar spam-split-group "spam"
@@ -134,6 +131,8 @@ Such articles will be transmitted to `bogofilter -s' on group exit.")
 (gnus-define-keys gnus-summary-mode-map
   "St" spam-bogofilter-score
   "Sx" gnus-summary-mark-as-spam
+  "Mst" spam-bogofilter-score
+  "Msx" gnus-summary-mark-as-spam
   "\M-d" gnus-summary-mark-as-spam)
 
 ;;; How to highlight a spam summary line.
@@ -198,8 +197,8 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
        decision)
     (while (and list-of-checks (not decision))
       (let ((pair (pop list-of-checks)))
-       (when (eval (car pair))
-         (setq decision (apply (cdr pair))))))
+       (when (symbol-value (car pair))
+         (setq decision (funcall (cdr pair))))))
     (if (eq decision t)
        nil
       decision)))
@@ -377,7 +376,7 @@ The regular expression is matched against the address.")
 ;;;     make install
 ;;;
 ;;; Here as well, you need to become super-user for the last step.  Now,
-;;; initialises your word lists by doing, under your own identity:
+;;; initialize your word lists by doing, under your own identity:
 ;;;
 ;;;     mkdir ~/.bogofilter
 ;;;     touch ~/.bogofilter/badlist