From: Dan Davison <dandavison7@gmail.com>
Date: Fri, 1 May 2020 00:04:24 +0000 (-0400)
Subject: Unbreak eglot--guess-contact for host-and-port case
X-Git-Tag: emacs-29.0.90~1616^2~524^2~4^2~233
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e91a40007682491e2f675a6a84151564baaf5c39;p=emacs.git

Unbreak eglot--guess-contact for host-and-port case

* eglot.el (eglot--guess-contact): Fix bug in (host port) connection
case.

GitHub-reference: fix https://github.com/joaotavora/eglot/issues/446
---

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 6db0a09f8f8..adfd4e29f8c 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -698,7 +698,8 @@ be guessed."
          (class (or (and (consp guess) (symbolp (car guess))
                          (prog1 (car guess) (setq guess (cdr guess))))
                     'eglot-lsp-server))
-         (program (and (listp guess) (stringp (car guess)) (car guess)))
+         (program (and (listp guess)
+                       (stringp (car guess)) (stringp (cadr guess)) (car guess)))
          (base-prompt
           (and interactive
                "Enter program to execute (or <host>:<port>): "))