Synch to Oort Gnus 200304180403.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9492a9a..e1a03f0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-18  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * spam.el (spam-split): allow a particular check as a parameter,
+       e.g. (: spam-split 'spam-use-bogofilter)
+
 2003-04-17  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * gnus.el (gnus-group-short-name, gnus-group-prefixed-p): new functions

diff --git a/lisp/spam.el b/lisp/spam.el
index 531af73..2240641 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -596,10 +596,10 @@ definitely a spam.")
 "The spam-list-of-statistical-checks list contains all the mail
 splitters that need to have the full message body available.")
 
-(defun spam-split ()
+(defun spam-split (&rest specific-checks)
   "Split this message into the `spam' group if it is spam.
 This function can be used as an entry in `nnmail-split-fancy', for
-example like this: (: spam-split)
+example like this: (: spam-split).  It can take checks as parameters.
 
 See the Info node `(gnus)Fancy Mail Splitting' for more details."
   (interactive)
@@ -616,7 +616,9 @@ 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 (symbol-value (car pair))
+           (when (and (symbol-value (car pair))
+                      (or (null specific-checks)
+                          (memq (car pair) specific-checks)))
              (gnus-message 5 "spam-split: calling the %s function" (symbol-name (cdr pair)))
              (setq decision (funcall (cdr pair))))))
        (if (eq decision t)