summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2011-01-30 02:51:45 +0000
committerKatsumi Yamaoka <yamaoka@jpl.org>2011-01-30 02:51:45 +0000
commitfe72c8fa4e93465e99aa7075fec90ac5b32915ab (patch)
tree7660a2c4c2ef3ca0ed37dd3d5f4962f2a60f80c4
parent228724bc63cfb48f0fbdd08ecddd7100974d6c11 (diff)
downloademacs-fe72c8fa4e93465e99aa7075fec90ac5b32915ab.tar.gz
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.
-rw-r--r--doc/misc/ChangeLog5
-rw-r--r--doc/misc/gnus.texi12
-rw-r--r--lisp/gnus/ChangeLog3
-rw-r--r--lisp/gnus/nnmail.el2
4 files changed, 22 insertions, 0 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 668d7ddfbaa..8e1bba700fd 100644
--- 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 463a1e0af55..26d54477bb4 100644
--- 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 a9efd57c5de..bfdda731d35 100644
--- 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 f7498cdf159..a41a5d73344 100644
--- 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.