[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 9065d74515 1/3: Merge from origin/emacs-29
From: |
Stefan Kangas |
Subject: |
master 9065d74515 1/3: Merge from origin/emacs-29 |
Date: |
Sat, 3 Dec 2022 00:47:02 -0500 (EST) |
branch: master
commit 9065d745151e1995b80a1f4d5a04e2af111ad928
Merge: 2541bec21b 2b9cd50f93
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>
Merge from origin/emacs-29
2b9cd50f93 Add tsx-ts-mode to eglot-server-programs
---
lisp/progmodes/eglot.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index e5c943ebf7..c266f6e18a 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -190,7 +190,7 @@ chosen (interactively or automatically)."
((js-json-mode json-mode json-ts-mode)
. ,(eglot-alternatives
'(("vscode-json-language-server" "--stdio")
("json-languageserver" "--stdio"))))
- ((js-mode js-ts-mode typescript-ts-mode
typescript-mode)
+ ((js-mode js-ts-mode tsx-ts-mode
typescript-ts-mode typescript-mode)
. ("typescript-language-server" "--stdio"))
((bash-ts-mode sh-mode) .
("bash-language-server" "start"))
((php-mode phps-mode)