aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/mail
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen <[email protected]>2011-06-26 23:05:06 +0200
committerLars Magne Ingebrigtsen <[email protected]>2011-06-26 23:05:06 +0200
commit468d09d44ee9652802712053b0fc259891c431b7 (patch)
tree395ab164b3cc86fdbf41f21518a248ed2f59b993 /lisp/mail
parent88821ca05258c59188be6d146b1ea9e6968cbeba (diff)
If the SMTP server supports STARTTLS, but Emacs has no built-in or
external STARTTLS support, then report this in a sensible fashion to the user.
Diffstat (limited to 'lisp/mail')
-rw-r--r--lisp/mail/smtpmail.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 3c9ea9de57..4a3cb90657 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -651,7 +651,9 @@ The list is in preference order.")
;; If we couldn't access the server at all, we give up.
(unless (setq process (car result))
- (throw 'done "Unable to contact server"))
+ (throw 'done (if (plist-get (cdr result) :error)
+ (plist-get (cdr result) :error)
+ "Unable to contact server")))
;; set the send-filter
(set-process-filter process 'smtpmail-process-filter)