* gnus-draft.el (gnus-draft-send): Always enter the Message mode.

diff --git a/ChangeLog b/ChangeLog
index 757716c..fbd593a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-08  Daiki Ueno  <ueno@unixuser.org>
+
+       * lisp/gnus-draft.el (gnus-draft-send): Always enter the Message
+       mode.
+
 2002-03-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lisp/gnus-group.el (gnus-group-completing-read-group-name): Use

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index 55fffd1..7c92c7f 100644 (file)
--- a/lisp/gnus-draft.el
+++ b/lisp/gnus-draft.el
@@ -142,7 +142,7 @@
        (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"))
+    (gnus-draft-setup-for-editing article (or group "nndraft:queue"))
     ;; We read the meta-information that says how and where
     ;; this message is to be sent.
     (save-restriction
@@ -157,22 +157,16 @@
     (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 (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)))
+    (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)))
       (let ((gnus-verbose-backends nil))
        (gnus-request-expire-articles
         (list article) (or group "nndraft:queue") t)))))