* smtp.el (smtp-via-smtp): Throw `done' instead of `smtp-error';

when evaluating unwind form, send QUIT command if the process is running.

diff --git a/ChangeLog b/ChangeLog
index e345653..e98bc2b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-01   Daiki Ueno  <ueno@ueda.info.waseda.ac.jp>
+
+       * smtp.el (smtp-via-smtp): Throw `done' instead of `smtp-error';
+       when evaluating unwind form, send QUIT command if the process is running.
+
 2000-01-28  Kenichi OKADA <okada@opaopa.org>
 
        * md5-el.el (md5-encode): If `md5-maximum-internal-length' is nil,

diff --git a/smtp.el b/smtp.el
index 0f9f52e..c24975c 100644 (file)
--- a/smtp.el
+++ b/smtp.el
@@ -207,7 +207,7 @@ don't define this value."
                     (memq auth extensions)
                     (setq method (nth 1 (assq auth smtp-authenticate-method-alist))))
                    (funcall method process)
-                 (throw 'smtp-error
+                 (throw 'done
                         (format "AUTH mechanism %s not available" auth)))))
 
            ;; ONEX --- One message transaction only (sendmail extension?)
@@ -311,7 +311,7 @@ don't define this value."
            t)
 
        (if (and process
-                (eq (process-status process) 'open))
+                (memq (process-status process) '(open run)))
        (progn
          ;; QUIT
          (smtp-send-command process "QUIT")