[Emacs-diffs] /srv/bzr/emacs/trunk r106833: Fix an error message glitch in network-stream.el.

[Chong Yidong]

------------------------------------------------------------
revno: 106833
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2012-01-10 18:24:42 +0800
message:
  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.
modified:
  lisp/ChangeLog
  lisp/net/network-stream.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-01-10 02:22:13 +0000
+++ b/lisp/ChangeLog    2012-01-10 10:24:42 +0000
@@ -1,3 +1,9 @@
+2012-01-10  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mail/unrmail.el (unrmail): Tweak previous change.

=== modified file 'lisp/net/network-stream.el'
--- a/lisp/net/network-stream.el        2012-01-05 09:46:05 +0000
+++ b/lisp/net/network-stream.el        2012-01-10 10:24:42 +0000
@@ -299,7 +299,8 @@
               ;; 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