X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-draft.el;h=d794f0d8975a3ddb0cf4d795d21aaa193622a236;hb=4f37874aa6d44ce6c39da32ba89c616e225dbbb7;hp=fce8744e2426ede31f800b181624ee4be3375d08;hpb=2bdf225fa3e4e4606e4dc80cc84e7892b9280c62;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index fce8744..d794f0d 100644
--- a/lisp/gnus-draft.el
+++ b/lisp/gnus-draft.el
@@ -95,7 +95,11 @@
   (interactive)
   (let ((article (gnus-summary-article-number)))
     (gnus-summary-mark-as-read article gnus-canceled-mark)
-    (gnus-draft-setup article gnus-newsgroup-name)
+    (gnus-draft-setup-for-editing article gnus-newsgroup-name)
+    (set-buffer-modified-p t)
+    (save-buffer)
+    (let ((gnus-verbose-backends nil))
+      (gnus-request-expire-articles (list article) gnus-newsgroup-name t))
     (push
      `((lambda ()
 	 (when (gnus-buffer-exists-p ,gnus-summary-buffer)
@@ -117,7 +121,7 @@
 
 (defun gnus-draft-send (article &optional group)
   "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 'dont-check-for-anything-just-trust-me)
 	message-send-hook type method)
     ;; We read the meta-information that says how and where
@@ -132,13 +136,28 @@
 	(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.
-    (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)))))
 
 (defun gnus-draft-send-all-messages ()
   "Send all the sendable drafts."
@@ -166,7 +185,7 @@
 (defcustom gnus-draft-decoding-function
   (function
    (lambda ()
-     (mime-edit-decode-buffer nil)
+     (mime-edit-decode-message-in-buffer nil)
      (eword-decode-header)
      ))
   "*Function called to decode the message from network representation."
@@ -178,8 +197,7 @@
 ;;;!!!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)
@@ -193,7 +211,19 @@
 	(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")
+      )))
+;; For draft TEST
 
 (defun gnus-draft-article-sendable-p (article)
   "Say whether ARTICLE is sendable."