X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-draft.el;h=7dba2504d52c20aa9aad1448e0805c59452d9f9c;hb=7f69dabc03ff22d2382fea3beda6991063830ce1;hp=66e99aed63260c3f1888036332b8d27b81a6498f;hpb=792adbce0e1404dcb6de7bdda59654a2183fe6e4;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index 66e99ae..7dba250 100644
--- a/lisp/gnus-draft.el
+++ b/lisp/gnus-draft.el
@@ -1,5 +1,6 @@
 ;;; gnus-draft.el --- draft message support for Semi-gnus
-;; Copyright (C) 1997,98 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000
+;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -69,8 +70,8 @@
   (interactive "P")
   (when (eq major-mode 'gnus-summary-mode)
     (when (set (make-local-variable 'gnus-draft-mode)
-		  (if (null arg) (not gnus-draft-mode)
-		    (> (prefix-numeric-value arg) 0)))
+	       (if (null arg) (not gnus-draft-mode)
+		 (> (prefix-numeric-value arg) 0)))
       ;; Set up the menu.
       (when (gnus-visual-p 'draft-menu 'menu)
 	(gnus-draft-make-menu-bar))
@@ -97,8 +98,7 @@
   (let ((article (gnus-summary-article-number)))
     (gnus-summary-mark-as-read article gnus-canceled-mark)
     (gnus-draft-setup-for-editing article gnus-newsgroup-name)
-    (set-buffer-modified-p t)
-    (save-buffer)
+    (message-save-drafts)
     (let ((gnus-verbose-backends nil))
       (gnus-request-expire-articles (list article) gnus-newsgroup-name t))
     (push
@@ -117,14 +117,22 @@
     (while (setq article (pop articles))
       (gnus-summary-remove-process-mark article)
       (unless (memq article gnus-newsgroup-unsendable)
-	(gnus-draft-send article gnus-newsgroup-name)
+	(gnus-draft-send article gnus-newsgroup-name t)
 	(gnus-summary-mark-article article gnus-canceled-mark)))))
 
-(defun gnus-draft-send (article &optional group)
+(defun gnus-draft-send (article &optional group interactive)
   "Send message ARTICLE."
-  (gnus-draft-setup-for-sending article (or group "nndraft:queue"))
-  (let ((message-syntax-checks 'dont-check-for-anything-just-trust-me)
-	message-send-hook type method)
+  (let ((message-syntax-checks (if interactive nil
+				 'dont-check-for-anything-just-trust-me))
+	(message-inhibit-body-encoding (or (not group) 
+					   (equal group "nndraft:queue")
+					   message-inhibit-body-encoding))
+	(message-send-hook (and group (not (equal group "nndraft:queue"))
+				message-send-hook))
+	(message-setup-hook (and group (not (equal group "nndraft:queue"))
+				 message-setup-hook))
+	type method)
+    (gnus-draft-setup-for-sending article (or group "nndraft:queue"))
     ;; We read the meta-information that says how and where
     ;; this message is to be sent.
     (save-restriction
@@ -171,20 +179,24 @@
   (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"))))))
+	   (n (length articles))
+	   article i)
       (while (setq article (pop articles))
-	(unless (memq article unsendable)
+	(setq i (- n (length articles)))
+	(message "Sending message %d of %d." i n)
+	(if (memq article unsendable)
+	    (message "Message %d of %d is unsendable." i n)
 	  (gnus-draft-send article))))))
 
 ;;; Utility functions
 
 (defcustom gnus-draft-decoding-function
-  #'mime-edit-decode-buffer
+  #'mime-edit-decode-message-in-buffer
   "*Function called to decode the message from network representation."
   :group 'gnus-agent
   :type 'function)
@@ -201,8 +213,8 @@
       (erase-buffer)
       (if (not (gnus-request-restore-buffer article group))
 	  (error "Couldn't restore the article")
-	;; Insert the separator.
 	(funcall gnus-draft-decoding-function)
+	;; Insert the separator.
 	(goto-char (point-min))
 	(search-forward "\n\n")
 	(forward-char -1)