[gnus git] branch master updated: m0-13-84-g0814c23 =2= Bind `rmail-dont-reply-to-names' ; Unbreak `group' option for `mail-sources'

       via  0814c236bf5b827fd046819bbd6ad591986c9caf (commit)
       via  7ad9127db5dab392ee9937a7925db72692f99ffb (commit)
      from  3640deb5d616812fe3f601ef0d98ecd91006d0c7 (commit)


- Log -----------------------------------------------------------------
commit 0814c236bf5b827fd046819bbd6ad591986c9caf
Author: Michael Sperber <[email protected]>
Date:   Mon Oct 19 14:26:00 2015 +0000

    Bind `rmail-dont-reply-to-names'
    
    * message.el (message-get-reply-headers): In addition to
    `mail-dont-reply-to-names', bind `rmail-dont-reply-to-names', which is
    used in XEmacs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7836b0b..1f1102d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,12 @@
 	* nnmail.el (nnmail-get-new-mail-per-group):
 	(nnmail-get-new-mail-1): Unbreak `group' option for `mail-sources'.
 
+2015-10-18  Michael Sperber  <[email protected]>
+
+	* message.el (message-get-reply-headers): In addition to
+	`mail-dont-reply-to-names', bind `rmail-dont-reply-to-names', which is
+	used in XEmacs.
+
 2015-10-14  Katsumi Yamaoka  <[email protected]>
 
 	* auth-source.el (auth-source-epa-make-gpg-token): Revert.
diff --git a/lisp/message.el b/lisp/message.el
index 12e4e49..692bd24 100644
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -6974,7 +6974,8 @@ want to get rid of this query permanently.")))
       (while (string-match "[ \t][ \t]+" recipients)
 	(setq recipients (replace-match " " t t recipients)))
       ;; Remove addresses that match `mail-dont-reply-to-names'.
-      (let ((mail-dont-reply-to-names (message-dont-reply-to-names)))
+      (let* ((mail-dont-reply-to-names (message-dont-reply-to-names))
+	     (rmail-dont-reply-to-names mail-dont-reply-to-names))
 	(setq recipients (mail-dont-reply-to recipients)))
       ;; Perhaps "Mail-Copies-To: never" removed the only address?
       (if (string-equal recipients "")
diff --git a/lisp/nnml.el b/lisp/nnml.el
index c825e09..33eae1c 100644
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -268,10 +268,35 @@ non-nil.")
 			   (max (1+ (- (cdr active) (car active))) 0)
 			   (car active) (cdr active) group)))))))
 
+(deffoo nnml-retrieve-groups (groups &optional server)
+  (when nnml-get-new-mail
+    (if (nnmail-get-new-mail-per-group)
+	(dolist (group groups)
+	  (nnml-request-scan group server))
+      (nnml-request-scan nil server)))
+  (with-current-buffer nntp-server-buffer
+    (erase-buffer)
+    (dolist (group groups)
+      (let* ((entry (assoc group nnml-group-alist))
+	     (active (nth 1 entry)))
+	(if (consp active)
+	    (insert (format "211 %d %d %d %s\n"
+			    (max (1+ (- (cdr active) (car active))) 0)
+			    (car active) (cdr active) group))))))
+  'group)
+
 (deffoo nnml-request-scan (&optional group server)
   (setq nnml-article-file-alist nil)
   (nnml-possibly-change-directory group server)
+  (cond
+   (group
     (nnmail-get-new-mail 'nnml 'nnml-save-incremental-nov nnml-directory group))
+   ((nnmail-get-new-mail-per-group)
+    (nnml-request-list)
+    (dolist (entry nnml-group-alist)
+      (nnml-request-scan (car entry) server)))
+   (t
+    (nnmail-get-new-mail 'nnml 'nnml-save-incremental-nov nnml-directory nil))))
 
 (deffoo nnml-close-group (group &optional server)
   (setq nnml-article-file-alist nil)

commit 7ad9127db5dab392ee9937a7925db72692f99ffb
Author: Michael Sperber <[email protected]>
Date:   Mon Oct 19 14:18:27 2015 +0000

    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 9ea368d..7836b0b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-18  Michael Sperber  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* auth-source.el (auth-source-epa-make-gpg-token): Revert.
diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 7efb154..f3ba169 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

-----------------------------------------------------------------------
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  |   12 ++++++++++++
 lisp/message.el |    3 ++-
 lisp/nnmail.el  |    9 ++++++++-
 lisp/nnml.el    |   27 ++++++++++++++++++++++++++-
 4 files changed, 48 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