Allow `default' as nnimap-split-methods value.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 28a598d..545497e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-09-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * nnimap.el (nnimap-split-incoming-mail): If nnimap-split-methods is
+       `default', use nnmail-split-methods.
+
        * gnus-sum.el (gnus-valid-move-group-p): Make sure that `group' is a
        symbol.
 

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index ccd85bf..0d3670a 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -1291,7 +1291,9 @@ textual parts.")
 (defun nnimap-split-incoming-mail ()
   (with-current-buffer (nnimap-buffer)
     (let ((nnimap-incoming-split-list nil)
-         (nnmail-split-methods nnimap-split-methods)
+         (nnmail-split-methods (if (eq nnimap-split-methods 'default)
+                                   nnmail-split-methods
+                                 nnimap-split-methods))
          (nnmail-inhibit-default-split-group t)
          (groups (nnimap-get-groups))
          new-articles)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 8495bc5..a1dabd7 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,6 +1,7 @@
 2010-09-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus.texi (Using IMAP): Remove the @acronyms from the headings.
+       (Client-Side IMAP Splitting): Document 'default.
 
 2010-09-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 

diff --git a/texi/gnus.texi b/texi/gnus.texi
index c847176..26e531e 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -14834,7 +14834,7 @@ Here's an example method that's more complex:
 @example
 (nnimap "imap.gmail.com"
         (nnimap-inbox "INBOX")
-        (nnimap-split-methods ,nnmail-split-methods)
+        (nnimap-split-methods default)
         (nnimap-expunge t)
         (nnimap-stream 'ssl)
         (nnir-search-engine imap)
@@ -14903,7 +14903,8 @@ This is the @acronym{IMAP} mail box that will be scanned for new mail.
 
 @item nnimap-split-methods
 Uses the same syntax as @code{nnmail-split-methods} (@pxref{Splitting
-Mail}).
+Mail}), except the symbol @code{default}, which means that it should
+use the value of the @code{nnmail-split-methods} variable.
 
 @end table