[Emacs-diffs] /srv/bzr/emacs/trunk r104744: Fix stupid typo with gnutls-clii.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 104744
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Mon 2011-06-27 02:11:22 +0200
message:
  Fix stupid typo with gnutls-clii.
  Don't re-get capabilities unless we're reconnecting.
modified:
  lisp/net/network-stream.el

=== modified file 'lisp/net/network-stream.el'
--- a/lisp/net/network-stream.el        2011-06-26 21:05:06 +0000
+++ b/lisp/net/network-stream.el        2011-06-27 00:11:22 +0000
@@ -223,7 +223,7 @@
               (or builtin-starttls
                   (and (or require-tls
                            (plist-get parameters :use-starttls-if-possible))
-                       (executable-find "gnutls-clii")))
+                       (executable-find "gnutls-cli")))
               (not (eq (plist-get parameters :type) 'plain)))
       ;; If using external STARTTLS, drop this connection and start
       ;; anew with `starttls-open-stream'.
@@ -246,11 +246,11 @@
                               "--x509certfile" (expand-file-name (nth 1 cert)))
                         starttls-extra-arguments)))
          (setq stream (starttls-open-stream name buffer host service)))
-       (network-stream-get-response stream start eoc))
-      ;; Requery capabilities for protocols that require it; i.e.,
-      ;; EHLO for SMTP.
-      (when (plist-get parameters :always-query-capabilities)
-       (network-stream-command stream capability-command eoc))
+       (network-stream-get-response stream start eoc)
+       ;; Requery capabilities for protocols that require it; i.e.,
+       ;; EHLO for SMTP.
+       (when (plist-get parameters :always-query-capabilities)
+         (network-stream-command stream capability-command eoc)))
       (when (string-match success-string
                          (network-stream-command stream starttls-command eoc))
        ;; The server said it was OK to begin STARTTLS negotiations.