From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Thu, 30 Jun 2011 10:04:56 +0000 (+0000)
Subject: nnimap.el (nnimap-split-incoming-mail): If `nnimap-split-fancy' is non-nil, and ... 
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~316
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=656e1aab13d416dc06ca1138997e6396317321bc;p=emacs.git

nnimap.el (nnimap-split-incoming-mail): If `nnimap-split-fancy' is non-nil, and `nnimap-split-methods' is nil, use the former.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 09e3317ec92..ea7aedc3e6a 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/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  Daiki Ueno  <ueno@unixuser.org>
 
 	* plstore.el (plstore-revert): New function.
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index e330a4b84e9..983d80e846a 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/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)