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 (file)
--- 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  <mike@xemacs.org>
+
+       * 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  <yamaoka@jpl.org>
 
        * auth-source.el (auth-source-epa-make-gpg-token): Revert.

diff --git a/lisp/message.el b/lisp/message.el
index 12e4e49..692bd24 100644 (file)
--- 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 (file)
--- 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)
-  (nnmail-get-new-mail 'nnml 'nnml-save-incremental-nov nnml-directory group))
+  (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)