* rfc2047.el (rfc2047-encode-message-header): Fixing typo.

* gnus-draft.el (gnus-draft-send): Move gnus-draft-setup inside of let.
* gnus-draft.el (gnus-draft-setup): Fix comments.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f977726..b123838 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2000-04-24 00:56:00  Björn Torkelsson  <torkel@hpc2n.umu.se>
+
+       * rfc2047.el (rfc2047-encode-message-header): Fixing typo.
+       
+2000-04-26 12:27:41  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-draft.el (gnus-draft-send): Move gnus-draft-setup inside of
+       let.
+
+2000-04-26 12:26:10  Pavel Janik ml. <Pavel.Janik@inet.cz>
+
+       * gnus-draft.el (gnus-draft-setup): Fix comments.
+
 2000-04-26 10:06:12  Shenghuo ZHU  <zsh@cs.rochester.edu>
 
        * nnmbox.el (nnmbox-create-mbox): Use nnmbox-file-coding-system,

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index e9ad4cc..5e7850e 100644 (file)
--- a/lisp/gnus-draft.el
+++ b/lisp/gnus-draft.el
@@ -122,7 +122,6 @@
 
 (defun gnus-draft-send (article &optional group interactive)
   "Send message ARTICLE."
-  (gnus-draft-setup 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) 
@@ -130,8 +129,10 @@
                                           message-inhibit-body-encoding))
        (message-send-hook (and group (not (equal group "nndraft:queue"))
                                message-send-hook))
-       (message-setup-hook nil)
+       (message-setup-hook (and group (not (equal group "nndraft:queue"))
+                                message-setup-hook))
        type method)
+    (gnus-draft-setup article (or group "nndraft:queue"))
     ;; We read the meta-information that says how and where
     ;; this message is to be sent.
     (save-restriction
@@ -194,9 +195,9 @@
        (erase-buffer)
        (if (not (gnus-request-restore-buffer article group))
            (error "Couldn't restore the article")
-         ;; Insert the separator.
          (if (and restore (equal group "nndraft:queue"))
              (mime-to-mml))
+         ;; Insert the separator.
          (goto-char (point-min))
          (search-forward "\n\n")
          (forward-char -1)

diff --git a/lisp/rfc2047.el b/lisp/rfc2047.el
index 52bd83e..fd8ed22 100644 (file)
--- a/lisp/rfc2047.el
+++ b/lisp/rfc2047.el
@@ -128,7 +128,7 @@ Should be called narrowed to the head of the message."
             (t)))
          (goto-char (point-max)))))
     (when mail-parse-charset
-      (encode-coding-region
+      (mm-encode-coding-region
        (point-min) (point-max) mail-parse-charset))))
 
 (defun rfc2047-encodable-p (&optional header)