[gnus git] branch master updated: n0-17-108-g4a22898 =1= (nnimap-split-incoming-mail): If `nnimap-split-fancy' is non-nil, and `nnimap-split-methods' is nil, use the former.

       via  4a22898f2700587f2f6c5d70fe6ebbf94a8ef547 (commit)
      from  086848ac03b41b625a479057d1819b8d0a74df26 (commit)


- Log -----------------------------------------------------------------
commit 4a22898f2700587f2f6c5d70fe6ebbf94a8ef547
Author: Lars Magne Ingebrigtsen <[email protected]>
Date:   Thu Jun 30 11:36:50 2011 +0200

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 89d87cd..3beca4d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-30  Lars Magne Ingebrigtsen  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* 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
--- 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)

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog |    5 +++++
 lisp/nnimap.el |   11 ++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project