[Emacs-diffs] /srv/bzr/emacs/trunk r104807: nnimap.el (nnimap-split-incoming-mail): If `nnimap-split-fancy' is non-nil, and `nnimap-split-methods' is nil, use the former.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 104807
author: Lars Magne Ingebrigtsen <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Thu 2011-06-30 10:04:56 +0000
message:
  nnimap.el (nnimap-split-incoming-mail): If `nnimap-split-fancy' is non-nil, 
and `nnimap-split-methods' is nil, use the former.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/nnimap.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-06-30 09:45:44 +0000
+++ b/lisp/gnus/ChangeLog       2011-06-30 10:04:56 +0000
@@ -1,3 +1,8 @@
+2011-06-30  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * 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  <address@hidden>
 
        * plstore.el (plstore-revert): New function.

=== modified file 'lisp/gnus/nnimap.el'
--- a/lisp/gnus/nnimap.el       2011-06-30 04:07:50 +0000
+++ b/lisp/gnus/nnimap.el       2011-06-30 10:04:56 +0000
@@ -1805,9 +1805,14 @@
 (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)