(gnus-group-icon-create-glyph): Don't use `gnus-group-running-xemacs'.

[elisp/gnus.git-] / lisp / gnus-draft.el

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index b0df871..7dba250 100644 (file)
--- 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,99 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))
@@ -121,7 +122,6 @@
 
 (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 (if interactive nil
                                 'dont-check-for-anything-just-trust-me))
        (message-inhibit-body-encoding (or (not group) 
@@ -129,7 +129,10 @@
                                           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
@@ -210,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)