diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2023-01-07 06:30:10 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2023-01-07 06:30:10 +0100 |
| commit | abeb29bfcc68c578f11d59dcc1522738d493770a (patch) | |
| tree | af85826729e3e6f719c36fed5a51347896bf3d1e /lisp/progmodes/js.el | |
| parent | 39b77970c6155d7d2f1ffd1f9d609ec94ade3165 (diff) | |
| parent | 9d410f8de64e91d16999a9bb5dd884d6d06d22bd (diff) | |
| download | emacs-abeb29bfcc68c578f11d59dcc1522738d493770a.tar.gz | |
Merge from origin/emacs-29
9d410f8de64 (treesit-simple-indent-presets): Ensure 'and' works for a...
ff66a5d324b (treesit--indent-rules-optimize): Optimize 'and' and 'or'...
f2ebe43362c (treesit-simple-indent-presets): Short-circuit 'and' and ...
2ea6ee5cbfa (font-lock-regexp-face): New face
5ab03bcc433 Unify the string interpolation delimiters face across ts ...
92e8c0c091c ruby-ts-mode: Highlight more kinds of parameters
7420b6dcc37 Fix `pr-interface'
699711786ac Further generic-related improvements in csharp-ts-mode (b...
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/progmodes/js.el')
| -rw-r--r-- | lisp/progmodes/js.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 8a2a5f886ec..881f4a83b17 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -3498,14 +3498,14 @@ This function is intended for use in `after-change-functions'." :language 'javascript :feature 'string - '((regex pattern: (regex_pattern)) @font-lock-string-face + '((regex pattern: (regex_pattern)) @font-lock-regexp-face (string) @font-lock-string-face) :language 'javascript :feature 'string-interpolation :override t '((template_string) @js--fontify-template-string - (template_substitution ["${" "}"] @font-lock-delimiter-face)) + (template_substitution ["${" "}"] @font-lock-misc-punctuation-face)) :language 'javascript :feature 'definition |