From: João Távora <joaotavora@gmail.com>
Date: Mon, 10 Oct 2022 12:57:26 +0000 (+0100)
Subject: Do use eglot-connect-timeout if eglot-sync-connect is t
X-Git-Tag: emacs-29.0.90~1616^2~524^2~4^2~2
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=eb9d6281b58f50927afdc2fdb2fcebf76e2ffe23;p=emacs.git

Do use eglot-connect-timeout if eglot-sync-connect is t

Reported by Eli Zaretskii <eliz@gnu.org>

* eglot.el (eglot--connect): Use eglot-connect-timeout in the case
eglot-sync-connect is t.
---

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index d3f5935a9ef..18523067fa0 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -1282,7 +1282,8 @@ in project `%s'."
                      (cond ((numberp eglot-sync-connect)
                             (accept-process-output nil eglot-sync-connect))
                            (eglot-sync-connect
-                            (while t (accept-process-output nil 30)))))))
+                            (while t (accept-process-output
+                                      nil eglot-connect-timeout)))))))
               (pcase retval
                 (`(error . ,msg) (eglot--error msg))
                 (`nil (eglot--message "Waiting in background for server `%s'"