diff options
author | Stefan Kangas <stefankangas@gmail.com> | 2022-12-15 21:13:13 +0100 |
---|---|---|
committer | Stefan Kangas <stefankangas@gmail.com> | 2022-12-15 21:13:13 +0100 |
commit | fa70076974b5f9ed21438946fb6a1a8bf76b7c5a (patch) | |
tree | f6bb20b15fde5eec55dd757e6191cfb13a26d172 /lisp/progmodes/js.el | |
parent | db69249b761a80158c1469b2a169d6f5c8509ae1 (diff) | |
parent | fafcf02c856ef8fd712ff75e8999dfb0f6d97f07 (diff) | |
download | emacs-fa70076974b5f9ed21438946fb6a1a8bf76b7c5a.tar.gz |
Merge from origin/emacs-29
fafcf02c856 Fix syntax tables of tree-sitter modes (bug#59807)
91b8d9b7db4 ; * admin/notes/tree-sitter/build-module/build.sh: Minor ...
1b0e282a7f8 ; Comment and stylistic change in treesit.el
489b02d03cf * doc/misc/Makefile.in (need_emacsver): Add use-package.
Diffstat (limited to 'lisp/progmodes/js.el')
-rw-r--r-- | lisp/progmodes/js.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 88d0c373bb8..13dce853bc1 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -686,7 +686,7 @@ This variable is like `sgml-attribute-offset'." (modify-syntax-entry ?$ "_" table) (modify-syntax-entry ?` "\"" table) table) - "Syntax table for `js-mode'.") + "Syntax table for `js-mode' and `js-ts-mode'.") (defvar-local js--quick-match-re nil "Autogenerated regexp used by `js-mode' to match buffer constructs.") @@ -3843,6 +3843,7 @@ Currently there are `js-mode' and `js-ts-mode'." \\<js-ts-mode-map>" :group 'js + :syntax-table js-mode-syntax-table (when (treesit-ready-p 'javascript) ;; Borrowed from `js-mode'. (setq-local prettify-symbols-alist js--prettify-symbols-alist) |