2000-10-08 Christoph Conrad <christoph.conrad@gmx.de>

	* gnus-draft.el (gnus-draft-send-message): Typo.

2000-10-07 08:19:17  ShengHuo ZHU  <zsh@cs.rochester.edu>

	* gnus-draft.el (gnus-draft-send-message): Ditto.
	(gnus-group-send-drafts): Ditto.

* gnus-agent.el (gnus-agent-possibly-do-gcc):
(gnus-agent-restore-gcc):
(gnus-agent-possibly-save-gcc): New functions.

1 files changed, 21 insertions, 10 deletions

diff --git a/lisp/gnus/gnus-draft.el b/lisp/gnus/gnus-draft.el
index 5e7850e0eb1..0aff7902724 100644
--- a/lisp/gnus/gnus-draft.el
+++ b/lisp/gnus/gnus-draft.el
@@ -3,6 +3,7 @@
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
+;; Maintainer: bugs@gnus.org
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
@@ -112,12 +113,16 @@
 (defun gnus-draft-send-message (&optional n)
   "Send the current draft."
   (interactive "P")
-  (let ((articles (gnus-summary-work-articles n))
-        article)
+  (let* ((articles (gnus-summary-work-articles n))
+         (total (length articles))
+         article)
     (while (setq article (pop articles))
       (gnus-summary-remove-process-mark article)
       (unless (memq article gnus-newsgroup-unsendable)
-        (gnus-draft-send article gnus-newsgroup-name t)
+        (let ((message-sending-message 
+               (format "Sending message %d of %d..." 
+                       (- total (length articles)) total)))
+          (gnus-draft-send article gnus-newsgroup-name t))
         (gnus-summary-mark-article article gnus-canceled-mark)))))
 
 (defun gnus-draft-send (article &optional group interactive)
@@ -143,6 +148,8 @@
         (setq type (ignore-errors (read (current-buffer)))
               method (ignore-errors (read (current-buffer))))
         (message-remove-header gnus-agent-meta-information-header)))
+    ;; Let Agent restore any GCC lines and have message.el perform them.
+    (gnus-agent-restore-gcc)
     ;; Then we send it.  If we have no meta-information, we just send
     ;; it and let Message figure out how.
     (when (and (or (null method)
@@ -170,15 +177,19 @@
   (interactive)
   (gnus-activate-group "nndraft:queue")
   (save-excursion
-    (let ((articles (nndraft-articles))
-          (unsendable (gnus-uncompress-range
-                       (cdr (assq 'unsend
-                                  (gnus-info-marks
-                                   (gnus-get-info "nndraft:queue"))))))
-          article)
+    (let* ((articles (nndraft-articles))
+           (unsendable (gnus-uncompress-range
+                        (cdr (assq 'unsend
+                                   (gnus-info-marks
+                                    (gnus-get-info "nndraft:queue"))))))
+           (total (length articles))
+           article)
       (while (setq article (pop articles))
         (unless (memq article unsendable)
-          (gnus-draft-send article))))))
+          (let ((message-sending-message 
+                 (format "Sending message %d of %d..." 
+                         (- total (length articles)) total)))
+            (gnus-draft-send article)))))))
 
 ;;; Utility functions