aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/net
diff options
context:
space:
mode:
authorChong Yidong2012-01-10 18:24:42 +0800
committerChong Yidong2012-01-10 18:24:42 +0800
commit96f8741e07a33e6ba81d5afadf3e277e8a54911c (patch)
treee1f6be55392ad49e8086385ef6a2788e3fd9741d /lisp/net
parent7d8d6e4efb909345c407f338e6e858d864847344 (diff)
downloademacs-96f8741e07a33e6ba81d5afadf3e277e8a54911c.tar.gz
emacs-96f8741e07a33e6ba81d5afadf3e277e8a54911c.zip
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.
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/network-stream.el3
1 files changed, 2 insertions, 1 deletions
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.
299 ;; support, or no gnutls-cli installed. 299 ;; support, or no gnutls-cli installed.
300 (eq resulting-type 'plain)) 300 (eq resulting-type 'plain))
301 (setq error 301 (setq error
302 (if starttls-available 302 (if (or (null starttls-command)
303 starttls-available)
303 "Server does not support TLS" 304 "Server does not support TLS"
304 (concat "Emacs does not support TLS, and no external `" 305 (concat "Emacs does not support TLS, and no external `"
305 (if starttls-use-gnutls 306 (if starttls-use-gnutls