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.

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 668d7ddfbaac9acf10919bf255f8bf02b0b8e471..8e1bba700fdf04c9ece09ba338192c99fe958484 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/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.

diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 463a1e0af55bbc5d0fbb5b39da76796693b55233..26d54477bb4b40eb82d7a5e5976e08b53090927a 100644 (file)
--- a/doc/misc/gnus.texi
+++ b/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

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index a9efd57c5de8da16f8ece3d3635c1cf4c2968ed7..bfdda731d353f36d0eda9e57cb04dacb078da174 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/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.
 

diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index f7498cdf15999d6697f03bdfadcfd84cb229c9b1..a41a5d7334433a254d7b0ebd5f365d504e2d5fe7 100644 (file)
--- a/lisp/gnus/nnmail.el
+++ b/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.