(smtpmail-query-smtp-server): Allow `quit'-ing out in case the probe hangs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f247abdd468fe3ec3473d42cda8ed0993fc10792..02c88eae6678aa1cf8b4f7f501a44a2a746bbc62 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -4,6 +4,8 @@
        `coding-system-for-*' around the process open call to avoid
        auth-source side effects.
        (smtpmail-try-auth-methods): Expand the secret password.
+       (smtpmail-query-smtp-server): Allow `quit'-ing out in case the
+       probe hangs.
 
 2011-08-21  Chong Yidong  <cyd@stupidchicken.com>
 

diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index f905eea8405d26a9d3812a7158f00cc5719b236b..40fbb0725949f53715a50083b2d916050ade9e80 100644 (file)
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -602,8 +602,10 @@ The list is in preference order.")
       (push smtpmail-smtp-server ports))
     (while (and (not smtpmail-smtp-server)
                (setq port (pop ports)))
-      (when (setq stream (ignore-errors
-                          (open-network-stream "smtp" nil server port)))
+      (when (setq stream (condition-case ()
+                            (open-network-stream "smtp" nil server port)
+                          (quit nil)
+                          (error nil)))
        (customize-save-variable 'smtpmail-smtp-server server)
        (customize-save-variable 'smtpmail-smtp-service port)
        (delete-process stream)))