From: João Távora <joaotavora@gmail.com>
Date: Sat, 17 Sep 2022 09:33:26 +0000 (+0100)
Subject: Adjust last commit about workspace configuration
X-Git-Tag: emacs-29.0.90~1616^2~524^2~4^2~18
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bef332a98314c5cbd76cce79ee0a60cb6aa94172;p=emacs.git

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.

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

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