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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bf229a4acbc0c142ed4694f64731694743ef6fd8..c905a283b11e040df336a49866851f04e39b1502 100644 (file)
--- 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 7860eb96846ad95d8a3a16164ca08ed72514fa13..8730e875ea00ae7f90ec4075b1e62d1e152154e6 100644 (file)
--- 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