diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/net/network-stream.el | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bf229a4acb..c905a283b1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-01-10 Chong Yidong <[email protected]> + + * net/network-stream.el (network-stream-open-starttls): Avoid + emitting a confusing error message when the server gives a bad + response to the capability command. + 2012-01-10 Glenn Morris <[email protected]> * mail/unrmail.el (unrmail): Tweak previous change. diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el index 7860eb9684..8730e875ea 100644 --- a/lisp/net/network-stream.el +++ b/lisp/net/network-stream.el @@ -299,7 +299,8 @@ functionality. ;; support, or no gnutls-cli installed. (eq resulting-type 'plain)) (setq error - (if starttls-available + (if (or (null starttls-command) + starttls-available) "Server does not support TLS" (concat "Emacs does not support TLS, and no external `" (if starttls-use-gnutls |