From 96f8741e07a33e6ba81d5afadf3e277e8a54911c Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 10 Jan 2012 18:24:42 +0800 Subject: [PATCH] Fix an error message glitch in network-stream.el. * 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. --- lisp/ChangeLog | 6 ++++++ lisp/net/network-stream.el | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bf229a4acbc..c905a283b11 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-01-10 Chong Yidong + + * 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 * mail/unrmail.el (unrmail): Tweak previous change. diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el index 7860eb96846..8730e875ea0 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 -- 2.11.4.GIT