diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2023-01-20 10:28:26 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2023-01-20 10:28:26 +0200 |
| commit | 6b2f85caa6cae1178b8abee531b0b9b0cf618a00 (patch) | |
| tree | 9a7768513e40f700cf7c9f587ad117f058f6b56e /lisp/progmodes/js.el | |
| parent | b56cf28b325c927d5e51173b00f5e5354ba62def (diff) | |
| download | emacs-6b2f85caa6cae1178b8abee531b0b9b0cf618a00.tar.gz | |
Make tree-sitter based modes optional
* lisp/progmodes/c-ts-mode.el: Update Commentary. Make
'auto-mode-alist' update conditional on the tree-sitter and
grammar libraries being available.
* lisp/progmodes/cmake-ts-mode.el:
* lisp/progmodes/csharp-mode.el:
* lisp/progmodes/dockerfile-ts-mode.el:
* lisp/progmodes/go-ts-mode.el:
* lisp/progmodes/java-ts-mode.el:
* lisp/progmodes/js.el:
* lisp/progmodes/json-ts-mode.el:
* lisp/progmodes/python.el:
* lisp/progmodes/ruby-ts-mode.el:
* lisp/progmodes/typescript-ts-mode.el:
* lisp/textmodes/css-mode.el:
* lisp/textmodes/toml-ts-mode.el:
* lisp/textmodes/yaml-ts-mode.el: Make 'auto-mode-alist' update
for tree-sitter based modes be conditional on the tree-sitter and
grammar libraries being available. (Bug#60559)
Diffstat (limited to 'lisp/progmodes/js.el')
| -rw-r--r-- | lisp/progmodes/js.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index cc556c4d0ec..176024863f1 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -3843,7 +3843,10 @@ Currently there are `js-mode' and `js-ts-mode'." "method_definition") eos) nil nil))) - (treesit-major-mode-setup))) + (treesit-major-mode-setup) + + (add-to-list 'auto-mode-alist + '("\\(\\.js[mx]\\|\\.har\\)\\'" . js-ts-mode)))) ;;;###autoload (define-derived-mode js-json-mode js-mode "JSON" |