]> git.eshelyaron.com Git - emacs.git/commit
eglot-server-programs: Account for new js-json-mode
authorBrian Leung <leungbk@posteo.net>
Tue, 25 Oct 2022 03:43:50 +0000 (20:43 -0700)
committerStefan Kangas <stefankangas@gmail.com>
Tue, 25 Oct 2022 10:13:25 +0000 (12:13 +0200)
commit566e410287d9898f90c81131bfa8c85462fab55e
tree56764019a2713fb031c18404bef04718c95a83f0
parent72a94f91fd0570556ce770dc3a39e658f7588f7e
eglot-server-programs: Account for new js-json-mode

js-json-mode derives from js-mode, so this reordering is necessary to
prevent js-mode's eglot server from starting if a user has something
like this in their config:

    (add-to-hook 'js-json-mode #'eglot-ensure)
    (add-to-hook 'js-mode #'eglot-ensure)

* lisp/progmodes/eglot.el (eglot-server-programs): Move the
json-language-server info before the entry for js-mode, and add on
js-json-mode.  (Bug#58769)
lisp/progmodes/eglot.el