diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-01-10 18:24:42 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-01-10 18:24:42 +0800 |
| commit | 96f8741e07a33e6ba81d5afadf3e277e8a54911c (patch) | |
| tree | e1f6be55392ad49e8086385ef6a2788e3fd9741d | |
| parent | 7d8d6e4efb909345c407f338e6e858d864847344 (diff) | |
| download | emacs-96f8741e07a33e6ba81d5afadf3e277e8a54911c.tar.gz | |
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.
| -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 bf229a4acbc..c905a283b11 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-01-10 Chong Yidong <cyd@gnu.org> + + * 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 <rgm@gnu.org> * 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 |