Merge from gnus--devo--0

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1016

3 files changed, 32 insertions, 5 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 35347c8e71a..94a976c8e65 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-24    Michael Sperber  <sperber@deinprogramm.de>
+
+        * mail-source.el (mail-sources): Add `group' choice.
+
+        * nnmail.el (nnmail-get-new-mail-1): Abstract this out to add another
+        parameter `in-group' to control into which group the articles go.
+        Add treatment of `group' mail-source.
+
 2008-01-24  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * sieve.el (sieve-make-overlay, sieve-overlay-put, sieve-overlays-at):
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index 9f9f9733110..01463c55628 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -74,6 +74,8 @@ See Info node `(gnus)Mail Source Specifiers'."
           (repeat :tag "List"
            (choice :format "%[Value Menu%] %v"
                    :value (file)
+                   (cons :tag "Group parameter `mail-source'"
+                         (const :format "" group))
                    (cons :tag "Spool file"
                          (const :format "" file)
                          (checklist :tag "Options" :greedy t
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index f0f90218aab..a6ed7190351 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -1766,11 +1766,15 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
       (symbol-value sym))))
 
 (defun nnmail-get-new-mail (method exit-func temp
-                                   &optional group spool-func)
+                            &optional group spool-func)
   "Read new incoming mail."
+  (nnmail-get-new-mail-1 method exit-func temp group nil spool-func))
+
+(defun nnmail-get-new-mail-1 (method exit-func temp
+                              group in-group spool-func)
+
   (let* ((sources mail-sources)
          fetching-sources
-         (group-in group)
          (i 0)
          (new 0)
          (total 0)
@@ -1778,6 +1782,18 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
     (when (and (nnmail-get-value "%s-get-new-mail" method)
                sources)
       (while (setq source (pop sources))
+
+        ;; Use group's parameter
+        (when (eq (car source) 'group)
+          (let ((mail-sources
+                 (list
+                  (gnus-group-find-parameter
+                   (concat (symbol-name method) ":" group)
+                   'mail-source t))))
+            (nnmail-get-new-mail-1 method exit-func temp
+                                   group group spool-func))
+          (setq source nil))
+          
         ;; Hack to only fetch the contents of a single group's spool file.
         (when (and (eq (car source) 'directory)
                    (null nnmail-scan-directory-mail-source-once)
@@ -1816,9 +1832,10 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
                          (nnmail-split-incoming
                           file ',(intern (format "%s-save-mail" method))
                           ',spool-func
-                          (if (equal file orig-file)
-                              nil
-                            (nnmail-get-split-group orig-file ',source))
+                          (or in-group
+                              (if (equal file orig-file)
+                                  nil
+                                (nnmail-get-split-group orig-file ',source)))
                           ',(intern (format "%s-active-number" method)))))))
           (incf total new)
           (incf i)))