X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/5ab243f40e4db91586ff74b01a775a5218a1d5be..1adfb5ee55d16cd3d9d78998ae7bbb8e5708d9c5:/lisp/net/network-stream.el

diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index f919efb219..c2845d96a5 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -65,8 +65,8 @@ BUFFER is a buffer or buffer name to associate with the process.
  Process output goes at end of that buffer.  BUFFER may be nil,
  meaning that the process is not associated with any buffer.
 HOST is the name or IP address of the host to connect to.
-SERVICE is the name of the service desired, or an integer specifying
- a port number to connect to.
+SERVICE is the name of the service desired, or an integer or
+ integer string specifying a port number to connect to.
 
 The remaining PARAMETERS should be a sequence of keywords and
 values:
@@ -312,6 +312,9 @@ gnutls-boot (as returned by `gnutls-boot-parameters')."
 					:host (puny-encode-domain host)
                                         :service service))
 	    (network-stream-get-response stream start eoc)))
+        (unless (process-live-p stream)
+          (error "Unable to negotiate a TLS connection with %s/%s"
+                 host service))
 	;; Re-get the capabilities, which may have now changed.
 	(setq capabilities
 	      (network-stream-command stream capability-command eo-capa))))