(smtpmail-send-data-1): Use encode-coding-string.

(smtpmail-address-buffer): Add defvar.
(smtpmail-recipient-address-list, smtpmail-read-point): Likewise.

diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 6e567148b1a669fe58c285a8fd584fcb7434b191..af22f6341f85e98ec3c8b44bd9424401cef53e9f 100644 (file)
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -100,6 +100,12 @@ and sent with `smtpmail-send-queued-mail'."
   "File name of queued mail index,
 This is relative to `smtpmail-queue-dir'.")
 
+(defvar smtpmail-address-buffer)
+(defvar smtpmail-recipient-address-list)
+
+;; Buffer-local variable.
+(defvar smtpmail-read-point)
+
 (defvar smtpmail-queue-index (concat smtpmail-queue-dir
                                     smtpmail-queue-index-file))
 
@@ -558,8 +564,8 @@ This is relative to `smtpmail-queue-dir'.")
 (defun smtpmail-send-data-1 (process data)
   (goto-char (point-max))
 
-  (if (not (null smtpmail-code-conv-from))
-      (setq data (code-convert-string data smtpmail-code-conv-from *internal*)))
+  (when smtpmail-code-conv-from
+    (setq data (encode-coding-string data *internal* smtpmail-code-conv-from)))
        
   (if smtpmail-debug-info
       (insert data "\r\n"))