aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Távora2025-02-04 12:02:06 +0000
committerJoão Távora2025-02-04 12:06:04 +0000
commit164da071e07cf162bfe166908dedc82da44ef634 (patch)
tree0a85179ab8e730e1fd158bb62f333011b2110096
parentc4a67a405072601b9d7dd95dc94c0b402e1e0ae6 (diff)
downloademacs-164da071e07cf162bfe166908dedc82da44ef634.tar.gz
emacs-164da071e07cf162bfe166908dedc82da44ef634.zip
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 <pirata@gmail.com> * lisp/progmodes/eglot.el (eglot-shutdown): Use eglot--{}.
-rw-r--r--lisp/progmodes/eglot.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 4114f21bc75..4a174d5db5c 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -1246,7 +1246,7 @@ SERVER."
1246 (unwind-protect 1246 (unwind-protect
1247 (progn 1247 (progn
1248 (setf (eglot--shutdown-requested server) t) 1248 (setf (eglot--shutdown-requested server) t)
1249 (eglot--request server :shutdown nil :timeout (or timeout 1.5)) 1249 (eglot--request server :shutdown eglot--{} :timeout (or timeout 1.5))
1250 (jsonrpc-notify server :exit nil)) 1250 (jsonrpc-notify server :exit nil))
1251 ;; Now ask jsonrpc.el to shut down the server. 1251 ;; Now ask jsonrpc.el to shut down the server.
1252 (jsonrpc-shutdown server (not preserve-buffers)) 1252 (jsonrpc-shutdown server (not preserve-buffers))