From: João Távora <joaotavora@gmail.com>
Date: Tue, 8 May 2018 00:52:27 +0000 (+0100)
Subject: When killing server, always wait 3 seconds
X-Git-Tag: emacs-29.0.90~1616^2~524^2~4^2~613
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2c093aeb840f528270b3b3969e9506dd1f9a1ef2;p=emacs.git

When killing server, always wait 3 seconds

* eglot.el (eglot--request): Accept TIMEOUT param.
---

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 2e409ef840f..9ce7e261a31 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -552,10 +552,12 @@ is a symbol saying if this is a client or server originated."
 (cl-defun eglot--request (process
                           method
                           params
-                          &key success-fn error-fn timeout-fn (async-p t))
+                          &key success-fn error-fn timeout-fn (async-p t)
+                          (timeout eglot-request-timeout))
   "Make a request to PROCESS, expecting a reply.
 Return the ID of this request, unless ASYNC-P is nil, in which
-case never returns locally."
+case never returns locally.  Wait TIMEOUT seconds for a
+response."
   (let* ((id (eglot--next-request-id))
          (timeout-fn (or timeout-fn
                          (lambda ()
@@ -583,7 +585,7 @@ case never returns locally."
     (catch catch-tag
       (let ((timeout-timer
              (run-with-timer
-              eglot-request-timeout nil
+              timeout nil
               (if async-p
                   (lambda ()
                     (remhash id (eglot--pending-continuations process))
@@ -912,10 +914,12 @@ running.  INTERACTIVE is t if called interactively."
                                    :success-fn brutal
                                    :async-p (not sync)
                                    :error-fn brutal
-                                   :timeout-fn brutal))
+                                   :timeout-fn brutal
+                                   :timeout 3))
      :error-fn brutal
      :async-p (not sync)
-     :timeout-fn brutal)))
+     :timeout-fn brutal
+     :timeout 3)))
 
 (cl-defun eglot--server-window/showMessage (_process &key type message)
   "Handle notification window/showMessage"