* wl-draft.el (wl-draft-send-mail-with-smtp): Use `smtp-send-buffer'

 instead of `smtp-via-smtp'.

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 5b83e08..6947970 100644 (file)
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-20  Yuuichi Teranishi  <teranisi@gohome.org>
+
+       * wl-draft.el (wl-draft-send-mail-with-smtp): Use `smtp-send-buffer'
+       instead of `smtp-via-smtp'.
+
 2000-11-19  Kenichi OKADA  <okada@opaopa.org>
 
        * wl-draft.el (toplevel): Delete defvar for sasl-*.

diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 209972c..8e32b6b 100644 (file)
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -956,12 +956,12 @@ non-nil."
              (as-binary-process
               (when recipients
                 (wl-smtp-extension-bind
-                 (let ((err (smtp-via-smtp sender recipients
-                                           (current-buffer))))
-                   (when (not (eq err t))
-                     (wl-draft-write-sendlog 'failed 'smtp smtp-server
-                                             recipients id)
-                     (error "Sending failed; SMTP protocol error:%s" err))))
+                 (condition-case err
+                     (smtp-send-buffer sender recipients (current-buffer))
+                   (error
+                    (wl-draft-write-sendlog 'failed 'smtp smtp-server
+                                            recipients id)
+                    (signal (car err) (cdr err)))))
                 (wl-draft-set-sent-message 'mail 'sent)
                 (wl-draft-write-sendlog
                  'ok 'smtp smtp-server recipients id)))))