]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge branch 'feature/tree-sitter-depth-control' into feature/tree-sitter
authorYuan Fu <casouri@gmail.com>
Tue, 14 Jun 2022 22:52:01 +0000 (15:52 -0700)
committerYuan Fu <casouri@gmail.com>
Tue, 14 Jun 2022 22:52:21 +0000 (15:52 -0700)
1  2 
doc/lispref/parsing.texi
lisp/treesit.el

Simple merge
diff --cc lisp/treesit.el
index ad90d9f9f01af6106e2c25725d6a51dbbc89c428,4e35a4665078558d138802e19bb9e33c2fec1b65..100ca23316a3f03b638a1801bb8f3c35c575c648
@@@ -932,7 -967,7 +974,8 @@@ the tree.
  Capture names don't matter.  This variable is used by navigation
  functions like `treesit-beginning-of-defun'.
  
- It is recommended to use compiled query for this variable.")
 -See `treesit-query-in' for what a query should look like.")
++It is recommended to use a compiled query for this variable.  See
++`treesit-query-in' for what a query should look like.")
  
  (defun treesit-beginning-of-defun (&optional arg)
    "Move backward to the beginning of a defun.