[Emacs-diffs] /srv/bzr/emacs/trunk r103029: nnmail.el (nnmail-article-group): Check for a direct fancy split method.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 103029
author: Lars Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sun 2011-01-30 02:51:45 +0000
message:
  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.
modified:
  doc/misc/ChangeLog
  doc/misc/gnus.texi
  lisp/gnus/ChangeLog
  lisp/gnus/nnmail.el

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2011-01-29 14:48:19 +0000
+++ b/doc/misc/ChangeLog        2011-01-30 02:51:45 +0000
@@ -1,3 +1,8 @@
+2011-01-30  Lars Ingebrigtsen  <address@hidden>
+
+       * gnus.texi (Client-Side IMAP Splitting): Add a complete nnimap fancy
+       splitting example.
+
 2011-01-29  Eli Zaretskii  <address@hidden>
 
        * makefile.w32-in (MAKEINFO): Remove options, leave only program name.

=== modified file 'doc/misc/gnus.texi'
--- a/doc/misc/gnus.texi        2011-01-28 01:41:15 +0000
+++ b/doc/misc/gnus.texi        2011-01-30 02:51:45 +0000
@@ -14244,6 +14244,18 @@
 
 @end table
 
+Here's a complete example @code{nnimap} backend with a client-side
+``fancy'' splitting method:
+
address@hidden
+(nnimap "imap.example.com"
+        (nnimap-inbox "INBOX")
+        (nnimap-split-methods
+         (| ("MailScanner-SpamCheck" "spam" "spam.detected")
+            (to "foo@@bar.com" "foo")
+            "undecided")))
address@hidden example
+
 
 @node Getting Mail
 @section Getting Mail

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-01-30 01:46:32 +0000
+++ b/lisp/gnus/ChangeLog       2011-01-30 02:51:45 +0000
@@ -1,5 +1,8 @@
 2011-01-30  Lars Ingebrigtsen  <address@hidden>
 
+       * 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.
 

=== modified file 'lisp/gnus/nnmail.el'
--- a/lisp/gnus/nnmail.el       2011-01-26 08:36:39 +0000
+++ b/lisp/gnus/nnmail.el       2011-01-30 02:51:45 +0000
@@ -1148,6 +1148,8 @@
          (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.