nnmail.el (nnmail-article-group): Check for a direct fancy split method.

gnus.texi (Client-Side IMAP Splitting): Add a complete nnimap fancy splitting example.

doc/misc/ChangeLog

@@ -1,3 +1,8 @@
+2011-01-30  Lars Ingebrigtsen  <larsi@gnus.org>
+
+	* gnus.texi (Client-Side IMAP Splitting): Add a complete nnimap fancy
+	splitting example.
+
 2011-01-29  Eli Zaretskii  <eliz@gnu.org>
 
 	* makefile.w32-in (MAKEINFO): Remove options, leave only program name.

doc/misc/gnus.texi

@@ -14244,6 +14244,18 @@ The default is @samp{(%Deleted %Seen)}.
 
 @end table
 
+Here's a complete example @code{nnimap} backend with a client-side
+``fancy'' splitting method:
+
+@example
+(nnimap "imap.example.com"
+        (nnimap-inbox "INBOX")
+        (nnimap-split-methods
+         (| ("MailScanner-SpamCheck" "spam" "spam.detected")
+            (to "foo@@bar.com" "foo")
+            "undecided")))
+@end example
+
 
 @node Getting Mail
 @section Getting Mail

lisp/gnus/ChangeLog

@@ -1,5 +1,8 @@
 2011-01-30  Lars Ingebrigtsen  <larsi@gnus.org>
 
+	* nnmail.el (nnmail-article-group): Check for a direct fancy split
+	method.
+
 	* nnimap.el (nnimap-request-head): Protect against not finding the
 	article by Message-ID.
 

lisp/gnus/nnmail.el

@@ -1148,6 +1148,8 @@ FUNC will be called with the group name to determine the article number."
 	  (setq nnmail-split-trace nil))
 	(if (or (and (symbolp nnmail-split-methods)
 		     (fboundp nnmail-split-methods))
+		(memq (car-safe nnmail-split-methods)
+		      '(| &))
 		(and (listp nnmail-split-methods)
 		     ;; Not a regular split method, so it has to be a
 		     ;; fancy one.