From: João Távora <joaotavora@gmail.com>
Date: Tue, 20 Apr 2021 17:39:54 +0000 (+0100)
Subject: Make eglot-current-server work in notification handlers
X-Git-Tag: emacs-29.0.90~1616^2~524^2~4^2~144
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5b33fe06c506d6a83f6ef77851478033de840b2a;p=emacs.git

Make eglot-current-server work in notification handlers

* eglot.el (eglot--connect): Ensure `eglot--cached-server` bound
when calling notification/request methods.

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

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 20f59956f81..f926709e8cf 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -945,7 +945,8 @@ This docstring appeases checkdoc, that's all."
                                   (format "*%s stderr*" readable-name))
                          :file-handler t)))))))
          (spread (lambda (fn) (lambda (server method params)
-                                (apply fn server method (append params nil)))))
+                                (let ((eglot--cached-server server))
+                                 (apply fn server method (append params nil))))))
          (server
           (apply
            #'make-instance class