From: João Távora Date: Tue, 4 Feb 2025 12:02:06 +0000 (+0000) Subject: Eglot: avoid 'null' as params to 'shutdown' request (bug#66144) X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2db8368fb0391d678e9341aaba4c6ecbaefc138b;p=emacs.git Eglot: avoid 'null' as params to 'shutdown' request (bug#66144) Doing so confuses some servers. It used to be needed for the gopls server, but according to https://debbugs.gnu.org/cgi/bugreport.cgi?bug=66144#32 that has been fixed. Thanks to Javier Olaechea * lisp/progmodes/eglot.el (eglot-shutdown): Use eglot--{}. (cherry picked from commit 164da071e07cf162bfe166908dedc82da44ef634) --- diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 4dcc0fbe974..f22add70a76 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -1244,7 +1244,7 @@ SERVER." (unwind-protect (progn (setf (eglot--shutdown-requested server) t) - (eglot--request server :shutdown nil :timeout (or timeout 1.5)) + (eglot--request server :shutdown eglot--{} :timeout (or timeout 1.5)) (jsonrpc-notify server :exit nil)) ;; Now ask jsonrpc.el to shut down the server. (jsonrpc-shutdown server (not preserve-buffers))