From: Michael Sperber <mike@xemacs.org>
Date: Mon, 19 Oct 2015 14:18:27 +0000 (+0000)
Subject: Unbreak `group' option for `mail-sources'
X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=commitdiff_plain;h=7ad9127db5dab392ee9937a7925db72692f99ffb

Unbreak `group' option for `mail-sources'

* nnml.el (nnml-retrieve-groups, nnml-request-scan):
* nnmail.el (nnmail-get-new-mail-per-group):
(nnmail-get-new-mail-1): Unbreak `group' option for `mail-sources'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ea368d0c..7836b0bbb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-18  Michael Sperber  <mike@xemacs.org>
+
+	* nnml.el (nnml-retrieve-groups, nnml-request-scan):
+	* nnmail.el (nnmail-get-new-mail-per-group):
+	(nnmail-get-new-mail-1): Unbreak `group' option for `mail-sources'.
+
 2015-10-14  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* auth-source.el (auth-source-epa-make-gpg-token): Revert.
diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 7efb15438..f3ba169b5 100644
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -1792,6 +1792,12 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
   "Read new incoming mail."
   (nnmail-get-new-mail-1 method exit-func temp group nil spool-func))
 
+(defun nnmail-get-new-mail-per-group ()
+  "Tell us whether the mail-sources specify that `nnmail-get-new-mail' should
+be called once per group or once for all groups."
+  (or (assq 'group mail-sources)
+      (assq 'directory mail-sources)))
+
 (defun nnmail-get-new-mail-1 (method exit-func temp
 			      group in-group spool-func)
   (let* ((sources mail-sources)
@@ -1804,7 +1810,8 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 	       sources)
       (while (setq source (pop sources))
 	;; Use group's parameter
-	(when (eq (car source) 'group)
+	(when (and (eq (car source) 'group)
+		   group)
 	  (let ((mail-sources
 		 (list
 		  (gnus-group-find-parameter