From: João Távora <joaotavora@gmail.com>
Date: Sun, 18 Sep 2022 10:19:00 +0000 (+0100)
Subject: Don't return hash tables from e-w-configuration-plist
X-Git-Tag: emacs-29.0.90~1616^2~524^2~4^2~14
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ec7d63cbe75b2de4a8e85852f077c7ab04d87524;p=emacs.git

Don't return hash tables from e-w-configuration-plist

* 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
---

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index c2db7e817f2..7c1e849389d 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -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)