X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-draft.el;h=3e6def0d0284717493727adba5163f4a193787dc;hb=06dd87db2a6da7e49dab9fce2967ba89de8b8e43;hp=4edb37d4f0ac31fed0872e6b20bdc28b5057f5f2;hpb=82300762c3419b73fc2e994b14e3d520fe88b0a9;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index 4edb37d..3e6def0 100644
--- a/lisp/gnus-draft.el
+++ b/lisp/gnus-draft.el
@@ -1,8 +1,10 @@
-;;; gnus-draft.el --- draft message support for Gnus
+;;; gnus-draft.el --- draft message support for Semi-gnus
 ;; Copyright (C) 1997,98,99 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
-;; Keywords: news
+;;	MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;;	Tatsuya Ichikawa <t-ichi@po.shiojiri.ne.jp>
+;; Keywords: mail, news, MIME, offline
 
 ;; This file is part of GNU Emacs.
 
@@ -67,8 +69,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))
@@ -94,9 +96,8 @@
   (interactive)
   (let ((article (gnus-summary-article-number)))
     (gnus-summary-mark-as-read article gnus-canceled-mark)
-    (gnus-draft-setup article gnus-newsgroup-name)
-    (set-buffer-modified-p t)
-    (save-buffer)
+    (gnus-draft-setup-for-editing article gnus-newsgroup-name)
+    (message-save-drafts)
     (let ((gnus-verbose-backends nil))
       (gnus-request-expire-articles (list article) gnus-newsgroup-name t))
     (push
@@ -120,10 +121,15 @@
 
 (defun gnus-draft-send (article &optional group interactive)
   "Send message ARTICLE."
-  (gnus-draft-setup article (or group "nndraft:queue"))
+  (gnus-draft-setup-for-sending article (or group "nndraft:queue"))
   (let ((message-syntax-checks (if interactive nil
 				 'dont-check-for-anything-just-trust-me))
-	message-send-hook type method)
+	(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))
+	type method)
     ;; We read the meta-information that says how and where
     ;; this message is to be sent.
     (save-restriction
@@ -136,16 +142,25 @@
 	(message-remove-header gnus-agent-meta-information-header)))
     ;; 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)
-		   (gnus-server-opened method)
-		   (gnus-open-server method))
-	       (if type
-		   (let ((message-this-is-news (eq type 'news))
-			 (message-this-is-mail (eq type 'mail))
-			 (gnus-post-method method)
-			 (message-post-method method))
-		     (message-send-and-exit))
-		 (message-send-and-exit)))
+    (when (let ((mail-header-separator ""))
+	    (cond ((eq type 'news)
+		   (mime-edit-maybe-split-and-send
+		    (function
+		     (lambda ()
+		       (interactive)
+		       (funcall message-send-news-function method)
+		       )))
+		   (funcall message-send-news-function method)
+		   )
+		  ((eq type 'mail)
+		   (mime-edit-maybe-split-and-send
+		    (function
+		     (lambda ()
+		       (interactive)
+		       (funcall message-send-mail-function)
+		       )))
+		   (funcall message-send-mail-function)
+		   t)))
       (let ((gnus-verbose-backends nil))
 	(gnus-request-expire-articles
 	 (list article) (or group "nndraft:queue") t)))))
@@ -161,25 +176,34 @@
   (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-message-in-buffer
+  "*Function called to decode the message from network representation."
+  :group 'gnus-agent
+  :type 'function)
+
 ;;;!!!If this is byte-compiled, it fails miserably.
 ;;;!!!This is because `gnus-setup-message' uses uninterned symbols.
 ;;;!!!This has been fixed in recent versions of Emacs and XEmacs,
 ;;;!!!but for the time being, we'll just run this tiny function uncompiled.
 
-(progn
-(defun gnus-draft-setup (narticle group)
+(defun gnus-draft-setup-for-editing (narticle group)
   (gnus-setup-message 'forward
     (let ((article narticle))
       (message-mail)
@@ -187,12 +211,24 @@
       (if (not (gnus-request-restore-buffer article group))
 	  (error "Couldn't restore the article")
 	;; Insert the separator.
+	(funcall gnus-draft-decoding-function)
 	(goto-char (point-min))
 	(search-forward "\n\n")
 	(forward-char -1)
 	(insert mail-header-separator)
 	(forward-line 1)
-	(message-set-auto-save-file-name))))))
+	(message-set-auto-save-file-name)))))
+
+(defvar gnus-draft-send-draft-buffer " *send draft*")
+(defun gnus-draft-setup-for-sending (narticle group)
+  (let ((article narticle))
+    (if (not (get-buffer gnus-draft-send-draft-buffer))
+	(get-buffer-create gnus-draft-send-draft-buffer))
+    (set-buffer gnus-draft-send-draft-buffer)
+    (erase-buffer)
+    (if (not (gnus-request-restore-buffer article group))
+	(error "Couldn't restore the article")
+      )))
 
 (defun gnus-draft-article-sendable-p (article)
   "Say whether ARTICLE is sendable."