diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2022-12-14 00:06:29 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2022-12-14 00:06:29 +0100 |
| commit | 8036739c1bb6fab46b7728b3acac7511e066d64b (patch) | |
| tree | 5a5833041b8a0e3d46696f4983a5f6b134c4bbb5 /lisp/progmodes/js.el | |
| parent | 19d608da2abd1bb682f98207a655a2b484031a10 (diff) | |
| parent | cd5856e40386779675fc9ada36eefd8bd80a82b5 (diff) | |
| download | emacs-8036739c1bb6fab46b7728b3acac7511e066d64b.tar.gz | |
Merge from origin/emacs-29
cd5856e4038 Fix bug when calling `rgrep` non-interactively
ba4bdd6a259 Adapt Tramp specific tests in eglot-tests.el
1d5c35c8e46 * lisp/textmodes/texinfo.el (texinfo-flymake): Improve do...
a99d0e7e6c9 Support a function in the BUFFER-LIST arg of list-buffers...
def51dd6458 ; Fix typos
4980ed7a6d9 Don't allow lazy highlight from recursive minibuffers
4ef8b9f5441 Improve resetting face attributes when looking for suitab...
c4b8bc90a8e ; Fix typos in doc strings
c45eb138451 ; * lisp/bs.el (bs-attributes-list): Doc fix
d6adaf487d8 Add lexical-binding to example package header
03ad1a92a2d Add improved tree-sitter navigation
a5272e2a7cc ; * test/src/treesit-tests.el: Add outline headers.
489bcacc7c3 Add cross-reference to flush-lines
0f9e6532b14 Use font-lock-number-face for numeric values in csharp-mode
4bccb7b211e Make treesit-query-validate create a read-only buffer
c0fe6c72cec Improve dockerfile-ts-mode imenu generation (Bug#59979)
631908f7017 Add "->" to python--treesit-operators (bug#59968)
5d4274d9b65 ; * admin/notes/tree-sitter/build-module/build.sh: Add -f...
d264b75669d Align C++ access specifiers to their enclosing class/stru...
ca67d988d87 Add cmake-ts-mode
8ec923775de Tweak various ts-mode's indent and fontification (bug#59931)
647b6a8099f Add expression for generic_name in csharp-ts-mode (bug#59...
5b178efd85a ; Adjust eglot test to recent autopep8/pycodestyle
58b8ed8b55c ; Avoid compilation warning on MS-Windows
40c23c11e88 * lisp/outline.el: Fix the value 'insert' of outline-mino...
527eb11de20 * lisp/minibuffer.el (completions-group-separator): Rever...
42d740fb2cb ; Skip two eglot tests when typescript is missing
19ef86f775a ; Remove outdated text describing overlays
081bf583007 Skip Eglot rust-analyzer tests if 'cargo' isn't available
# Conflicts:
# lisp/progmodes/typescript-ts-mode.el
# lisp/treesit.el
Diffstat (limited to 'lisp/progmodes/js.el')
| -rw-r--r-- | lisp/progmodes/js.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index da47f682d70..88d0c373bb8 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -3876,6 +3876,7 @@ Currently there are `js-mode' and `js-ts-mode'." ;; Indent. (setq-local treesit-simple-indent-rules js--treesit-indent-rules) ;; Navigation. + (setq-local treesit-defun-prefer-top-level t) (setq-local treesit-defun-type-regexp (rx (or "class_declaration" "method_definition" |