mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-29

Browse source 
fafcf02c85 Fix syntax tables of tree-sitter modes (bug#59807)
91b8d9b7db ; * admin/notes/tree-sitter/build-module/build.sh: Minor ...
1b0e282a7f ; Comment and stylistic change in treesit.el
489b02d03c * doc/misc/Makefile.in (need_emacsver): Add use-package.
This commit is contained in:
Stefan Kangas 2022-12-15 21:13:13 +01:00
commit fa70076974
6 changed files with 58 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/progmodes/js.el
View file

@ -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)