[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/eglot a67284b855: Per #790, #590: Adjust last commit ab
From: |
ELPA Syncer |
Subject: |
[elpa] externals/eglot a67284b855: Per #790, #590: Adjust last commit about workspace configuration |
Date: |
Sat, 17 Sep 2022 05:57:55 -0400 (EDT) |
branch: externals/eglot
commit a67284b855be83678a84eb9457afa8b259799a6b
Author: João Távora <joaotavora@gmail.com>
Commit: João Távora <joaotavora@gmail.com>
Per #790, #590: Adjust last commit about workspace configuration
* README.md (way): Adjust.
* eglot.el (json): Don't require needlessly.
(eglot-show-workspace-configuration): Don't depend on json-mode.
---
README.md | 4 +---
eglot.el | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/README.md b/README.md
index 808c78b664..61b171804a 100644
--- a/README.md
+++ b/README.md
@@ -141,9 +141,7 @@ out-of-the-box, but some need to know project-specific
settings, which
LSP calls "workspace configuration".
These per-project settings are realized with the Elisp variable
-`eglot-workspace-configuration`.
-
-This variable's value is sent over to the server:
+`eglot-workspace-configuration`. They are sent over to the server:
* initially, as a [`didChangeConfiguration`
notification][did-change-configuration];
* as the response to [configuration request][configuration-request] from the
server.
diff --git a/eglot.el b/eglot.el
index f02ec73043..ff94d5ca5f 100644
--- a/eglot.el
+++ b/eglot.el
@@ -74,7 +74,6 @@
(require 'filenotify)
(require 'ert)
(require 'array)
-(require 'json)
;; ElDoc is preloaded in Emacs, so `require'-ing won't guarantee we are
;; using the latest version from GNU Elpa when we load eglot.el. Use an
@@ -2222,8 +2221,7 @@ format described above.")
(insert (jsonrpc--json-encode conf))
(with-no-warnings
(require 'json)
- (require 'json-mode)
- (json-mode)
+ (when (require 'json-mode nil t) (json-mode))
(json-pretty-print-buffer))
(pop-to-buffer (current-buffer)))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] externals/eglot a67284b855: Per #790, #590: Adjust last commit about workspace configuration,
ELPA Syncer <=