From: João Távora <joaotavora@gmail.com>
Date: Wed, 27 Apr 2022 10:11:52 +0000 (+0100)
Subject: Ensure non-null :settings param in didchangeconfiguration notif
X-Git-Tag: emacs-29.0.90~1616^2~524^2~4^2~50
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5e9d78f9cf1ec4da5f24ab32d038d0d67566fbc6;p=emacs.git

Ensure non-null :settings param in didchangeconfiguration notif

* eglot.el (eglot-signal-didChangeConfiguration): Use eglot--{}

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

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 348ae4b42c9..fd82b76c5b9 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -2198,11 +2198,12 @@ When called interactively, use the currently active server"
    server :workspace/didChangeConfiguration
    (list
     :settings
-    (cl-loop for (section . v) in eglot-workspace-configuration
-             collect (if (keywordp section)
-                         section
-                       (intern (format ":%s" section)))
-             collect v))))
+    (or (cl-loop for (section . v) in eglot-workspace-configuration
+                 collect (if (keywordp section)
+                             section
+                           (intern (format ":%s" section)))
+                 collect v)
+        eglot--{}))))
 
 (cl-defmethod eglot-handle-request
   (server (_method (eql workspace/configuration)) &key items)