diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2022-12-16 08:45:06 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2022-12-16 08:45:06 +0100 |
| commit | 03892d4f7c1253bc1affeedd227eb0a1520de90e (patch) | |
| tree | e4b8c00a4ed4e16da3b06c18a34605cf9d19fd68 /lisp/progmodes/js.el | |
| parent | b52d0147e9ef7900f4fc07e8c2bf816b1a4ae145 (diff) | |
| parent | 033071692c7cd1cd550d25170d4b3168668567ac (diff) | |
| download | emacs-03892d4f7c1253bc1affeedd227eb0a1520de90e.tar.gz | |
Merge from origin/emacs-29
033071692c7 ; Fix typos
f4a513344d9 Add lambda_expression-rule to java-ts-mode (bug#60091)
546aed35434 eglot: Add support for new language server csharp-ls
cb761eb7ac4 Use the new tree-sitter commands
037407ad95a Add "function" feature to python-ts-mode (bug#59977)
fee2efe1b03 Add go-ts-mode and go-mod-ts-mode (Bug#60025)
e8f7ab67ad1 Add basic support for hideshow in python-ts-mode (bug#60044)
cac070b23e4 Add "this" keyword to java-ts-mode (bug#60086)
c8d75046a2f When completing relative project file names, use relative...
3b618d0e3ed Avoid segfaults due to invalid selected-window's buffer
# Conflicts:
# lisp/progmodes/sh-script.el
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 e0625951b65..b8bfd5620d1 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -1928,7 +1928,7 @@ This performs fontification according to `js--class-styles'." ;; identified as such), then the `syntax-propertize' region won’t be ;; extended backwards to the start of the JSXOpeningElement: ;; -;; <div ← This line wasn’t JSX when last edited. +;; <div ← This line wasn't JSX when last edited. ;; attr=""> ← Despite completing the JSX, the next ;; ^ `syntax-propertize' region wouldn’t magically ;; extend back a few lines. @@ -2090,7 +2090,7 @@ JSXElement or a JSXOpeningElement/JSXClosingElement pair." ;; JSXOpeningElement has been found, so keep ;; looking backwards for an enclosing one). (or (not close-tag-pos) (<= start close-tag-pos))))))))) - ;; Don’t return the last tag pos, as it wasn’t enclosing. + ;; Don't return the last tag pos, as it wasn't enclosing. (setq tag-beg nil close-tag-pos nil)) (and tag-beg (list tag-beg-pos tag-end-pos close-tag-pos)))) |