]> git.eshelyaron.com Git - emacs.git/commitdiff
Don't return hash tables from e-w-configuration-plist
authorJoão Távora <joaotavora@gmail.com>
Sun, 18 Sep 2022 10:19:00 +0000 (11:19 +0100)
committerJoão Távora <joaotavora@gmail.com>
Sun, 18 Sep 2022 10:19:00 +0000 (11:19 +0100)
* eglot.el (eglot-signal-didChangeConfiguration): Adjust.
(eglot-handle-request workspace-configuration): Adjust.
(eglot--workspace-configuration-plist): Don't return a hashtable.

GitHub-reference: per https://github.com/joaotavora/eglot/issues/1033

lisp/progmodes/eglot.el

index c2db7e817f2364a5c3dae2904c14cdc6eb5d822f..7c1e849389d4fcc5f1cc5792048d97508585630a 100644 (file)
@@ -2257,8 +2257,7 @@ format described above.")
                       collect (if (keywordp section) section
                                 (intern (format ":%s" section)))
                       collect v))
-        val
-        eglot--{})))
+        val)))
 
 (defun eglot-signal-didChangeConfiguration (server)
   "Send a `:workspace/didChangeConfiguration' signal to SERVER.
@@ -2268,7 +2267,8 @@ When called interactively, use the currently active server"
    server :workspace/didChangeConfiguration
    (list
     :settings
-    (eglot--workspace-configuration-plist server))))
+    (or (eglot--workspace-configuration-plist server)
+        eglot--{}))))
 
 (cl-defmethod eglot-handle-request
   (server (_method (eql workspace/configuration)) &key items)