(nnimap-split-incoming-mail): If `nnimap-split-fancy' is non-nil, and `nnimap-split...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 89d87cd..3beca4d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nnimap.el (nnimap-split-incoming-mail): If `nnimap-split-fancy' is
+       non-nil, and `nnimap-split-methods' is nil, use the former.
+
 2011-06-30  Glenn Morris  <rgm@gnu.org>
 
        * mm-util.el (mm-charset-synonym-alist): Move definition before use.

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index e330a4b..983d80e 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -1805,9 +1805,14 @@ textual parts.")
 (defun nnimap-split-incoming-mail ()
   (with-current-buffer (nnimap-buffer)
     (let ((nnimap-incoming-split-list nil)
-         (nnmail-split-methods (if (eq nnimap-split-methods 'default)
-                                   nnmail-split-methods
-                                 nnimap-split-methods))
+         (nnmail-split-methods
+          (cond
+           ((eq nnimap-split-methods 'default)
+            nnmail-split-methods)
+           (nnimap-split-methods
+            nnimap-split-methods)
+           (nnimap-split-fancy
+            'nnmail-split-fancy)))
          (nnmail-split-fancy (or nnimap-split-fancy
                                  nnmail-split-fancy))
          (nnmail-inhibit-default-split-group t)