commit 7cfa87ed5bb35465755c5586c1a5b3d2318d0b19 (HEAD, refs/remotes/origin/master)
Author: F. Jason Park <jp@neverwas.me>
Date:   Mon Nov 21 20:53:25 2022 -0800

    ; Fix ERC test failure following recent typo fix
    
    * test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el: Replace
    expected buffer content in test assertion.
    * test/lisp/erc/resources/erc-scenarios-common.el: Replace expected
    buffer content in test assertion. See also
    40539c7587dc474b424cff732973fe8958eadf14 "; Fix typos".

diff --git a/test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el b/test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el
index 711dc7b97f..2ffa86aff6 100644
--- a/test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el
+++ b/test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el
@@ -106,7 +106,7 @@ erc-scenarios-common--base-compat-no-rename-bouncer
         (erc-d-t-search-for 1 "<joe>")
         (erc-d-t-absent-for 0.1 "<bob>")
         (should (eq erc-server-process erc-server-process-bar))
-        (erc-d-t-search-for 10 "keeps you from dishonor")
+        (erc-d-t-search-for 10 "joe: It is a rupture")
         (erc-d-t-wait-for 5 (not (erc-server-process-alive)))))
 
     (when more (funcall more))))
diff --git a/test/lisp/erc/resources/erc-scenarios-common.el b/test/lisp/erc/resources/erc-scenarios-common.el
index ef65125241..601c9e95c8 100644
--- a/test/lisp/erc/resources/erc-scenarios-common.el
+++ b/test/lisp/erc/resources/erc-scenarios-common.el
@@ -296,7 +296,7 @@ erc-scenarios-common--base-network-id-bouncer
         (erc-d-t-search-for 1 "<joe>")
         (erc-d-t-absent-for 0.1 "<bob>")
         (erc-d-t-wait-for 5 (eq erc-server-process erc-server-process-bar))
-        (erc-d-t-search-for 15 "keeps you from dishonour")
+        (erc-d-t-search-for 15 "joe: It is a rupture")
         (erc-d-t-wait-for 5 (not (erc-server-process-alive)))))
 
     (when after (funcall after))))

commit ea73fd69f0c6251ad9b8fc8267ce0fa68495715e
Author: Juanma Barranquero <lekktu@gmail.com>
Date:   Tue Nov 22 04:40:49 2022 +0100

    ; Fix typos in tree-sitter files
    
    * admin/notes/tree-sitter/starter-guide (Font-lock)
    (Debugging queries, Indent, Navigation, Which-func)
    (More features?):
    * lisp/treesit.el (treesit--merge-ranges)
    (treesit-font-lock-feature-list, treesit-font-lock-rules)
    (treesit-font-lock-fontify-region, treesit--font-lock-notifier)
    (treesit-simple-indent-presets, treesit--font-lock-fast-mode)
    (treesit--indent-region-batch-size)
    (treesit--indent-rules-optimize, treesit-ready-p): Fix typos.

diff --git a/admin/notes/tree-sitter/starter-guide b/admin/notes/tree-sitter/starter-guide
index faf40bc64f..123dabd9f2 100644
--- a/admin/notes/tree-sitter/starter-guide
+++ b/admin/notes/tree-sitter/starter-guide
@@ -111,7 +111,7 @@ will be fontified in their capture name.
 
 The capture name could also be a function, in which case (NODE
 OVERRIDE START END) is passed to the function for fontification. START
-and END is the start and end of the region to be fontified.  The
+and END are the start and end of the region to be fontified.  The
 function should only fontify within that region.  The function should
 also allow more optional arguments with (&rest _), for future
 extensibility.  For OVERRIDE check out the docstring of
@@ -169,7 +169,7 @@ Neovim also has a bunch of queries to reference:
 The manual explains how to read grammar files in the bottom of section
 "Tree-sitter Language Definitions".
 
-** Debugging queires
+** Debugging queries
 
 If your query has problems, use ‘treesit-query-validate’ to debug the
 query. It will pop a buffer containing the query (in text format) and
@@ -261,8 +261,8 @@ Indent works like this: We have a bunch of rules that look like
 When the indentation process starts, point is at the BOL of a line, we
 want to know which column to indent this line to. Let NODE be the node
 at point, we pass this node to the MATCHER of each rule, one of them
-will match the node (eg, "this node is a closing bracket!"). Then we pass
-the node to the ANCHOR, which returns a point, eg, the BOL of the
+will match the node (eg, "this node is a closing bracket!"). Then we
+pass the node to the ANCHOR, which returns a point, eg, the BOL of the
 previous line. We find the column number of that point (eg, 4), add
 OFFSET to it (eg, 0), and that is the column we want to indent the
 current line to (4 + 0 = 4).
@@ -297,7 +297,7 @@ There is also a manual section for indent: "Parser-based Indentation".
 
 When writing indent rules, you can use ‘treesit-check-indent’ to
 check if your indentation is correct. To debug what went wrong, set
-‘treesit--indent-verboase’ to non-nil. Then when you indent, Emacs
+‘treesit--indent-verbose’ to non-nil. Then when you indent, Emacs
 tells you which rule is applied in the echo area.
 
 #+begin_src elisp
@@ -358,7 +358,7 @@ definition node, and ’end means we want to go to the end of that node.
 
 Tree-sitter has default implementations for
 ‘beginning-of-defun-function’ and ‘end-of-defun-function’.  So for
-ordinary languages, it is suffice to set ‘treesit-defun-type-regexp’
+ordinary languages, it is enough to set ‘treesit-defun-type-regexp’
 to something that matches all the defun struct types in the language,
 and call ‘treesit-major-mode-setup’.  For example,
 
@@ -375,8 +375,8 @@ and call ‘treesit-major-mode-setup’.  For example,
 If you have an imenu implementation, set ‘which-func-functions’ to
 nil, and which-func will automatically use imenu’s data.
 
-If you want independent implementation for which-func, you can find
-the current function by going up the tree and looking for the
+If you want an independent implementation for which-func, you can
+find the current function by going up the tree and looking for the
 function_definition node. See the function below for an example.
 Since Python allows nested function definitions, that function keeps
 going until it reaches the root node, and records all the function
@@ -410,7 +410,7 @@ For INCLUDE-TYPE see `python-info-current-defun'."
 * More features?
 
 Obviously this list is just a starting point, if there are features in
-the major mode that would benefit a parse tree, adding tree-sitter
+the major mode that would benefit from a parse tree, adding tree-sitter
 support for that would be great. But in the minimal case, just adding
 font-lock is awesome.
 
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 24f0e1472d..0dcd16d89a 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -414,8 +414,8 @@ treesit-range-rules
 
 (defun treesit--merge-ranges (old-ranges new-ranges start end)
   "Merge OLD-RANGES and NEW-RANGES, discarding ranges between START and END.
-OLD-RANGES and NEW-RANGES are lists of cons of the form (BEG . END).  When
-merging the two ranges, if a range in OLD-RANGES intersects with
+OLD-RANGES and NEW-RANGES are lists of cons of the form (BEG . END).
+When merging the two ranges, if a range in OLD-RANGES intersects with
 another range in NEW-RANGES, discard the one in OLD-RANGES and
 keep the one in NEW-RANGES.  Also discard any range in OLD-RANGES
 that intersects the region marked by START and END.
@@ -521,7 +521,7 @@ treesit-font-lock-feature-list
 `font-lock-maximum-decoration' controls which levels are
 activated.
 
-Inside each sublist are feature symbols, which corresponds to the
+Inside each sublist are feature symbols, which correspond to the
 :feature value of a query defined in `treesit-font-lock-rules'.
 Removing a feature symbol from this list disables the
 corresponding query during font-lock.
@@ -531,7 +531,7 @@ treesit-font-lock-feature-list
 string-interpolation, comment, doc, string, operator, property,
 preprocessor, escape-sequence, key (in key-value pairs).  Major
 modes are free to subdivide or extend on these common features.
-See the manual for more explanations on some of the feature.
+See the manual for more explanations on some of the features.
 
 For changes to this variable to take effect, run
 `treesit-font-lock-recompute-features'.")
@@ -585,7 +585,7 @@ treesit-font-lock-rules
      :feature \\='script
      \"(script_element) @font-lock-builtin-face\")
 
-For each QUERY, a :language keyword and a :feature keyword is
+For each QUERY, a :language keyword and a :feature keyword are
 required.  Each query's :feature is a symbol summarizing what the
 query fontifies.  It is used to allow users to enable/disable
 certain features.  See `treesit-font-lock-kind-list' for more.
@@ -798,7 +798,7 @@ treesit--node-length
   (- (treesit-node-end node) (treesit-node-start node)))
 
 (defvar-local treesit--font-lock-fast-mode nil
-  "If this variable is t, change the way we query so its faster.
+  "If this variable is t, change the way we query so it's faster.
 This is not a general optimization and should be RARELY needed!
 See comments in `treesit-font-lock-fontify-region' for more
 detail.")
@@ -810,8 +810,7 @@ treesit--font-lock-fast-mode
 ;; applied by regexp-based font-lock.  The clipped part will be
 ;; fontified fine when Emacs fontifies the region containing it.
 ;;
-(defun treesit-font-lock-fontify-region
-    (start end &optional loudly)
+(defun treesit-font-lock-fontify-region (start end &optional loudly)
   "Fontify the region between START and END.
 If LOUDLY is non-nil, display some debugging information."
   (when (or loudly treesit--font-lock-verbose)
@@ -832,10 +831,10 @@ treesit-font-lock-fontify-region
       ;; is very fast anyway (even in large files of size ~10MB).
       ;; Plus, querying the result of `treesit-node-on' could still
       ;; miss patterns even if we use some heuristic to enlarge the
-      ;; node (how much to enlarge? to which extent?), its much safer
+      ;; node (how much to enlarge? to which extent?), it's much safer
       ;; to just use the root node.
       ;;
-      ;; Sometimes the source file has some errors that causes
+      ;; Sometimes the source file has some errors that cause
       ;; tree-sitter to parse it into a enormously tall tree (10k
       ;; levels tall).  In that case querying the root node is very
       ;; slow.  So we try to get top-level nodes and query them.  This
@@ -896,7 +895,7 @@ treesit-font-lock-fontify-region
   `(jit-lock-bounds ,start . ,end))
 
 (defun treesit--font-lock-notifier (ranges parser)
-  "Ensures updated parts of the parse-tree is refontified.
+  "Ensures updated parts of the parse-tree are refontified.
 RANGES is a list of (BEG . END) ranges, PARSER is the tree-sitter
 parser notifying of the change."
   (with-current-buffer (treesit-parser-buffer parser)
@@ -1083,15 +1082,15 @@ treesit-simple-indent-presets
   "A list of presets.
 These presets that can be used as MATHER and ANCHOR in
 `treesit-simple-indent-rules'.  MACHTERs and ANCHORs are
-functions that takes 3 arguments: NODE, PARENT and BOL.
+functions that take 3 arguments: NODE, PARENT and BOL.
 
 MATCHER:
 
 \(match NODE-TYPE PARENT-TYPE NODE-FIELD NODE-INDEX-MIN NODE-INDEX-MAX)
 
     NODE-TYPE checks for NODE's type, PARENT-TYPE checks for
-    PARENT's type, NODE-FIELD checks for the filed name of NODE
-    in PARENT, NODE-INDEX-MIN and NODE-INDEX-MAX checks for
+    PARENT's type, NODE-FIELD checks for the field name of NODE
+    in PARENT, NODE-INDEX-MIN and NODE-INDEX-MAX check for
     NODE's index in PARENT.  Therefore, to match the first child
     where PARENT is \"argument_list\", use
 
@@ -1147,7 +1146,7 @@ treesit-simple-indent-presets
 
 prev-line
 
-    Returns the  first non-whitespace character on the previous line.
+    Returns the first non-whitespace character on the previous line.
 
 point-min
 
@@ -1278,7 +1277,7 @@ treesit--indent-region-batch-size
   "How many lines of indent value do we precompute.
 In `treesit-indent-region' we indent in batches: precompute
 indent for each line, apply them in one go, let parser reparse,
-and do it again.  This way the parser don't need to unnecessarily
+and do it again.  This way the parser doesn't need to unnecessarily
 reparse after indenting every single line.")
 
 (defun treesit-indent-region (beg end)
@@ -1412,7 +1411,7 @@ treesit--indent-rules-optimize
 RULES should be a value suitable for
 `treesit-simple-indent-rules'.  Return the optimized version of
 RULES."
-  ;; Right now this function just compiles queries.  it doesn't
+  ;; Right now this function just compiles queries.  It doesn't
   ;; byte-compile matchers and anchors because it doesn't make much
   ;; difference.
   (cl-loop for setting in rules
@@ -1551,8 +1550,8 @@ treesit-ready-p
 If tree-sitter is not ready, emit a warning and return nil.  If
 the user has chosen to activate tree-sitter for LANGUAGE and
 tree-sitter is ready, return non-nil.  If QUIET is t, don't emit
-warning in either case; if quiet is `message', display a message
-instead of emitting warning."
+a warning in either case; if quiet is `message', display a message
+instead of emitting a warning."
   (let ((language-list (if (consp language)
                            language
                          (list language)))

commit 19954da8dd927f9db4ca95d8a1320207e6c404cd
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Tue Nov 22 02:38:41 2022 +0100

    Refresh menus in gnus.texi
    
    Fixes problem reported by Po Lu <luangruo@yahoo.com>.
    * doc/misc/gnus.texi (Top, Starting Up, Article Treatment)
    (The Gnus Diary Library, Searching, nnmairix): Refresh menus.

diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 1d522bf9ca..0508b5cc05 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -402,21 +402,21 @@ Top
 @end iftex
 
 @menu
-* Don't Panic::              Your first 20 minutes with Gnus.
-* Starting Up::              Finding news can be a pain.
-* Group Buffer::             Selecting, subscribing and killing groups.
-* Summary Buffer::           Reading, saving and posting articles.
-* Article Buffer::           Displaying and handling articles.
-* Composing Messages::       Information on sending mail and news.
-* Select Methods::           Gnus reads all messages from various select methods.
-* Scoring::                  Assigning values to articles.
-* Searching::                Mail and News search engines.
-* Various::                  General purpose settings.
-* The End::                  Farewell and goodbye.
-* Appendices::               Terminology, Emacs intro, @acronym{FAQ}, History, Internals.
-* GNU Free Documentation License:: The license for this documentation.
-* Index::                    Variable, function and concept index.
-* Key Index::                Key Index.
+* Don't Panic::                 Your first 20 minutes with Gnus.
+* Starting Up::                 Finding news can be a pain.
+* Group Buffer::                Selecting, subscribing and killing groups.
+* Summary Buffer::              Reading, saving and posting articles.
+* Article Buffer::              Displaying and handling articles.
+* Composing Messages::          Information on sending mail and news.
+* Select Methods::              Gnus reads all messages from various select methods.
+* Scoring::                     Assigning values to articles.
+* Searching::                   Mail and News search engines.
+* Various::                     General purpose settings.
+* The End::                     Farewell and goodbye.
+* Appendices::                  Terminology, Emacs intro, @acronym{FAQ}, History, Internals.
+* GNU Free Documentation License::  The license for this documentation.
+* Index::                       Variable, function and concept index.
+* Key Index::                   Key Index.
 
 @c Doesn't work right in html.
 @c FIXME Do this in a more standard way.
@@ -596,7 +596,8 @@ Top
 * Article Buttons::             Click on URLs, Message-IDs, addresses and the like.
 * Article Button Levels::       Controlling appearance of buttons.
 * Article Date::                Grumble, UT!
-* Article Display::             Display various stuff---X-Face, Picons, Smileys, Gravatars
+* Article Display::             Display various stuff:
+                                X-Face, Picons, Gravatars, Smileys.
 * Article Signature::           What is a signature?
 * Article Miscellanea::         Various other stuff.
 
@@ -641,7 +642,7 @@ Top
 * Getting Mail::                Reading your personal mail with Gnus.
 * Browsing the Web::            Getting messages from a plethora of Web sources.
 * Other Sources::               Reading directories, files.
-* Virtual Groups::              Combining articles from multiple sources.
+* Virtual Groups::              Combining articles and groups together.
 * Email Based Diary::           Using mails to manage diary events in Gnus.
 * Gnus Unplugged::              Reading news and mail offline.
 
@@ -666,6 +667,13 @@ Top
 * Indirect Functions::          Connecting indirectly to the server.
 * Common Variables::            Understood by several connection functions.
 
+Using IMAP
+
+* Connecting to an IMAP Server::  Getting started with @acronym{IMAP}.
+* Customizing the IMAP Connection::  Variables for @acronym{IMAP} connection.
+* Client-Side IMAP Splitting::  Put mail in the correct mail box.
+* Support for IMAP Extensions::  Getting extensions and labels from servers.
+
 Getting Mail
 
 * Mail in a Newsreader::        Important introductory notes.
@@ -685,6 +693,7 @@ Top
 Mail Sources
 
 * Mail Source Specifiers::      How to specify what a mail source is.
+* Mail Source Functions::
 * Mail Source Customization::   Some variables that influence things.
 * Fetching Mail::               Using the mail source specifiers.
 
@@ -695,6 +704,10 @@ Top
 * Mail Spool::                  Store your mail in a private spool?
 * MH Spool::                    An mhspool-like back end.
 * Maildir::                     Another one-file-per-message format.
+* nnmaildir Group Parameters::
+* Article Identification::
+* NOV Data::
+* Article Marks::
 * Mail Folders::                Having one file for each group.
 * Comparing Mail Back Ends::    An in-depth looks at pros and cons.
 
@@ -734,10 +747,10 @@ Top
 
 The Gnus Diary Library
 
-* Diary Summary Line Format::           A nicer summary buffer line format.
-* Diary Articles Sorting::              A nicer way to sort messages.
-* Diary Headers Generation::            Not doing it manually.
-* Diary Group Parameters::              Not handling them manually.
+* Diary Summary Line Format::   A nicer summary buffer line format.
+* Diary Articles Sorting::      A nicer way to sort messages.
+* Diary Headers Generation::    Not doing it manually.
+* Diary Group Parameters::      Not handling them manually.
 
 Gnus Unplugged
 
@@ -796,9 +809,22 @@ Top
 Searching
 
 * Search Engines::              Selecting and configuring search engines.
-* Creating Search Groups::      Creating search groups.
+* Creating Search Groups::      How and where.
 * Search Queries::              Gnus' built-in search syntax.
 * nnmairix::                    Searching with Mairix.
+* nnir::
+
+nnmairix
+
+* About mairix::                About the mairix mail search engine
+* nnmairix requirements::       What you will need for using nnmairix
+* What nnmairix does::          What does nnmairix actually do?
+* Setting up mairix::           Set up your mairix installation
+* Configuring nnmairix::        Set up the nnmairix back end
+* nnmairix keyboard shortcuts::  List of available keyboard shortcuts
+* Propagating marks::           How to propagate marks from nnmairix groups
+* nnmairix tips and tricks::    Some tips, tricks and examples
+* nnmairix caveats::            Some more stuff you might want to know
 
 Various
 
@@ -839,8 +865,7 @@ Top
 
 * X-Face::                      Display a funky, teensy black-and-white image.
 * Face::                        Display a funkier, teensier colored image.
-* Smileys::                     Show all those happy faces the way they were
-                                  meant to be shown.
+* Smileys::                     Show all those happy faces the way they were meant to be shown.
 * Picons::                      How to display pictures of what you're reading.
 * Gravatars::                   Display the avatar of people you read.
 
@@ -862,12 +887,39 @@ Top
 * Extending the Spam package::
 * Spam Statistics Package::
 
+Spam Back Ends
+
+* Blacklists and Whitelists::
+* BBDB Whitelists::
+* Gmane Spam Reporting::
+* Anti-spam Hashcash Payments::
+* Blackholes::
+* Regular Expressions Header Matching::
+* Bogofilter::
+* SpamAssassin back end::
+* ifile spam filtering::
+* Spam Statistics Filtering::
+* SpamOracle::
+
 Spam Statistics Package
 
 * Creating a spam-stat dictionary::
 * Splitting mail using spam-stat::
 * Low-level interface to the spam-stat dictionary::
 
+The Gnus Registry
+
+* Gnus Registry Setup::
+* Registry Article Refer Method::
+* Fancy splitting to parent::
+* Store custom flags and keywords::
+* Store arbitrary data::
+
+The Gnus Cloud
+
+* Gnus Cloud Setup::
+* Gnus Cloud Usage::
+
 Appendices
 
 * History::                     How Gnus got where it is today.
@@ -895,7 +947,7 @@ Top
 * Quassia Gnus::                Two times two is four, or Gnus 5.6/5.7.
 * Pterodactyl Gnus::            Pentad also starts with P, AKA Gnus 5.8/5.9.
 * Oort Gnus::                   It's big.  It's far out.  Gnus 5.10/5.11.
-* No Gnus::                     Very punny.  Gnus 5.12/5.13
+* No Gnus::                     Very punny.  Gnus 5.12/5.13.
 * Ma Gnus::                     Celebrating 25 years of Gnus.
 
 Customization
@@ -1099,15 +1151,15 @@ Starting Up
 terminology section (@pxref{Terminology}).
 
 @menu
-* Finding the News::      Choosing a method for getting news.
-* The Server is Down::    How can I read my mail then?
-* Child Gnusae::          You can have more than one Gnus active at a time.
-* New Groups::            What is Gnus supposed to do with new groups?
-* Changing Servers::      You may want to move from one server to another.
-* Startup Files::         Those pesky startup files---@file{.newsrc}.
-* Auto Save::             Recovering from a crash.
-* The Active File::       Reading the active file over a slow line Takes Time.
-* Startup Variables::     Other variables you might change.
+* Finding the News::            Choosing a method for getting news.
+* The Server is Down::          How can I read my mail then?
+* Child Gnusae::                You can have more than one Gnus active at a time.
+* New Groups::                  What is Gnus supposed to do with new groups?
+* Changing Servers::            You may want to move from one server to another.
+* Startup Files::               Those pesky startup files---@file{.newsrc}.
+* Auto Save::                   Recovering from a crash.
+* The Active File::             Reading the active file over a slow line Takes Time.
+* Startup Variables::           Other variables you might change.
 @end menu
 
 
@@ -8718,7 +8770,7 @@ Article Treatment
 
 @menu
 * Article Highlighting::        You want to make the article look like fruit salad.
-* Article Fontifying::         Making emphasized text look nice.
+* Article Fontifying::          Making emphasized text look nice.
 * Article Hiding::              You also want to make certain info go away.
 * Article Washing::             Lots of way-neat functions to make life better.
 * Article Header::              Doing various header transformations.
@@ -18399,10 +18451,10 @@ The Gnus Diary Library
 
 
 @menu
-* Diary Summary Line Format::           A nicer summary buffer line format.
-* Diary Articles Sorting::              A nicer way to sort messages.
-* Diary Headers Generation::            Not doing it manually.
-* Diary Group Parameters::              Not handling them manually.
+* Diary Summary Line Format::   A nicer summary buffer line format.
+* Diary Articles Sorting::      A nicer way to sort messages.
+* Diary Headers Generation::    Not doing it manually.
+* Diary Group Parameters::      Not handling them manually.
 @end menu
 
 @node Diary Summary Line Format
@@ -21579,10 +21631,11 @@ Searching
 details on Gnus' query language, see @ref{Search Queries}.
 
 @menu
-* Search Engines::             Selecting and configuring search engines.
-* Creating Search Groups::     How and where.
-* Search Queries::             Gnus' built-in search syntax.
-* nnmairix::                   Searching with Mairix.
+* Search Engines::              Selecting and configuring search engines.
+* Creating Search Groups::      How and where.
+* Search Queries::              Gnus' built-in search syntax.
+* nnmairix::                    Searching with Mairix.
+* nnir::
 @end menu
 
 @node Search Engines
@@ -21878,7 +21931,7 @@ nnmairix
 * What nnmairix does::          What does nnmairix actually do?
 * Setting up mairix::           Set up your mairix installation
 * Configuring nnmairix::        Set up the nnmairix back end
-* nnmairix keyboard shortcuts:: List of available keyboard shortcuts
+* nnmairix keyboard shortcuts::  List of available keyboard shortcuts
 * Propagating marks::           How to propagate marks from nnmairix groups
 * nnmairix tips and tricks::    Some tips, tricks and examples
 * nnmairix caveats::            Some more stuff you might want to know

commit d901059281ffca45cbb49fed4feb59ab3609354a
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Tue Nov 22 02:10:59 2022 +0100

    Improve wording and markup in gnus-faq.texi
    
    * doc/misc/gnus-faq.texi (FAQ 2-4): Improve wording and markup.
    (FAQ 2-1, FAQ 2-4, FAQ 2-5, FAQ 3 - Getting Messages, FAQ 3-1)
    (FAQ 3-2, FAQ 3-2, FAQ 3-4, FAQ 4-1, FAQ 4-2, FAQ 4-3, FAQ 4-4)
    (FAQ 4-8, FAQ 4-9, FAQ 4-10, FAQ 4-12, FAQ 5-1, FAQ 5-2)
    (FAQ 5-7, FAQ 6-1, FAQ 6-2, FAQ 6-2, FAQ 6-3, FAQ 6-4, FAQ 6-5)
    (FAQ 7-2, FAQ 7-3, FAQ 7-3, FAQ 7-4, FAQ 8-1, FAQ 8-5, FAQ 9-1):
    Improve markup and reflow some paragraphs.

diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi
index 167a525ce8..49022ac341 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -144,9 +144,8 @@ FAQ 2-1
 are now asked if you want to restore that information
 from the auto-save file.
 
-To prevent this message make sure you exit Gnus
-via @samp{q} in group buffer instead of
-just killing Emacs.
+To prevent this message make sure you exit Gnus via @kbd{q} in group
+buffer instead of just killing Emacs.
 
 @node FAQ 2-2
 @subsubheading Question 2.2
@@ -180,25 +179,23 @@ FAQ 2-3
 @node FAQ 2-4
 @subsubheading Question 2.4
 
-My group buffer becomes a bit crowded, is there a way to
-sort my groups into categories so I can easier browse
-through them?
+My group buffer is a bit crowded.  Is there a way to sort groups into
+categories so I can browse them more easily?
 
 @subsubheading Answer
 
-Gnus offers the topic mode, it allows you to sort your
-groups in, well, topics, e.g., all groups dealing with
-Linux under the topic linux, all dealing with music under
-the topic music and all dealing with Scottish music under
-the topic scottish which is a subtopic of music.
+Gnus offers the topic mode, it allows you to sort your groups in,
+well, topics.  For example, all groups dealing with Linux under the
+topic @samp{linux}, all dealing with music under the topic
+@samp{music} and all dealing with Scottish music under the topic
+@samp{scottish} which is a subtopic of @samp{music}.
 
-To enter topic mode, just hit t while in Group buffer.  Now
-you can use @samp{T n} to create a topic
-at point and @samp{T m} to move a group to
-a specific topic.  For more commands see the manual or the
-menu.  You might want to include the %P specifier at the
-beginning of your gnus-group-line-format variable to have
-the groups nicely indented.
+To enter topic mode, just hit @kbd{t} while in Group buffer.  Now you
+can use @kbd{T n} to create a topic at point and @kbd{T m} to move a
+group to a specific topic.  For more commands see the manual or the
+menu.  You might want to include the @samp{%P} specifier at the
+beginning of your @var{gnus-group-line-format} variable to have the
+groups nicely indented.
 
 @node FAQ 2-5
 @subsubheading Question 2.5
@@ -208,16 +205,14 @@ FAQ 2-5
 
 @subsubheading Answer
 
-Move point over the group you want to move and
-hit @samp{C-k}, now move point to the
-place where you want the group to be and
-hit @samp{C-y}.
+Move point over the group you want to move and hit @kbd{C-k}, now move
+point to the place where you want the group to be and hit @kbd{C-y}.
 
 @node FAQ 3 - Getting Messages
 @subsection Getting Messages
 
 @menu
-* FAQ 3-1::     I just installed Gnus, started it via  @samp{M-x gnus}
+* FAQ 3-1::     I just installed Gnus, started it via  @kbd{M-x gnus}
                 but it only says "nntp (news) open error", what to do?
 * FAQ 3-2::     I'm working under Windows and have no idea what
                 ~/.gnus.el means.
@@ -242,9 +237,8 @@ FAQ 3 - Getting Messages
 @node FAQ 3-1
 @subsubheading Question 3.1
 
-I just installed Gnus, started it via
-@samp{M-x gnus}
-but it only says "nntp (news) open error", what to do?
+I just installed Gnus, started it via @kbd{M-x gnus} but it only says
+"nntp (news) open error", what to do?
 
 @subsubheading Answer
 
@@ -270,7 +264,7 @@ FAQ 3-2
 for the configuration files.  However, you don't really
 need to know what this means, it suffices that Emacs knows
 what it means :-) You can type
-@samp{C-x C-f ~/.gnus.el @key{RET}}
+@kbd{C-x C-f ~/.gnus.el @key{RET}}
 (yes, with the forward slash, even on Windows), and
 Emacs will open the right file for you.  (It will most
 likely be new, and thus empty.)
@@ -295,7 +289,7 @@ FAQ 3-2
 name HOME and value C:\myhome.  Rebooting is not necessary.
 
 Now to create @file{~/.gnus.el}, say
-@samp{C-x C-f ~/.gnus.el @key{RET} C-x C-s}.
+@kbd{C-x C-f ~/.gnus.el @key{RET} C-x C-s}.
 in Emacs.
 
 @node FAQ 3-3
@@ -331,14 +325,12 @@ FAQ 3-4
 
 @subsubheading Answer
 
-If you know the name of the group say @samp{U
-name.of.group @key{RET}} in group buffer (use the
-tab-completion Luke).  Otherwise hit ^ in group buffer,
-this brings you to the server buffer.  Now place point (the
-cursor) over the server which carries the group you want,
-hit @samp{@key{RET}}, move point to the group
-you want to subscribe to and say @samp{u}
-to subscribe to it.
+If you know the name of the group say @kbd{U name.of.group @key{RET}}
+in group buffer (use the tab-completion Luke).  Otherwise hit @kbd{^}
+in group buffer, this brings you to the server buffer.  Now place
+point (the cursor) over the server which carries the group you want,
+hit @kbd{RET}, move point to the group you want to subscribe to and
+say @kbd{u} to subscribe to it.
 
 @node FAQ 3-5
 @subsubheading Question 3.5
@@ -625,12 +617,10 @@ FAQ 4-1
 
 @subsubheading Answer
 
-If you enter the group by saying
-@samp{@key{RET}}
-in group buffer with point over the group, only unread and ticked messages are loaded.  Say
-@samp{C-u @key{RET}}
-instead to load all available messages.  If you want only the 300 newest say
-@samp{C-u 300 @key{RET}}
+If you enter the group by saying @kbd{@key{RET}} in group buffer with
+point over the group, only unread and ticked messages are loaded.  Say
+@kbd{C-u @key{RET}} instead to load all available messages.  If you
+want only the 300 newest say @kbd{C-u 300 @key{RET}}
 
 Loading only unread messages can be annoying if you have threaded view enabled, say
 
@@ -643,12 +633,12 @@ FAQ 4-1
 all articles (Warning: Both settings enlarge the amount of data which is
 fetched when you enter a group and slow down the process of entering a group).
 
-You can say @samp{/o N} in the summary buffer to load the last N
+You can say @kbd{/o N} in the summary buffer to load the last N
 messages.
 
 If you don't want all old messages, but the parent of the message you're just reading,
-you can say @samp{^}, if you want to retrieve the whole thread
-the message you're just reading belongs to, @samp{A T} is your friend.
+you can say @kbd{^}, if you want to retrieve the whole thread
+the message you're just reading belongs to, @kbd{A T} is your friend.
 
 @node FAQ 4-2
 @subsubheading Question 4.2
@@ -659,10 +649,10 @@ FAQ 4-2
 @subsubheading Answer
 
 You can tick important messages.  To do this hit
-@samp{u} while point is in summary buffer
+@kbd{u} while point is in summary buffer
 over the message.  When you want to remove the mark, hit
-either @samp{d} (this deletes the tick
-mark and set's unread mark) or @samp{M c}
+either @kbd{d} (this deletes the tick
+mark and set's unread mark) or @kbd{M c}
 (which deletes all marks for the message).
 
 @node FAQ 4-3
@@ -672,10 +662,7 @@ FAQ 4-3
 
 @subsubheading Answer
 
-Say @samp{t}
-to show all headers, one more
-@samp{t}
-hides them again.
+Say @kbd{t} to show all headers, one more @kbd{t} hides them again.
 
 @node FAQ 4-4
 @subsubheading Question 4.4
@@ -684,11 +671,8 @@ FAQ 4-4
 
 @subsubheading Answer
 
-Say
-@samp{C-u g}
-to show the raw message
-@samp{g}
-returns to normal view.
+Type @kbd{C-u g} to show the raw message @kbd{g} returns to normal
+view.
 
 @node FAQ 4-5
 @subsubheading Question 4.5
@@ -765,11 +749,11 @@ FAQ 4-8
 Gnus offers you several functions to ``wash'' incoming mail, you can
 find them if you browse through the menu, item
 Article->Washing.  The most interesting ones are probably ``Wrap
-long lines'' (@samp{W w}), ``Decode ROT13''
-(@samp{W r}) and ``Outlook Deuglify'' which repairs
+long lines'' (@kbd{W w}), ``Decode ROT13''
+(@kbd{W r}) and ``Outlook Deuglify'' which repairs
 the dumb quoting used by many users of Microsoft products
-(@samp{W Y f} gives you full deuglify.
-See @samp{W Y C-h} or have a look at the menus for
+(@kbd{W Y f} gives you full deuglify.
+See @kbd{W Y C-h} or have a look at the menus for
 other deuglifications).
 
 @node FAQ 4-9
@@ -792,21 +776,21 @@ FAQ 4-9
 up rules based on the article you are just reading.  Say you're
 reading a message by a guy who always writes nonsense and you want
 to ignore his messages in the future.  Hit
-@samp{L}, to set up a rule which lowers the score.
+@kbd{L}, to set up a rule which lowers the score.
 Now Gnus asks you which the criteria for lowering the Score shall
-be.  Hit @samp{?} twice to see all possibilities,
-we want @samp{a} which means the author (the from
+be.  Hit @kbd{?} twice to see all possibilities,
+we want @kbd{a} which means the author (the from
 header).  Now Gnus wants to know which kind of matching we want.
-Hit either @samp{e} for an exact match or
-@samp{s} for substring-match and delete afterwards
+Hit either @kbd{e} for an exact match or
+@kbd{s} for substring-match and delete afterwards
 everything but the name to score down all authors with the given
 name no matter which email address is used.  Now you need to tell
 Gnus when to apply the rule and how long it should last, hit
-@samp{p} to apply the rule now and let it last
+@kbd{p} to apply the rule now and let it last
 forever.  If you want to raise the score instead of lowering it say
-@samp{I} instead of @samp{L}.
+@kbd{I} instead of @kbd{L}.
 
-You can also set up rules by hand.  To do this say @samp{V
+You can also set up rules by hand.  To do this say @kbd{V
 f} in summary buffer.  Then you are asked for the name
 of the score file, it's name.of.group.SCORE for rules valid in
 only one group or all.Score for rules valid in all groups.  See the
@@ -851,7 +835,7 @@ FAQ 4-10
 @subsubheading Answer
 
 While in group buffer move point over the group and hit
-@samp{G c}, this opens a buffer where you
+@kbd{G c}, this opens a buffer where you
 can set options for the group.  At the bottom of the buffer
 you'll find an item that allows you to set variables
 locally for the group.  To disable threading enter
@@ -889,10 +873,10 @@ FAQ 4-12
 lowest-article-number = total-number-of-articles''.  This
 works OK for Usenet groups, but if you delete and move
 many messages in mail groups, this fails.  To cure the
-symptom, enter the group via @samp{C-u @key{RET}}
+symptom, enter the group via @kbd{C-u @key{RET}}
 (this makes Gnus get all messages), then
-hit @samp{M P b} to mark all messages and
-then say @samp{B m name.of.group} to move
+hit @kbd{M P b} to mark all messages and
+then say @kbd{B m name.of.group} to move
 all messages to the group they have been in before, they
 get new message numbers in this process and the count is
 right again (until you delete and move your mail to other
@@ -1110,28 +1094,20 @@ FAQ 5-1
 
 @subsubheading Answer
 
-To start composing a new mail hit @samp{m}
-either in Group or Summary buffer, for a posting, it's
-either @samp{a} in Group buffer and
-filling the Newsgroups header manually
-or @samp{a} in the Summary buffer of the
-group where the posting shall be send to.  Replying by mail
-is
-@samp{r} if you don't want to cite the
-author, or import the cited text manually and
-@samp{R} to cite the text of the original
-message.  For a follow up to a newsgroup, it's
-@samp{f} and @samp{F}
-(analogously to @samp{r} and
-@samp{R}).
-
-Enter new headers above the line saying "--text follows
-this line--", enter the text below the line.  When ready
-hit @samp{C-c C-c}, to send the message,
-if you want to finish it later hit @samp{C-c
-C-d} to save it in the drafts group, where you
-can start editing it again by saying @samp{D
-e}.
+To start composing a new mail hit @kbd{m} either in Group or Summary
+buffer, for a posting, it's either @kbd{a} in Group buffer and filling
+the Newsgroups header manually or @kbd{a} in the Summary buffer of the
+group where the posting shall be send to.  Replying by mail is @kbd{r}
+if you don't want to cite the author, or import the cited text
+manually and @kbd{R} to cite the text of the original message.  For a
+follow up to a newsgroup, it's @kbd{f} and @kbd{F} (analogously to
+@kbd{r} and @kbd{R}).
+
+Enter new headers above the line saying "--text follows this line--",
+enter the text below the line.  When ready hit @kbd{C-c C-c}, to send
+the message, if you want to finish it later hit @kbd{C-c C-d} to save
+it in the drafts group, where you can start editing it again by saying
+@kbd{D e}.
 
 @node FAQ 5-2
 @subsubheading Question 5.2
@@ -1156,8 +1132,7 @@ FAQ 5-2
 
 in @file{~/.gnus.el}.
 
-You can reformat a paragraph by hitting @samp{M-q}
-(as usual).
+You can reformat a paragraph by hitting @kbd{M-q} (as usual).
 
 @node FAQ 5-3
 @subsubheading Question 5.3
@@ -1358,16 +1333,13 @@ FAQ 5-7
 @end example
 @noindent
 
-Now you should be ready to go.  Say @samp{M-x bbdb @key{RET}
-@key{RET}} to open a bbdb buffer showing all
-entries.  Say @samp{c} to create a new
-entry, @samp{b} to search your BBDB and
-@samp{C-o} to add a new field to an
-entry.  If you want to add a sender to the BBDB you can
-also just hit @kbd{:} on the posting in the summary buffer and
-you are done.  When you now compose a new mail,
-hit @samp{TAB} to cycle through know
-recipients.
+Now you should be ready to go.  Say @kbd{M-x bbdb @key{RET} @key{RET}}
+to open a bbdb buffer showing all entries.  Say @kbd{c} to create a
+new entry, @kbd{b} to search your BBDB and @kbd{C-o} to add a new
+field to an entry.  If you want to add a sender to the BBDB you can
+also just hit @kbd{:} on the posting in the summary buffer and you are
+done.  When you now compose a new mail, hit @kbd{TAB} to cycle through
+know recipients.
 
 @node FAQ 5-8
 @subsubheading Question 5.8
@@ -1576,17 +1548,17 @@ FAQ 6-1
 
 Now you've got to import this mbox file into Gnus.  To do
 this, create a nndoc group based on the mbox file by
-saying @samp{G f /path/file.mbox @key{RET}} in
+saying @kbd{G f /path/file.mbox @key{RET}} in
 Group buffer.  You now have read-only access to your
 mail.  If you want to import the messages to your normal
 Gnus mail groups hierarchy, enter the nndoc group you've
-just created by saying @samp{C-u @key{RET}}
+just created by saying @kbd{C-u @key{RET}}
 (thus making sure all messages are retrieved), mark all
-messages by saying @samp{M P b} and
+messages by saying @kbd{M P b} and
 either copy them to the desired group by saying
-@samp{B c name.of.group @key{RET}} or send them
+@kbd{B c name.of.group @key{RET}} or send them
 through nnmail-split-methods (respool them) by saying
-@samp{B r}.
+@kbd{B r}.
 
 @node FAQ 6-2
 @subsubheading Question 6.2
@@ -1598,7 +1570,7 @@ FAQ 6-2
 If you stumble across an interesting message, say in
 gnu.emacs.gnus and want to archive it there are several
 solutions.  The first and easiest is to save it to a file
-by saying @samp{O f}.  However, wouldn't
+by saying @kbd{O f}.  However, wouldn't
 it be much more convenient to have more direct access to
 the archived message from Gnus? If you say yes, put this
 snippet by Frank Haun <pille3003@@fhaun.de> in
@@ -1621,10 +1593,9 @@ FAQ 6-2
 @end example
 @noindent
 
-You can now say @samp{M-x
-my-archive-article} in summary buffer to
-archive the article under the cursor in a nnml
-group. (Change nnml to your preferred back end.)
+You can now say @kbd{M-x my-archive-article} in summary buffer to
+archive the article under the cursor in a nnml group. (Change nnml to
+your preferred back end.)
 
 Of course you can also make sure the cache is enabled by saying
 
@@ -1644,26 +1615,20 @@ FAQ 6-3
 
 @subsubheading Answer
 
-There are several ways for this, too.  For a posting from
-a Usenet group the easiest solution is probably to ask
-@uref{https://groups.google.com, groups.google.com},
-if you found the posting there, tell Google to display
-the raw message, look for the message-id, and say
-@samp{M-^ the@@message.id @key{RET}} in a
-summary buffer.
-There's a Gnus interface for
-groups.google.com which you can call with
-@samp{G W}) in group buffer.
-
-Another idea which works for both mail and news groups
-is to enter the group where the message you are
-searching is and use the standard Emacs search
-@samp{C-s}, it's smart enough to look at
-articles in collapsed threads, too.  If you want to
-search bodies, too try @samp{M-s}
-instead.  Further on there are the
-gnus-summary-limit-to-foo functions, which can help you,
-too.
+There are several ways for this, too.  For a posting from a Usenet
+group the easiest solution is probably to ask
+@uref{https://groups.google.com, groups.google.com}, if you found the
+posting there, tell Google to display the raw message, look for the
+message-id, and say @kbd{M-^ the@@message.id @key{RET}} in a summary
+buffer.  There's a Gnus interface for @samp{groups.google.com} which
+you can call with @kbd{G W}) in group buffer.
+
+Another idea which works for both mail and news groups is to enter the
+group where the message you are searching is and use the standard
+Emacs search @kbd{C-s}, it's smart enough to look at articles in
+collapsed threads, too.  If you want to search bodies, too try
+@kbd{M-s} instead.  Further on there are the gnus-summary-limit-to-foo
+functions, which can help you, too.
 
 @node FAQ 6-4
 @subsubheading Question 6.4
@@ -1673,18 +1638,18 @@ FAQ 6-4
 @subsubheading Answer
 
 You can of course just mark the mail you don't need
-anymore by saying @samp{#} with point
-over the mail and then say @samp{B @key{DEL}}
+anymore by saying @kbd{#} with point
+over the mail and then say @kbd{B @key{DEL}}
 to get rid of them forever.  You could also instead of
 actually deleting them, send them to a junk-group by
-saying @samp{B m nnml:trash-bin} which
+saying @kbd{B m nnml:trash-bin} which
 you clear from time to time, but both are not the intended
 way in Gnus.
 
 In Gnus, we let mail expire like news expires on a news
 server.  That means you tell Gnus the message is
 expirable (you tell Gnus "I don't need this mail
-anymore") by saying @samp{E} with point
+anymore") by saying @kbd{E} with point
 over the mail in summary buffer.  Now when you leave the
 group, Gnus looks at all messages which you marked as
 expirable before and if they are old enough (default is
@@ -1703,13 +1668,13 @@ FAQ 6-5
 got two choices: auto-expire and
 total-expire.  Auto-expire means, that every article
 which has no marks set and is selected for reading is
-marked as expirable, Gnus hits @samp{E}
+marked as expirable, Gnus hits @kbd{E}
 for you every time you read a message.  Total-expire
 follows a slightly different approach, here all article
 where the read mark is set are expirable.
 
 To activate auto-expire, include auto-expire in the
-Group parameters for the group. (Hit @samp{G
+Group parameters for the group. (Hit @kbd{G
 c} in summary buffer with point over the
 group to change group parameters).  For total-expire add
 total-expire to the group-parameters.
@@ -1721,10 +1686,10 @@ FAQ 6-5
 
 If you want a message to be excluded from expiration in
 a group where total or auto expire is active, set either
-tick (hit @samp{u}) or dormant mark (hit
-@samp{u}), when you use auto-expire, you
+tick (hit @kbd{u}) or dormant mark (hit
+@kbd{u}), when you use auto-expire, you
 can also set the read mark (hit
-@samp{d}).
+@kbd{d}).
 
 @node FAQ 6-6
 @subsubheading Question 6.6
@@ -1817,12 +1782,12 @@ FAQ 7-2
 
 You've got to select the servers whose groups can be
 stored locally.  To do this, open the server buffer
-(that is press @samp{^} while in the
+(that is press @kbd{^} while in the
 group buffer).  Now select a server by moving point to
 the line naming that server.  Finally, agentize the
-server by typing @samp{J a}.  If you
+server by typing @kbd{J a}.  If you
 make a mistake, or change your mind, you can undo this
-action by typing @samp{J r}.  When
+action by typing @kbd{J r}.  When
 you're done, type 'q' to return to the group buffer.
 Now the next time you enter a group on an agentized
 server, the headers will be stored on disk and read from
@@ -1838,7 +1803,7 @@ FAQ 7-3
 You can tell the agent to automatically fetch the bodies
 of articles which fulfill certain predicates, this is
 done in a special buffer which can be reached by
-saying @samp{J c} in group
+saying @kbd{J c} in group
 buffer.  Please refer to the documentation for
 information which predicates are possible and how
 exactly to do it.
@@ -1847,12 +1812,12 @@ FAQ 7-3
 articles to store on disk.  There are two ways to do
 this: Number one: In the summary buffer, process mark a
 set of articles that shall be stored in the agent by
-saying @samp{#} with point over the
-article and then type @samp{J s}.  The
+saying @kbd{#} with point over the
+article and then type @kbd{J s}.  The
 other possibility is to set, again in the summary
 buffer, downloadable (%) marks for the articles you
-want by typing @samp{@@} with point over
-the article and then typing @samp{J u}.
+want by typing @kbd{@@} with point over
+the article and then typing @kbd{J u}.
 What's the difference? Well, process marks are erased as
 soon as you exit the summary buffer while downloadable
 marks are permanent.  You can actually set downloadable
@@ -1874,10 +1839,10 @@ FAQ 7-4
 All you've got to do is to tell Gnus when you are online
 (plugged) and when you are offline (unplugged), the rest
 works automatically.  You can toggle plugged/unplugged
-state by saying @samp{J j} in group
-buffer.  To start Gnus unplugged say @samp{M-x
+state by saying @kbd{J j} in group
+buffer.  To start Gnus unplugged say @kbd{M-x
 gnus-unplugged} instead of
-@samp{M-x gnus}.  Note that for this to
+@kbd{M-x gnus}.  Note that for this to
 work, the agent must be active.
 
 @node FAQ 8 - Getting help
@@ -1901,14 +1866,14 @@ FAQ 8-1
 @subsubheading Answer
 
 The first stop should be the Gnus manual (Say
-@samp{C-h i d m Gnus @key{RET}} to start the
+@kbd{C-h i d m Gnus @key{RET}} to start the
 Gnus manual, then walk through the menus or do a
-full-text search with @samp{s}).  Then
+full-text search with @kbd{s}).  Then
 there are the general Emacs help commands starting with
-C-h, type @samp{C-h ? ?} to get a list
+@kbd{C-h}, type @kbd{C-h ? ?} to get a list
 of all available help commands and their meaning.  Finally
-@samp{M-x apropos-command} lets you
-search through all available functions and @samp{M-x
+@kbd{M-x apropos-command} lets you
+search through all available functions and @kbd{M-x
 apropos} searches the bound variables.
 
 @node FAQ 8-2
@@ -1963,7 +1928,7 @@ FAQ 8-5
 
 @subsubheading Answer
 
-Say @samp{M-x gnus-bug}, this will start
+Say @kbd{M-x gnus-bug}, this will start
 a message to the
 @email{bugs@@gnus.org, gnus bug mailing list}
 including information about your environment which make
@@ -1998,7 +1963,7 @@ FAQ 9-1
 active file, see the node "The Active File" in the Gnus
 manual for things you might try to speed the process up.
 An other idea would be to byte compile your @file{~/.gnus.el} (say
-@samp{M-x byte-compile-file @key{RET} ~/.gnus.el
+@kbd{M-x byte-compile-file @key{RET} ~/.gnus.el
 @key{RET}} to do it).  Finally, if you have require
 statements in your .gnus, you could replace them with
 @code{with-eval-after-load}, which loads the stuff not at startup

commit 40539c7587dc474b424cff732973fe8958eadf14
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Mon Nov 21 15:39:43 2022 +0100

    ; Fix typos

diff --git a/admin/notes/tree-sitter/build-module/README b/admin/notes/tree-sitter/build-module/README
index d205661e6c..2fcb9778da 100644
--- a/admin/notes/tree-sitter/build-module/README
+++ b/admin/notes/tree-sitter/build-module/README
@@ -14,4 +14,4 @@ To build all modules at once, run
 
 This gives you C, JSON, Go, HTML, Javascript, CSS, Python, Typescript
 (tsx), C# (csharp), C++ (cpp), Rust. More can be added to batch.sh
-unless it's directory strucure is not standard.
\ No newline at end of file
+unless it's directory structure is not standard.
\ No newline at end of file
diff --git a/admin/notes/tree-sitter/html-manual/Multiple-Languages.html b/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
index 0ae0b1897e..46985649a8 100644
--- a/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
+++ b/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
@@ -277,7 +277,7 @@
 pairs.  Each <var>query</var> is a tree-sitter query in either the
 string, s-expression or compiled form, or a function.
 </p>
-<p>If <var>query</var> is a tree-sitter query, it should be preceeded by two
+<p>If <var>query</var> is a tree-sitter query, it should be preceded by two
 <var>:keyword</var>/<var>value</var> pairs, where the <code>:embed</code> keyword
 specifies the embedded language, and the <code>:host</code> keyword
 specified the host language.
diff --git a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html
index 3027bbaae9..95005de6d1 100644
--- a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html
+++ b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html
@@ -223,7 +223,7 @@
 <dt id='index-prev_002dline'><span><code>prev-line</code><a href='#index-prev_002dline' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This anchor is a function that is called with 3 arguments: <var>node</var>,
 <var>parent</var>, and <var>bol</var>, and returns the first non-whitespace
-charater on the previous line.
+character on the previous line.
 </p>
 </dd>
 <dt id='index-point_002dmin'><span><code>point-min</code><a href='#index-point_002dmin' class='copiable-anchor'> &para;</a></span></dt>
diff --git a/admin/notes/tree-sitter/starter-guide b/admin/notes/tree-sitter/starter-guide
index 700b020850..faf40bc64f 100644
--- a/admin/notes/tree-sitter/starter-guide
+++ b/admin/notes/tree-sitter/starter-guide
@@ -1,4 +1,4 @@
-STARTER GUIDE ON WRITTING MAJOR MODE WITH TREE-SITTER -*- org -*-
+STARTER GUIDE ON WRITING MAJOR MODE WITH TREE-SITTER -*- org -*-
 
 This document guides you on adding tree-sitter support to a major
 mode.
@@ -274,7 +274,7 @@ the anchor point. Below are some convenient builtin matchers and anchors.
 For MATHCER we have
 
     (parent-is TYPE) => matches if PARENT’s type matches TYPE as regexp
-    (node-is TYPE) => mathces NODE’s type
+    (node-is TYPE) => matches NODE’s type
     (query QUERY) => matches if querying PARENT with QUERY
                      captures NODE.
 
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index b334105f1e..c472f9b441 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -5000,7 +5000,7 @@ Parser-based Indentation
 @item prev-line
 This anchor is a function that is called with 3 arguments: @var{node},
 @var{parent}, and @var{bol}, and returns the first non-whitespace
-charater on the previous line.
+character on the previous line.
 
 @item point-min
 This anchor is a function that is called with 3 arguments: @var{node},
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index f21d94ec8b..0f6a99b299 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -1611,7 +1611,7 @@ Multiple Languages
 pairs.  Each @var{query} is a tree-sitter query in either the
 string, s-expression or compiled form, or a function.
 
-If @var{query} is a tree-sitter query, it should be preceeded by two
+If @var{query} is a tree-sitter query, it should be preceded by two
 @var{:keyword}/@var{value} pairs, where the @code{:embed} keyword
 specifies the embedded language, and the @code{:host} keyword
 specified the host language.
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi
index bade04fb95..a8f5248c4c 100644
--- a/doc/misc/cc-mode.texi
+++ b/doc/misc/cc-mode.texi
@@ -898,7 +898,7 @@ Movement Commands
 @vindex defun-tactic @r{(c-)}
 
 Move to the beginning or end of the current or next function.  Other
-constructs (such as a structs or classes) which have a brace block
+constructs (such as structs or classes) which have a brace block
 also count as ``functions'' here.  To move over several functions, you
 can give these commands a repeat count.
 
diff --git a/doc/misc/edt.texi b/doc/misc/edt.texi
index 8b4ac0da5d..d6f9c9faf9 100644
--- a/doc/misc/edt.texi
+++ b/doc/misc/edt.texi
@@ -317,7 +317,7 @@ Starting emulation
 Emacs binds keys to @acronym{ASCII} control characters and so does the
 real EDT@.  Where EDT key bindings and Emacs key bindings conflict,
 the default Emacs key bindings are retained by the EDT emulation by
-default.  If you are a diehard EDT user you may not like this.  The
+default.  If you are a die-hard EDT user you may not like this.  The
 @ref{Control keys} section explains how to change this so that the EDT
 bindings to @acronym{ASCII} control characters override the default
 Emacs bindings.
@@ -443,7 +443,7 @@ GNU/Linux
 of the @key{PF1} key.  The PC keypad can now emulate an LK-201 keypad
 (less the comma key), the standard keyboard supplied with DEC terminals
 VT-200 and above.  This @file{.xmodmaprc} file switches the role of the
-@key{F12} and @key{NumLock} keys.  It has been tested on RedHat
+@key{F12} and @key{NumLock} keys.  It has been tested on Red Hat
 GNU/Linux 5.2.  Other versions of GNU/Linux may require different
 keycodes.  (@ref{Unix} for further help on how to do this.)
 
@@ -460,7 +460,7 @@ Unix
 needed to see how to do this on a particular system.
 
 You will need to look at the output generated by @code{xmodmap} invoked
-with the "-pm" switch.  For example, on RedHat GNU/Linux 5.2 on a PC, we
+with the "-pm" switch.  For example, on Red Hat GNU/Linux 5.2 on a PC, we
 get the following output when running @samp{xmodmap -pm}:
 
 @example
@@ -495,7 +495,7 @@ Unix
    .
 @end example
 
-@noindent So, in RedHat GNU/Linux 5.2 on a PC, Num_Lock generates keycode 77.
+@noindent So, in Red Hat GNU/Linux 5.2 on a PC, Num_Lock generates keycode 77.
 The following steps are taken:
 
 @enumerate
@@ -883,7 +883,7 @@ Words
 (setq edt-word-entities '(?\t)        ; specifies TAB, the default
 @end example
 
-@noindent You can also specify characters by their decimal ascii values:
+@noindent You can also specify characters by their decimal ASCII values:
 
 @example
 (setq edt-word-entities '(9 45 47))   ; specifies TAB, - , and /
@@ -893,7 +893,7 @@ Control keys
 @section Enabling EDT Control Key Sequence Bindings
 
 Where EDT key bindings and Emacs key bindings conflict, the default
-Emacs key bindings are retained by default.  Some diehard EDT users
+Emacs key bindings are retained by default.  Some die-hard EDT users
 may not like this.  So, if the variable
 @code{edt-use-EDT-control-key-bindings} is set to true in a user's
 @file{.emacs} file, then the default EDT Emulation mode will enable most
diff --git a/doc/misc/efaq-w32.texi b/doc/misc/efaq-w32.texi
index b58f6be758..bc3f545b2b 100644
--- a/doc/misc/efaq-w32.texi
+++ b/doc/misc/efaq-w32.texi
@@ -457,12 +457,12 @@ Associate files with Emacs
 @node Using with Explorer
 @subsection For use with Internet Explorer
 @cindex Internet Explorer, view source in Emacs
-@cindex mailto urls, associating with Emacs
-@cindex news urls, associating with Emacs
+@cindex mailto URLs, associating with Emacs
+@cindex news URLs, associating with Emacs
 @cindex URLs, associating mail and news URLs with Emacs
 
 You can use Emacs as the editor for composing mail for
-@indicateurl{mailto:} links, reading usenet for @indicateurl{news:}
+@indicateurl{mailto:} links, reading Usenet for @indicateurl{news:}
 links, and viewing source.  The following registry entries control
 this:
 
diff --git a/doc/misc/eglot.texi b/doc/misc/eglot.texi
index 04bdcc6161..a815aebf59 100644
--- a/doc/misc/eglot.texi
+++ b/doc/misc/eglot.texi
@@ -280,7 +280,7 @@ Setting Up LSP Servers
 
 Sometimes, multiple servers are acceptable alternatives for handling a
 given major-mode.  In those cases, you may combine the helper function
-@code{eglot-alternatives} with the funcional form of
+@code{eglot-alternatives} with the functional form of
 @code{eglot-server-programs}.
 
 @lisp
@@ -994,8 +994,8 @@ Customizing Eglot
 Here @code{:@var{server}} identifies a particular language server and
 @var{plist} is the corresponding keyword-value property list of one or
 more parameter settings for that server, serialized by Eglot as a JSON
-object.  @var{plist} may be arbitrarity complex, generally containing
-other keywork-value property sublists corresponding to JSON subobjects.
+object.  @var{plist} may be arbitrarily complex, generally containing
+other keyword-value property sublists corresponding to JSON subobjects.
 The JSON values @code{true}, @code{false}, @code{null} and @code{@{@}}
 are represented by the Lisp values @code{t}, @code{:json-false},
 @code{nil}, and @code{eglot-@{@}}, respectively.
diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi
index 1b9f5e1040..8c8a6f3154 100644
--- a/doc/misc/emacs-gnutls.texi
+++ b/doc/misc/emacs-gnutls.texi
@@ -132,7 +132,7 @@ Help For Users
 distributions.  By default the following locations are tried in this
 order: @file{/etc/ssl/certs/ca-certificates.crt} for Debian, Ubuntu,
 Gentoo and Arch Linux; @file{/etc/pki/tls/certs/ca-bundle.crt} for
-Fedora and RHEL; @file{/etc/ssl/ca-bundle.pem} for Suse;
+Fedora and RHEL; @file{/etc/ssl/ca-bundle.pem} for SUSE;
 @file{/usr/ssl/certs/ca-bundle.crt} for Cygwin;
 @file{/usr/local/share/certs/ca-root-nss.crt} for FreeBSD@.  You can
 easily customize @code{gnutls-trustfiles} to be something else, but
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi
index 7cb5621b69..167a525ce8 100644
--- a/doc/misc/gnus-faq.texi
+++ b/doc/misc/gnus-faq.texi
@@ -189,7 +189,7 @@ FAQ 2-4
 Gnus offers the topic mode, it allows you to sort your
 groups in, well, topics, e.g., all groups dealing with
 Linux under the topic linux, all dealing with music under
-the topic music and all dealing with scottish music under
+the topic music and all dealing with Scottish music under
 the topic scottish which is a subtopic of music.
 
 To enter topic mode, just hit t while in Group buffer.  Now
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index c4705928d3..1d522bf9ca 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -589,7 +589,7 @@ Top
 Article Treatment
 
 * Article Highlighting::        You want to make the article look like fruit salad.
-* Article Fontisizing::         Making emphasized text look nice.
+* Article Fontifying::          Making emphasized text look nice.
 * Article Hiding::              You also want to make certain info go away.
 * Article Washing::             Lots of way-neat functions to make life better.
 * Article Header::              Doing various header transformations.
@@ -1002,7 +1002,7 @@ Don't Panic
 Each server maintains a list of groups, and those groups contain
 articles.  Because Gnus presents a unified interface to a wide variety
 of servers, the vocabulary doesn't always quite line up (@pxref{FAQ
-- Glossary}, for a more complete glossary).  Thus a local maildir is
+- Glossary}, for a more complete glossary).  Thus a local Maildir is
 referred to as a ``server'' (@pxref{Finding the News}) the same as a
 Usenet or IMAP server is; ``groups'' (@pxref{Group Buffer}) might mean
 an NNTP group, IMAP folder, or local mail directory; and an
@@ -1039,7 +1039,7 @@ Don't Panic
 
 New mail has to come from somewhere.  Some servers, such as NNTP or
 IMAP, are themselves responsible for fetching newly-arrived articles.
-Others, such as maildir or mbox servers, only store articles and don't
+Others, such as Maildir or mbox servers, only store articles and don't
 fetch them from anywhere.
 
 In the latter case, Gnus provides for @code{mail sources}: places
@@ -8718,7 +8718,7 @@ Article Treatment
 
 @menu
 * Article Highlighting::        You want to make the article look like fruit salad.
-* Article Fontisizing::         Making emphasized text look nice.
+* Article Fontifying::         Making emphasized text look nice.
 * Article Hiding::              You also want to make certain info go away.
 * Article Washing::             Lots of way-neat functions to make life better.
 * Article Header::              Doing various header transformations.
@@ -8840,8 +8840,8 @@ Article Highlighting
 @xref{Customizing Articles}, for how to highlight articles automatically.
 
 
-@node Article Fontisizing
-@subsection Article Fontisizing
+@node Article Fontifying
+@subsection Article Fontifying
 @cindex emphasis
 @cindex article emphasis
 
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi
index 4bdbd5c219..0c59fdf738 100644
--- a/doc/misc/idlwave.texi
+++ b/doc/misc/idlwave.texi
@@ -3799,7 +3799,7 @@ HTML Help Browser Tips
 @code{idlwave-help-browser-function} inherits the browser configured
 in @code{browse-url-browser-function}.
 
-Note that the HTML files decompiled from the help sources contain
+Note that the HTML files recompiled from the help sources contain
 specific references to the @samp{Symbol} font, which by default is not
 permitted in normal encodings (it's invalid, technically).  Though it
 only impacts a few symbols, you can trick Mozilla-based browsers into
diff --git a/doc/misc/mairix-el.texi b/doc/misc/mairix-el.texi
index 3632c64bd4..28b86c43ac 100644
--- a/doc/misc/mairix-el.texi
+++ b/doc/misc/mairix-el.texi
@@ -70,7 +70,7 @@ About
 Mairix is a tool for indexing and searching words in locally stored
 mail.  It was written by Richard Curnow and is licensed under the
 GPL@.  Mairix comes with most popular GNU/Linux distributions, but it also
-runs under Windows (with cygwin), macOS and Solaris.  The website can
+runs under Windows (with Cygwin), macOS and Solaris.  The website can
 be found at
 @uref{http://www.rpcurnow.force9.co.uk/mairix/index.html}
 
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index cfad4f4e07..fb6e97f0d3 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -935,7 +935,7 @@ IDNA
 @section IDNA
 @cindex IDNA
 @cindex internationalized domain names
-@cindex non-ascii domain names
+@cindex non-ASCII domain names
 
 @acronym{IDNA} is a standard way to encode non-@acronym{ASCII} domain
 names into a readable @acronym{ASCII} string.  The details can be
diff --git a/etc/NEWS.24 b/etc/NEWS.24
index 8ef479ac0a..fab8a39b0e 100644
--- a/etc/NEWS.24
+++ b/etc/NEWS.24
@@ -951,7 +951,7 @@ Also the following files used by the now obsolete otodo-mode.el:
 
 *** the old version of todo-mode.el (renamed to otodo-mode.el).
 
-*** xesam.el (owing to the cancellation of the XESAM project).
+*** xesam.el (owing to the cancelation of the XESAM project).
 
 *** yow.el; use fortune.el or cookie1.el instead.
 
diff --git a/lib-src/ChangeLog.1 b/lib-src/ChangeLog.1
index 0829f50a56..1a9767661a 100644
--- a/lib-src/ChangeLog.1
+++ b/lib-src/ChangeLog.1
@@ -5643,7 +5643,7 @@
 1998-04-06  Andreas Schwab  <schwab@gnu.org>
 
 	Silence -Wimplicit:
-	* movemail.c: Move cancellations up.  Include <stdlib.h> if
+	* movemail.c: Move cancelations up.  Include <stdlib.h> if
 	available.
 	* fakemail.c (_XOPEN_SOURCE): Define for declaration of cuserid.
 	(parse_header): Explicitly declare return type.
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index 4cb10d2d55..469d0970f8 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -1888,7 +1888,7 @@
 	(uniquify-item-greaterp): Substitutes uniquify-item-lessp.
 	This is equivalent to what the old code did.
 	(uniquify-rationalize-a-list): Never recompute the proposed
-	name.  Sort the conflicting sublist before rationalising it: this
+	name.  Sort the conflicting sublist before rationalizing it: this
 	is equivalent to what the old code did, but one directory element
 	at a time, and only when necessary.
 	(uniquify-rationalize-conflicting-sublist): Recompute here the
diff --git a/lisp/gnus/ChangeLog.3 b/lisp/gnus/ChangeLog.3
index c55d6225e3..a1ad22fd62 100644
--- a/lisp/gnus/ChangeLog.3
+++ b/lisp/gnus/ChangeLog.3
@@ -1109,7 +1109,7 @@
 
 	* gnus-icalendar.el (gnus-icalendar-event:sync-to-org)
 	(gnus-icalendar-event:inline-org-buttons): Allow for appointment
-	cancellations to be synced to org if the original appt has an org
+	cancelations to be synced to org if the original appt has an org
 	outline.
 
 2013-11-13  Jan Tatarik  <jan.tatarik@gmail.com>
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 3bbd68bdcd..dca5b90089 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -7520,7 +7520,7 @@ message-is-yours-p
 ;;;###autoload
 (defun message-cancel-news (&optional arg)
   "Cancel an article you posted.
-If ARG, allow editing of the cancellation message."
+If ARG, allow editing of the cancelation message."
   (interactive "P")
   (unless (message-news-p)
     (error "This is not a news article; canceling is impossible"))
diff --git a/lisp/jsonrpc.el b/lisp/jsonrpc.el
index 90833e1c1d..1387fa3692 100644
--- a/lisp/jsonrpc.el
+++ b/lisp/jsonrpc.el
@@ -308,7 +308,7 @@ jsonrpc-request
                          (setq canceled t))
                        `(canceled ,cancel-on-input-retval))
                       (t (while t (accept-process-output nil 30)))))
-            ;; In normal operation, cancellation is handled by the
+            ;; In normal operation, cancelation is handled by the
             ;; timeout function and response filter, but we still have
             ;; to protect against user-quit (C-g) or the
             ;; `cancel-on-input' case.
diff --git a/lisp/treesit.el b/lisp/treesit.el
index b81396fc22..24f0e1472d 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -361,7 +361,7 @@ treesit-range-rules
   "Produce settings for `treesit-range-settings'.
 
 QUERY-SPECS are a series of QUERY-SPECs, where each QUERY-SPEC is
-a QUERY preceeded by zero or more pairs of :KEYWORD and VALUE,
+a QUERY preceded by zero or more pairs of :KEYWORD and VALUE,
 like this:
 
     :KEYWORD VALUE... QUERY
@@ -572,7 +572,7 @@ treesit-font-lock-rules
 or compiled form.  For each query, captured nodes are highlighted
 with the capture name as its face.
 
-:KEYWORD and VALUE pairs preceeding a QUERY add meta information
+:KEYWORD and VALUE pairs preceding a QUERY add meta information
 to QUERY.  For example,
 
     (treesit-font-lock-rules
@@ -742,7 +742,7 @@ treesit-fontify-with-override
 
 (defun treesit--set-nonsticky (start end sym &optional remove)
   "Set `rear-nonsticky' property between START and END.
-Set the proeprty to a list containing SYM.  If there is already a
+Set the property to a list containing SYM.  If there is already a
 list, add SYM to that list.  If REMOVE is non-nil, remove SYM
 instead."
   (let* ((prop (get-text-property start 'rear-nonsticky))
@@ -902,7 +902,7 @@ treesit--font-lock-notifier
   (with-current-buffer (treesit-parser-buffer parser)
     (dolist (range ranges)
       (when treesit--font-lock-verbose
-        (message "Notifier recieved range: %s-%s"
+        (message "Notifier received range: %s-%s"
                  (car range) (cdr range)))
       (put-text-property (car range) (cdr range) 'fontified nil))))
 
diff --git a/nt/icons/README b/nt/icons/README
index 4d9fb15e52..f84d4635b3 100644
--- a/nt/icons/README
+++ b/nt/icons/README
@@ -23,7 +23,7 @@ License: GNU General Public License version 3 or later (see COPYING)
   <http://users.adelphia.net/~rob.davenport/gnuicons.html>
   "These are some images of a 3D stylized gnu head that I created back
   in 1998. I started studying pictures of gnus and wildebeests and
-  worked with a 3D modeller, sPatch, until I came up with these. Then
+  worked with a 3D modeler, sPatch, until I came up with these. Then
   I worked to make them into icons - cropping the horns off the sides
   so the images were big enough to be recognizable (to me anyway)."
 
diff --git a/src/treesit.c b/src/treesit.c
index 91c26374b3..463e2458a6 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -295,7 +295,7 @@ #define ts_tree_root_node fn_ts_tree_root_node
      a node.  But since we can just retrieve a new node, it shouldn't
      be a limitation.
 
-   - I didn't expose setting timeout and cancellation flag for a
+   - I didn't expose setting timeout and cancelation flag for a
      parser, mainly because I don't think they are really necessary
      in Emacs's use cases.
 
@@ -891,7 +891,7 @@ treesit_ensure_parsed (Lisp_Object parser)
      when 1) language is not set (impossible in Emacs because the user
      has to supply a language to create a parser), 2) parse canceled
      due to timeout (impossible because we don't set a timeout), 3)
-     parse canceled due to cancellation flag (impossible because we
+     parse canceled due to cancelation flag (impossible because we
      don't set the flag).  (See comments for ts_parser_parse in
      tree_sitter/api.h.)  */
   if (new_tree == NULL)
@@ -1079,7 +1079,7 @@ treesit_compose_query_signal_data (uint32_t error_offset,
 
 /* Ensure the QUERY is compiled.  Return the TSQuery.  It could be
    NULL if error occurs, in which case ERROR_OFFSET and ERROR_TYPE are
-   bound.  If error occures, return NULL, and assign SIGNAL_SYMBOL and
+   bound.  If error occurs, return NULL, and assign SIGNAL_SYMBOL and
    SIGNAL_DATA accordingly.  */
 static TSQuery *
 treesit_ensure_query_compiled (Lisp_Object query, Lisp_Object *signal_symbol,
@@ -1366,7 +1366,7 @@ treesit_check_range_argument (Lisp_Object ranges)
 }
 
 /* Generate a list of ranges in Lisp from RANGES.  This function
-   doens't take ownership of RANGES.  BUFFER is used to convert
+   doesn't take ownership of RANGES.  BUFFER is used to convert
    between tree-sitter buffer offset and buffer position.  */
 static Lisp_Object
 treesit_make_ranges (const TSRange *ranges, uint32_t len,
@@ -2538,7 +2538,7 @@ treesit_traverse_sibling_helper (TSNode node, bool forward, bool named)
     }
 }
 
-/* Return the first/last named/unamed child of NODE.  FORWARD controls
+/* Return the first/last named/unnamed child of NODE.  FORWARD controls
    the direction and NAMED controls the nameness.  */
 static TSNode
 treesit_traverse_child_helper (TSNode node, bool forward, bool named)
diff --git a/test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el b/test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el
index 474739d01b..711dc7b97f 100644
--- a/test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el
+++ b/test/lisp/erc/erc-scenarios-base-compat-rename-bouncer.el
@@ -106,7 +106,7 @@ erc-scenarios-common--base-compat-no-rename-bouncer
         (erc-d-t-search-for 1 "<joe>")
         (erc-d-t-absent-for 0.1 "<bob>")
         (should (eq erc-server-process erc-server-process-bar))
-        (erc-d-t-search-for 10 "keeps you from dishonour")
+        (erc-d-t-search-for 10 "keeps you from dishonor")
         (erc-d-t-wait-for 5 (not (erc-server-process-alive)))))
 
     (when more (funcall more))))

commit aeadba1418d8fc18f17b4ae415cde35e9e272e7a (refs/remotes/origin/feature/tree-sitter)
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Nov 21 13:46:52 2022 -0800

    ; * lisp/progmodes/js.el (js-ts-mode): Add autoload cookie.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 77106ec583..51d105b9d7 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3808,6 +3808,7 @@ js-mode
   ;;(syntax-propertize (point-max))
   )
 
+;;;###autoload
 (define-derived-mode js-ts-mode js-base-mode "JavaScript"
   "Major mode for editing JavaScript.
 

commit 3f37f6b43565242db4409022dd9bc980cb86c3f6
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Nov 21 13:34:38 2022 -0800

    ; * test/src/treesit-tests.el (treesit-misc): Remove test.
    
    This test is for treesit--setting-for-mode, which is removed when we
    switched from using treesit-settings to using separate major modes.

diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index c736f97e31..59264722ba 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -522,27 +522,6 @@ treesit-node-check
     (insert "]")
     (should (treesit-node-check array-node 'outdated))))
 
-(ert-deftest treesit-misc ()
-  "Misc helper functions."
-  (skip-unless (treesit-available-p))
-  (let ((settings '((t 0 t)
-                    (c-mode 1 t)
-                    (text-mode 2 nil)
-                    (prog-mode 3 t)
-                    (fundamental-mode 4 t))))
-    ;; `treesit--setting-for-mode'.
-    ;; Exact match.
-    (should (eq 1 (treesit--setting-for-mode 'c-mode settings)))
-    ;; Inherit from t.
-    (should (eq 0 (treesit--setting-for-mode 'non-exist settings)))
-    ;; Inherit from prog-mode rather than fundamental-mode.
-    (require 'elisp-mode)
-    (should (eq 3 (treesit--setting-for-mode 'emacs-lisp-mode settings)))
-    ;; Not inherit from text-mode.
-    (require 'outline)
-    (should (not (eq 2 (treesit--setting-for-mode 'outline-mode settings))))
-    ))
-
 ;; TODO
 ;; - Functions in treesit.el
 ;; - treesit-load-name-override-list

commit eb1a35adc1c5a1a9d14ec8594580c5eb0e3d28fe
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Nov 21 13:33:03 2022 -0800

    ; Update tree-sitter starter guide
    
    * admin/notes/tree-sitter/starter-guide: Reflect recent changes.
    * admin/notes/tree-sitter/html-manual/Using-Parser.html:
    * admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html:
    * admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html:
    * admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html:
    * admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html:
    * admin/notes/tree-sitter/html-manual/Multiple-Languages.html:
    * admin/notes/tree-sitter/html-manual/Language-Definitions.html: Update.

diff --git a/admin/notes/tree-sitter/html-manual/Language-Definitions.html b/admin/notes/tree-sitter/html-manual/Language-Definitions.html
index 4fd7eb5687..6dd589f825 100644
--- a/admin/notes/tree-sitter/html-manual/Language-Definitions.html
+++ b/admin/notes/tree-sitter/html-manual/Language-Definitions.html
@@ -230,19 +230,38 @@
  body: (compound_statement))
 </pre></div>
 
+<span id="Exploring-the-syntax-tree"></span><h3 class="heading">Exploring the syntax tree</h3>
+<span id="index-explore-tree_002dsitter-syntax-tree"></span>
+<span id="index-inspection-of-tree_002dsitter-parse-tree-nodes"></span>
+
+<p>To aid in understanding the syntax of a language and in debugging of
+Lisp program that use the syntax tree, Emacs provides an &ldquo;explore&rdquo;
+mode, which displays the syntax tree of the source in the current
+buffer in real time.  Emacs also comes with an &ldquo;inspect mode&rdquo;, which
+displays information of the nodes at point in the mode-line.
+</p>
+<dl class="def">
+<dt id="index-treesit_002dexplore_002dmode"><span class="category">Command: </span><span><strong>treesit-explore-mode</strong><a href='#index-treesit_002dexplore_002dmode' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This mode pops up a window displaying the syntax tree of the source in
+the current buffer.  Selecting text in the source buffer highlights
+the corresponding nodes in the syntax tree display.  Clicking
+on nodes in the syntax tree highlights the corresponding text in the
+source buffer.
+</p></dd></dl>
+
 <dl class="def">
 <dt id="index-treesit_002dinspect_002dmode"><span class="category">Command: </span><span><strong>treesit-inspect-mode</strong><a href='#index-treesit_002dinspect_002dmode' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This minor mode displays on the mode-line the node that <em>starts</em>
-at point.  The mode-line will display
+at point.  For example, the mode-line can display
 </p>
 <div class="example">
 <pre class="example"><var>parent</var> <var>field</var>: (<var>node</var> (<var>child</var> (&hellip;)))
 </pre></div>
 
-<p>where <var>node</var>, <var>child</var>, etc, are nodes which begin at point.
+<p>where <var>node</var>, <var>child</var>, etc., are nodes which begin at point.
 <var>parent</var> is the parent of <var>node</var>.  <var>node</var> is displayed in
-bold typeface.  <var>field-name</var>s are field names of <var>node</var> and
-<var>child</var>, etc.
+a bold typeface.  <var>field-name</var>s are field names of <var>node</var> and
+of <var>child</var>, etc.
 </p>
 <p>If no node starts at point, i.e., point is in the middle of a node,
 then the mode line displays the earliest node that spans point, and
@@ -343,7 +362,7 @@
 <dt><span><code>token(<var>rule</var>)</code></span></dt>
 <dd><p>marks <var>rule</var> to produce a single leaf node.  That is, instead of
 generating a parent node with individual child nodes under it,
-everything is combined into a single leaf node.
+everything is combined into a single leaf node.  See <a href="Retrieving-Nodes.html">Retrieving Nodes</a>.
 </p></dd>
 <dt><span><code>token.immediate(<var>rule</var>)</code></span></dt>
 <dd><p>Normally, grammar rules ignore preceding whitespace; this
diff --git a/admin/notes/tree-sitter/html-manual/Multiple-Languages.html b/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
index 6d1800fad7..0ae0b1897e 100644
--- a/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
+++ b/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
@@ -273,12 +273,12 @@
 a value that <var>treesit-range-settings</var> can have.
 </p>
 <p>It takes a series of <var>query-spec</var>s, where each <var>query-spec</var> is
-a <var>query</var> preceded by zero or more pairs of <var>keyword</var> and
-<var>value</var>.  Each <var>query</var> is a tree-sitter query in either the
+a <var>query</var> preceded by zero or more <var>keyword</var>/<var>value</var>
+pairs.  Each <var>query</var> is a tree-sitter query in either the
 string, s-expression or compiled form, or a function.
 </p>
 <p>If <var>query</var> is a tree-sitter query, it should be preceeded by two
-<var>:keyword</var> <var>value</var> pairs, where the <code>:embed</code> keyword
+<var>:keyword</var>/<var>value</var> pairs, where the <code>:embed</code> keyword
 specifies the embedded language, and the <code>:host</code> keyword
 specified the host language.
 </p>
diff --git a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html
index 72d82e6ee6..e04a730b05 100644
--- a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html
+++ b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html
@@ -130,17 +130,17 @@
 </pre></div>
 
 <p>This function takes a series of <var>query-spec</var>s, where each
-<var>query-spec</var> is a <var>query</var> preceded by multiple pairs of
-<var>:keyword</var> and <var>value</var>.  Each <var>query</var> is a tree-sitter
-query in either the string, s-expression or compiled form.
-</p>
-<p>For each <var>query</var>, the <var>:keyword</var> and <var>value</var> pairs add
-meta information to it.  The <code>:lang</code> keyword declares
-<var>query</var>&rsquo;s language.  The <code>:feature</code> keyword sets the feature
-name of <var>query</var>.  Users can control which features are enabled
-with <code>font-lock-maximum-decoration</code> and
+<var>query-spec</var> is a <var>query</var> preceded by one or more
+<var>:keyword</var>/<var>value</var> pairs.  Each <var>query</var> is a
+tree-sitter query in either the string, s-expression or compiled form.
+</p>
+<p>For each <var>query</var>, the <var>:keyword</var>/<var>value</var> pairs that
+precede it add meta information to it.  The <code>:lang</code> keyword
+declares <var>query</var>&rsquo;s language.  The <code>:feature</code> keyword sets the
+feature name of <var>query</var>.  Users can control which features are
+enabled with <code>font-lock-maximum-decoration</code> and
 <code>treesit-font-lock-feature-list</code> (described below).  These two
-keywords are mandated.
+keywords are mandatory.
 </p>
 <p>Other keywords are optional:
 </p>
@@ -177,24 +177,6 @@
 ignored.
 </p></dd></dl>
 
-<p>Contextual entities, like multi-line strings, or <code>/* */</code> style
-comments, need special care, because change in these entities might
-cause change in a large portion of the buffer.  For example, inserting
-the closing comment delimiter <code>*/</code> will change all the text
-between it and the opening delimiter to comment face.  Such entities
-should be captured in a special name <code>contextual</code>, so Emacs can
-correctly update their fontification.  Here is an example for
-comments:
-</p>
-<div class="example">
-<pre class="example">(treesit-font-lock-rules
- :language 'javascript
- :feature 'comment
- :override t
- '((comment) @font-lock-comment-face)
-   (comment) @contextual))
-</pre></div>
-
 <dl class="def">
 <dt id="index-treesit_002dfont_002dlock_002dfeature_002dlist"><span class="category">Variable: </span><span><strong>treesit-font-lock-feature-list</strong><a href='#index-treesit_002dfont_002dlock_002dfeature_002dlist' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This is a list of lists of feature symbols.  Each element of the list
@@ -208,11 +190,20 @@
 list disables the corresponding query during font-lock.
 </p>
 <p>Common feature names, for many programming languages, include
-function-name, type, variable-name (left-hand-side or <acronym>LHS</acronym> of
-assignments), builtin, constant, keyword, string-interpolation,
-comment, doc, string, operator, preprocessor, escape-sequence, and key
-(in key-value pairs).  Major modes are free to subdivide or extend
-these common features.
+<code>definition</code>, <code>type</code>, <code>assignment</code>, <code>builtin</code>,
+<code>constant</code>, <code>keyword</code>, <code>string-interpolation</code>,
+<code>comment</code>, <code>doc</code>, <code>string</code>, <code>operator</code>,
+<code>preprocessor</code>, <code>escape-sequence</code>, and <code>key</code>.  Major
+modes are free to subdivide or extend these common features.
+</p>
+<p>Some of these features warrant some explanation: <code>definition</code>
+highlights whatever is being defined, e.g., the function name in a
+function definition, the struct name in a struct definition, the
+variable name in a variable definition; <code>assignment</code> highlights
+the whatever is being assigned to, e.g., the variable or field in an
+assignment statement; <code>key</code> highlights keys in key-value pairs,
+e.g., keys in a JSON object, or a Python dictionary; <code>doc</code>
+highlights docstrings or doc-comments.
 </p>
 <p>For example, the value of this variable could be:
 </p><div class="example">
diff --git a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html
index 5ea1f9bc33..3027bbaae9 100644
--- a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html
+++ b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html
@@ -183,6 +183,14 @@
 <pre class="example">(match nil &quot;argument_list&quot; nil nil 0 0)
 </pre></div>
 
+</dd>
+<dt id='index-comment_002dend'><span><code>comment-end</code><a href='#index-comment_002dend' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This matcher is a function that is called with 3 arguments:
+<var>node</var>, <var>parent</var>, and <var>bol</var>, and returns non-<code>nil</code> if
+point is before a comment ending token.  Comment ending tokens are
+defined by regular expression <code>treesit-comment-end</code>
+(see <a href="Tree_002dsitter-major-modes.html">treesit-comment-end</a>).
+</p>
 </dd>
 <dt id='index-first_002dsibling'><span><code>first-sibling</code><a href='#index-first_002dsibling' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This anchor is a function that is called with 3 arguments: <var>node</var>,
@@ -219,12 +227,28 @@
 </p>
 </dd>
 <dt id='index-point_002dmin'><span><code>point-min</code><a href='#index-point_002dmin' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This anchor is a function is called with 3 arguments: <var>node</var>,
+<dd><p>This anchor is a function that is called with 3 arguments: <var>node</var>,
 <var>parent</var>, and <var>bol</var>, and returns the beginning of the buffer.
 This is useful as the beginning of the buffer is always at column 0.
+</p>
+</dd>
+<dt id='index-comment_002dstart'><span><code>comment-start</code><a href='#index-comment_002dstart' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This anchor is a function that is called with 3 arguments: <var>node</var>,
+<var>parent</var>, and <var>bol</var>, and returns the position right after the
+comment-start token.  Comment-start tokens are defined by regular
+expression <code>treesit-comment-start</code> (see <a href="Tree_002dsitter-major-modes.html">treesit-comment-start</a>).  This function assumes <var>parent</var> is
+the comment node.
+</p>
+</dd>
+<dt id='index-coment_002dstart_002dskip'><span><code>coment-start-skip</code><a href='#index-coment_002dstart_002dskip' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This anchor is a function that is called with 3 arguments: <var>node</var>,
+<var>parent</var>, and <var>bol</var>, and returns the position after the
+comment-start token and any whitespace characters following that
+token.  Comment-start tokens are defined by regular expression
+<code>treesit-comment-start</code>.  This function assumes <var>parent</var> is
+the comment node.
 </p></dd>
 </dl>
-
 </dd></dl>
 
 <span id="Indentation-utilities"></span><h3 class="heading">Indentation utilities</h3>
diff --git a/admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html b/admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html
index ea22421ac4..a0b5775f11 100644
--- a/admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html
+++ b/admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html
@@ -106,7 +106,7 @@
 <ul class="section-toc">
 <li><a href="Language-Definitions.html" accesskey="1">Tree-sitter Language Definitions</a></li>
 <li><a href="Using-Parser.html" accesskey="2">Using Tree-sitter Parser</a></li>
-<li><a href="Retrieving-Node.html" accesskey="3">Retrieving Node</a></li>
+<li><a href="Retrieving-Nodes.html" accesskey="3">Retrieving Nodes</a></li>
 <li><a href="Accessing-Node-Information.html" accesskey="4">Accessing Node Information</a></li>
 <li><a href="Pattern-Matching.html" accesskey="5">Pattern Matching Tree-sitter Nodes</a></li>
 <li><a href="Multiple-Languages.html" accesskey="6">Parsing Text in Multiple Languages</a></li>
diff --git a/admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html b/admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html
index a80c232616..29d51eecf7 100644
--- a/admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html
+++ b/admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html
@@ -133,7 +133,7 @@
 ts_node_is_named                        treesit-node-check
 ts_node_is_missing                      treesit-node-check
 ts_node_is_extra                        treesit-node-check
-ts_node_has_changes                     treesit-node-check
+ts_node_has_changes
 ts_node_has_error                       treesit-node-check
 ts_node_parent                          treesit-node-parent
 ts_node_child                           treesit-node-child
diff --git a/admin/notes/tree-sitter/html-manual/Using-Parser.html b/admin/notes/tree-sitter/html-manual/Using-Parser.html
index c478a39e55..a4f31f9089 100644
--- a/admin/notes/tree-sitter/html-manual/Using-Parser.html
+++ b/admin/notes/tree-sitter/html-manual/Using-Parser.html
@@ -33,7 +33,7 @@
 <link href="Index.html" rel="index" title="Index">
 <link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
 <link href="Parsing-Program-Source.html" rel="up" title="Parsing Program Source">
-<link href="Retrieving-Node.html" rel="next" title="Retrieving Node">
+<link href="Retrieving-Nodes.html" rel="next" title="Retrieving Nodes">
 <link href="Language-Definitions.html" rel="prev" title="Language Definitions">
 <style type="text/css">
 <!--
@@ -63,7 +63,7 @@
 <div class="section" id="Using-Parser">
 <div class="header">
 <p>
-Next: <a href="Retrieving-Node.html" accesskey="n" rel="next">Retrieving Node</a>, Previous: <a href="Language-Definitions.html" accesskey="p" rel="prev">Tree-sitter Language Definitions</a>, Up: <a href="Parsing-Program-Source.html" accesskey="u" rel="up">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+Next: <a href="Retrieving-Nodes.html" accesskey="n" rel="next">Retrieving Nodes</a>, Previous: <a href="Language-Definitions.html" accesskey="p" rel="prev">Tree-sitter Language Definitions</a>, Up: <a href="Parsing-Program-Source.html" accesskey="u" rel="up">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
 <span id="Using-Tree_002dsitter-Parser"></span><h3 class="section">37.2 Using Tree-sitter Parser</h3>
@@ -176,11 +176,53 @@
 the root node of the generated syntax tree.
 </p></dd></dl>
 
+<span id="Be-notified-by-changes-to-the-parse-tree"></span><h3 class="heading">Be notified by changes to the parse tree</h3>
+<span id="index-update-callback_002c-for-tree_002dsitter-parse_002dtree"></span>
+<span id="index-after_002dchange-notifier_002c-for-tree_002dsitter-parse_002dtree"></span>
+<span id="index-tree_002dsitter-parse_002dtree_002c-update-and-after_002dchange-callback"></span>
+<span id="index-notifiers_002c-tree_002dsitter"></span>
+
+<p>A Lisp program might want to be notified of text affected by
+incremental parsing.  For example, inserting a comment-closing token
+converts text before that token into a comment.  Even
+though the text is not directly edited, it is deemed to be &ldquo;changed&rdquo;
+nevertheless.
+</p>
+<p>Emacs lets a Lisp program to register callback functions
+(a.k.a. <em>notifiers</em>) for this kind of changes.  A notifier
+function takes two arguments: <var>ranges</var> and <var>parser</var>.
+<var>ranges</var> is a list of cons cells of the form <code>(<var>start</var>&nbsp;.&nbsp;<var>end</var>)</code><!-- /@w -->, where <var>start</var> and <var>end</var> mark the start and the
+end positions of a range.  <var>parser</var> is the parser issuing the
+notification.
+</p>
+<p>Every time a parser reparses a buffer, it compares the old and new
+parse-tree, computes the ranges in which nodes have changed, and
+passes the ranges to notifier functions.
+</p>
+<dl class="def">
+<dt id="index-treesit_002dparser_002dadd_002dnotifier"><span class="category">Function: </span><span><strong>treesit-parser-add-notifier</strong> <em>parser function</em><a href='#index-treesit_002dparser_002dadd_002dnotifier' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function adds <var>function</var> to <var>parser</var>&rsquo;s list of
+after-change notifier functions.  <var>function</var> must be a function
+symbol, not a lambda function (see <a href="Anonymous-Functions.html">Anonymous Functions</a>).
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dparser_002dremove_002dnotifier"><span class="category">Function: </span><span><strong>treesit-parser-remove-notifier</strong> <em>parser function</em><a href='#index-treesit_002dparser_002dremove_002dnotifier' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function removes <var>function</var> from the list of <var>parser</var>&rsquo;s
+after-change notifier functions.  <var>function</var> must be a function
+symbol, rather than a lambda function.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dparser_002dnotifiers"><span class="category">Function: </span><span><strong>treesit-parser-notifiers</strong> <em>parser</em><a href='#index-treesit_002dparser_002dnotifiers' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function returns the list of <var>parser</var>&rsquo;s notifier functions.
+</p></dd></dl>
+
 </div>
 <hr>
 <div class="header">
 <p>
-Next: <a href="Retrieving-Node.html">Retrieving Node</a>, Previous: <a href="Language-Definitions.html">Tree-sitter Language Definitions</a>, Up: <a href="Parsing-Program-Source.html">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+Next: <a href="Retrieving-Nodes.html">Retrieving Nodes</a>, Previous: <a href="Language-Definitions.html">Tree-sitter Language Definitions</a>, Up: <a href="Parsing-Program-Source.html">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
 </div>
 
 
diff --git a/admin/notes/tree-sitter/starter-guide b/admin/notes/tree-sitter/starter-guide
index 84118c6f57..700b020850 100644
--- a/admin/notes/tree-sitter/starter-guide
+++ b/admin/notes/tree-sitter/starter-guide
@@ -70,7 +70,7 @@ organization has all the "official" language definitions:
 
 * Setting up for adding major mode features
 
-Start Emacs, and load tree-sitter with
+Start Emacs and load tree-sitter with
 
     (require 'treesit)
 
@@ -78,20 +78,22 @@ Now check if Emacs is built with tree-sitter library
 
     (treesit-available-p)
 
-Users toggle tree-sitter for each major mode with a central variable,
-‘treesit-settings’.  You can check whether to enable tree-sitter with
-‘treesit-ready-p’, which takes a major-mode symbol and one or more
-language symbol. The major mode body should use a branch like this:
+* Tree-sitter major modes
 
-#+begin_src emacs-lisp
-(cond
- ;; Tree-sitter setup.
- ((treesit-ready-p 'python-mode 'python)
-  ...)
- (t
-  ;; Non-tree-sitter setup.
-  ...))
-#+end_src
+Tree-sitter modes should be separate major modes, so other modes
+inheriting from the original mode don't break if tree-sitter is
+enabled.  For example js2-mode inherits js-mode, we can't enable
+tree-sitter in js-mode, lest js-mode would not setup things that
+js2-mode expects to inherit from. So it's best to use separate major
+modes.
+
+If the tree-sitter variant and the "native" variant could share some
+setup, you can create a "base mode", which only contains the common
+setup.  For example, there is python-base-mode (shared), python-mode
+(native), and python-ts-mode (tree-sitter).
+
+In the tree-sitter mode, check if we can use tree-sitter with
+treesit-ready-p, it will error out if tree-sitter is not ready.
 
 * Naming convention
 
@@ -115,14 +117,6 @@ also allow more optional arguments with (&rest _), for future
 extensibility.  For OVERRIDE check out the docstring of
 treesit-font-lock-rules.
 
-Contextual syntax like multi-line comments and multi-line strings,
-needs special care.  Because change in this type of things can affect
-a large portion of the buffer. Think of inserting a closing comment
-delimeter, it causes all the text before it (to the opening comment
-delimeter) to change to comment face.  These things needs to be
-captured in a special name “contextual”, so that Emacs can give them
-special treatment.  Se the example below for how it looks like.
-
 ** Query syntax
 
 There are two types of nodes, named, like (identifier),
@@ -159,16 +153,12 @@ These are the common syntax, see all of them in the manual
 
 ** Query references
 
-But how do one come up with the queries? Take python for an
-example, open any python source file, evaluate
-
-    (treesit-parser-create 'python)
-
-so there is a parser available, then enable ‘treesit-inspect-mode’.
-Now you should see information of the node under point in
-mode-line. Move around and you should be able to get a good
-picture. Besides this, you can consult the grammar of the language
-definition. For example, Python’s grammar file is at
+But how do one come up with the queries? Take python for an example,
+open any python source file, type M-x treesit-explore-mode RET.  Now
+you should see the parse-tree in a separate window, automatically
+updated as you select text or edit the buffer.  Besides this, you can
+consult the grammar of the language definition. For example, Python’s
+grammar file is at
 
     https://github.com/tree-sitter/tree-sitter-python/blob/master/grammar.js
 
@@ -349,8 +339,9 @@ Then you set ‘treesit-simple-indent-rules’ to your rules, and call
 
 * Imenu
 
-Not much to say except for utilizing ‘treesit-induce-sparse-tree’.
-See ‘js--treesit-imenu-1’ in js.el for an example.
+Not much to say except for utilizing ‘treesit-induce-sparse-tree’ (and
+explicitly pass a LIMIT argument: most of the time you don't need more
+than 10).  See ‘js--treesit-imenu-1’ in js.el for an example.
 
 Once you have the index builder, set ‘imenu-create-index-function’ to
 it.

commit abf40a41aaa71354eee50bedc04fe2123dd3836f
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Nov 21 13:17:16 2022 -0800

    ; Fix typo in c-ts-mode--font-lock-settings
    
    * lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings): Fix
    typo.

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 65419cca7d..6eaf200182 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -272,14 +272,14 @@ c-ts-mode--font-lock-settings
       declarator: (_) @font-lock-variable-name-face)
 
      (field_declaration
-      declarator: (_) @c-ts-mode--fontify-struct-declarator)
+      declarator: (_) @c-ts-mode--fontify-declarator)
 
      (function_definition
-      declarator: (_) @c-ts-mode--fontify-struct-declarator))
+      declarator: (_) @c-ts-mode--fontify-declarator))
 
    ;; Should we highlight identifiers in the parameter list?
    ;; (parameter_declaration
-   ;;  declarator: (_) @c-ts-mode--fontify-struct-declarator))
+   ;;  declarator: (_) @c-ts-mode--fontify-declarator))
 
    :language mode
    :feature 'assignment

commit aaeaa310f0391f5a5193e1a3d6e026986c4f2c0c
Merge: b2ea38ab03 f176a36f46
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Nov 21 12:54:35 2022 -0800

    Merge remote-tracking branch 'savannah/master' into feature/tree-sitter

commit b2ea38ab03e801859163b74a292aa75008e36541
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Nov 21 12:07:20 2022 -0800

    ; Minor fix in c-ts-mode fontification
    
    * lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings): use
    override.  Include the outer call_expression.
    (c-ts-mode--fontify-defun): Use the override given to it rather than
    hard-code.  Add missing space.

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 371c6180de..65419cca7d 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -337,8 +337,10 @@ c-ts-mode--font-lock-settings
 
    :language mode
    :feature 'emacs-devel
-   '(((call_expression function: (identifier) @fn)
-      @c-ts-mode--fontify-defun
+   :override t
+   '(((call_expression
+       (call_expression function: (identifier) @fn)
+       @c-ts-mode--fontify-defun)
       (:match "^DEFUN$" @fn)))))
 
 (defun c-ts-mode--fontify-declarator (node override start end &rest args)
@@ -399,12 +401,12 @@ c-ts-mode--fontify-defun
           (treesit-fontify-with-override
            (max start (treesit-node-start type))
            (min end (treesit-node-end type))
-           'font-lock-type-face t))
+           'font-lock-type-face override))
         (when arg
           (treesit-fontify-with-override
-           (max start(treesit-node-start arg))
+           (max start (treesit-node-start arg))
            (min end (treesit-node-end arg))
-           'default t))))))
+           'default override))))))
 
 (defun c-ts-mode--imenu-1 (node)
   "Helper for `c-ts-mode--imenu'.

commit 6cf8bf504285d9b8caf10ebdb3d5b61671a533ef
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Nov 21 11:26:46 2022 -0800

    Allow major modes to tweak tree-sitter fontification
    
    treesit--font-lock-query-expand-range allows a major mode to fix
    fontification problems temporarily before the parser can be fixed.
    
    * lisp/treesit.el (treesit--font-lock-query-expand-range): New variable.
    (treesit-font-lock-fontify-region): Use the new variable.
    * lisp/textmodes/css-mode.el (css-ts-mode): Use the new variable.

diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 35e6b9ce3e..097d4f8241 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -1813,6 +1813,11 @@ css-ts-mode
                 '((selector comment)
                   (property constant string)
                   (error variable function)))
+    ;; Tree-sitter-css, for whatever reason, cannot reliably return
+    ;; the captured nodes in a given range (it instead returns the
+    ;; nodes preceding range).  Before this is fixed in
+    ;; tree-sitter-css, use this heuristic as a temporary fix.
+    (setq-local treesit--font-lock-query-expand-range (cons 80 80))
     (setq-local imenu-create-index-function #'css--treesit-imenu)
     (setq-local which-func-functions nil)
     (treesit-major-mode-setup)))
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 7d74f531cd..b81396fc22 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -498,6 +498,19 @@ 'treesit-font-lock-error
               "Generic tree-sitter font-lock error"
               'treesit-error)
 
+(defvar-local treesit--font-lock-query-expand-range (cons 0 0)
+  "The amount to expand the start and end of the region when fontifying.
+This should be a cons cell (START . END).  When fontifying a
+buffer, Emacs will move the start of the query range backward by
+START amount, and the end of the query range by END amount.  Both
+START and END should be positive integers or 0.  This doesn't
+affect the fontified range.
+
+Sometimes, querying on some parser with a restricted range
+returns nodes not in that range but before it, which breaks
+fontification.  Major modes can adjust this variable as a
+temporarily fix.")
+
 (defvar-local treesit-font-lock-feature-list nil
   "A list of lists of feature symbols.
 
@@ -817,14 +830,17 @@ treesit-font-lock-fontify-region
       ;; quote node will not give us the string node.  So we don't use
       ;; treesit-node-on: using the root node with a restricted range
       ;; is very fast anyway (even in large files of size ~10MB).
-      ;; Plus, querying non-root nodes with restricted range sometimes
-      ;; misses nodes in the range and returns nodes outside of that
-      ;; range, using root node frees us from all those quirks.
+      ;; Plus, querying the result of `treesit-node-on' could still
+      ;; miss patterns even if we use some heuristic to enlarge the
+      ;; node (how much to enlarge? to which extent?), its much safer
+      ;; to just use the root node.
       ;;
       ;; Sometimes the source file has some errors that causes
       ;; tree-sitter to parse it into a enormously tall tree (10k
       ;; levels tall).  In that case querying the root node is very
-      ;; slow.
+      ;; slow.  So we try to get top-level nodes and query them.  This
+      ;; ensures that querying is fast everywhere else, except for the
+      ;; problematic region.
       (when-let ((nodes (list (treesit-buffer-root-node language)))
                  ;; Only activate if ENABLE flag is t.
                  (activate (eq t enable)))
@@ -837,11 +853,15 @@ treesit-font-lock-fontify-region
                        (car nodes) start end)))
 
         (dolist (sub-node nodes)
-          (let ((start-time (current-time))
-                (captures (treesit-query-capture
-                           sub-node query start end))
-                (end-time (current-time))
-                (inhibit-point-motion-hooks t))
+          (let* ((delta-start (car treesit--font-lock-query-expand-range))
+                 (delta-end (cdr treesit--font-lock-query-expand-range))
+                 (start-time (current-time))
+                 (captures (treesit-query-capture
+                            sub-node query
+                            (max (- start delta-start) (point-min))
+                            (min (+ end delta-end) (point-max))))
+                 (end-time (current-time))
+                 (inhibit-point-motion-hooks t))
             ;; If for any query the query time is strangely long,
             ;; switch to fast mode (see comments above).
             (when (> (time-to-seconds (time-subtract end-time start-time))

commit 0cbb7d3bd098e80b58457cb58125cc67e56415a2
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Nov 21 10:52:55 2022 -0800

    Further tweak tree-sitter fontification heuristics
    
    So it turns out the slowness observed in bug#59415 is not due to the
    size, but the strangely tall tree.  Adjust the heuristic to DTRT:
    don't enable the heuristic by default or when buffer is large, enable
    when query is abnormally slow.  We could do some clever thing that
    calibrates a base reading for the query time instead of using a
    hard-coded value, but it doesn't seem necessary.
    
    * lisp/treesit.el (treesit--font-lock-fast-mode): New variable.
    (treesit-font-lock-fontify-region): Don't activate heuristic by
    default (reasons in comments).  Measure the query time and activate
    the fast mode if query time is long.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 79c23e798a..7d74f531cd 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -784,6 +784,12 @@ treesit--node-length
   "Return the length of the text of NODE."
   (- (treesit-node-end node) (treesit-node-start node)))
 
+(defvar-local treesit--font-lock-fast-mode nil
+  "If this variable is t, change the way we query so its faster.
+This is not a general optimization and should be RARELY needed!
+See comments in `treesit-font-lock-fontify-region' for more
+detail.")
+
 ;; Some details worth explaining:
 ;;
 ;; 1. When we apply face to a node, we clip the face into the
@@ -808,40 +814,39 @@ treesit-font-lock-fontify-region
       ;; wants to fontify that single quote, and (treesit-node-on
       ;; start end) will give you that quote node.  We want to capture
       ;; the string and apply string face to it, but querying on the
-      ;; quote node will not give us the string node.  OTOH, if you
-      ;; query the root node, it will be very slow in very large
-      ;; (MB's) buffers.  So we still use `treesit-node-on', but try
-      ;; to enlarge it if the node seems small.  (The threshold for
-      ;; small is arbitrary.) TODO: Sometimes the node returned by
-      ;; `treesit-node-on' is still much larger than the region we
-      ;; want to fontify.  I tried to recursively go down to its
-      ;; children and get a set of smaller nodes that span the region.
-      ;; But this didn't work too well.
-      (when-let ((node-on (treesit-node-on start end language))
+      ;; quote node will not give us the string node.  So we don't use
+      ;; treesit-node-on: using the root node with a restricted range
+      ;; is very fast anyway (even in large files of size ~10MB).
+      ;; Plus, querying non-root nodes with restricted range sometimes
+      ;; misses nodes in the range and returns nodes outside of that
+      ;; range, using root node frees us from all those quirks.
+      ;;
+      ;; Sometimes the source file has some errors that causes
+      ;; tree-sitter to parse it into a enormously tall tree (10k
+      ;; levels tall).  In that case querying the root node is very
+      ;; slow.
+      (when-let ((nodes (list (treesit-buffer-root-node language)))
                  ;; Only activate if ENABLE flag is t.
                  (activate (eq t enable)))
         (ignore activate)
 
-        ;; Heuristic 1: The node seems small, enlarge it.
-        (while (and (< (treesit--node-length node-on) 40)
-                    (treesit-node-parent node-on))
-          (setq node-on (treesit-node-parent node-on)))
-
-        ;; Heuristic 2: Maybe the node returned by `treesit-node-on'
-        ;; is the root node or some excessively large node, because
-        ;; the region between START and END contains several top-level
-        ;; constructs (e.g., variable declarations in C), try find a
-        ;; list of children that spans the fontification range.
-        (if (> (treesit--node-length node-on)
-               (* 4 (max jit-lock-chunk-size (- end start))))
-            (setq node-on (treesit--children-covering-range
-                           node-on start end))
-          (setq node-on (list node-on)))
-
-        (dolist (sub-node node-on)
-          (let ((captures (treesit-query-capture
+        ;; If we run into problematic files, use the "fast mode" to
+        ;; try to recover.
+        (when treesit--font-lock-fast-mode
+          (setq nodes (treesit--children-covering-range
+                       (car nodes) start end)))
+
+        (dolist (sub-node nodes)
+          (let ((start-time (current-time))
+                (captures (treesit-query-capture
                            sub-node query start end))
+                (end-time (current-time))
                 (inhibit-point-motion-hooks t))
+            ;; If for any query the query time is strangely long,
+            ;; switch to fast mode (see comments above).
+            (when (> (time-to-seconds (time-subtract end-time start-time))
+                     0.01)
+              (setq-local treesit--font-lock-fast-mode t))
             (with-silent-modifications
               (dolist (capture captures)
                 (let* ((face (car capture))

commit aa6958c04e6912f0fe58e658c91459db8f86b08a
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Nov 21 08:57:53 2022 -0800

    ; * src/treesit.c (treesit_load_language): Move call to eassume.
    
    If handle is ever going to be NULL, it will be when error != NULL, so
    we should only eassume handle != NULL after the check for error.

diff --git a/src/treesit.c b/src/treesit.c
index 07d78626e6..91c26374b3 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -570,9 +570,6 @@ treesit_load_language (Lisp_Object language_symbol,
 	break;
     }
 
-  /* ??? */
-  eassume (handle != NULL);
-
   if (error != NULL)
     {
       *signal_symbol = Qtreesit_load_language_error;
@@ -582,6 +579,7 @@ treesit_load_language (Lisp_Object language_symbol,
     }
 
   /* Load TSLanguage.  */
+  eassume (handle != NULL);
   dynlib_error ();
   TSLanguage *(*langfn) (void);
   char *c_name = xstrdup (SSDATA (base_name));

commit 9f7ae2be60b4205aacf314d38aec7438beebf5a1
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Mon Nov 21 19:08:25 2022 +0200

    ; Silence byte-compiler warnings
    
    * lisp/textmodes/css-mode.el:
    * lisp/progmodes/python.el:
    * lisp/progmodes/json-ts-mode.el:
    * lisp/progmodes/js.el:
    * lisp/progmodes/java-ts-mode.el:
    * lisp/progmodes/c-ts-mode.el: Add declarations of tree-sitter
    functions.

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 6ba209c0fb..371c6180de 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -31,6 +31,15 @@
 (require 'treesit)
 (require 'rx)
 
+(declare-function treesit-parser-create "treesit.c")
+(declare-function treesit-induce-sparse-tree "treesit.c")
+(declare-function treesit-node-parent "treesit.c")
+(declare-function treesit-node-start "treesit.c")
+(declare-function treesit-node-end "treesit.c")
+(declare-function treesit-node-child "treesit.c")
+(declare-function treesit-node-child-by-field-name "treesit.c")
+(declare-function treesit-node-type "treesit.c")
+
 (defcustom c-ts-mode-indent-offset 2
   "Number of spaces for each indentation step in `c-ts-mode'."
   :version "29.1"
diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index 62962b7293..ee8ac31f67 100644
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -30,6 +30,11 @@
 
 (require 'treesit)
 
+(declare-function treesit-parser-create "treesit.c")
+(declare-function treesit-induce-sparse-tree "treesit.c")
+(declare-function treesit-node-start "treesit.c")
+(declare-function treesit-node-child-by-field-name "treesit.c")
+
 (defcustom java-ts-mode-indent-offset 4
   "Number of spaces for each indentation step in `java-ts-mode'."
   :version "29.1"
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 6d4f7d4f84..77106ec583 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -63,6 +63,16 @@
 (defvar ido-cur-list)
 (defvar electric-layout-rules)
 (declare-function ido-mode "ido" (&optional arg))
+(declare-function treesit-parser-create "treesit.c")
+(declare-function treesit-induce-sparse-tree "treesit.c")
+(declare-function treesit-search-subtree "treesit.c")
+(declare-function treesit-node-parent "treesit.c")
+(declare-function treesit-node-child "treesit.c")
+(declare-function treesit-node-child-by-field-name "treesit.c")
+(declare-function treesit-node-next-sibling "treesit.c")
+(declare-function treesit-node-start "treesit.c")
+(declare-function treesit-node-end "treesit.c")
+(declare-function treesit-node-type "treesit.c")
 
 ;;; Constants
 
diff --git a/lisp/progmodes/json-ts-mode.el b/lisp/progmodes/json-ts-mode.el
index c03ff85150..4ea285bd43 100644
--- a/lisp/progmodes/json-ts-mode.el
+++ b/lisp/progmodes/json-ts-mode.el
@@ -31,6 +31,12 @@
 (require 'treesit)
 (require 'rx)
 
+(declare-function treesit-parser-create "treesit.c")
+(declare-function treesit-induce-sparse-tree "treesit.c")
+(declare-function treesit-node-start "treesit.c")
+(declare-function treesit-node-child-by-field-name "treesit.c")
+
+
 (defcustom json-ts-mode-indent-offset 2
   "Number of spaces for each indentation step in `json-ts-mode'."
   :version "29.1"
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index c9a69a924e..bb2aa37ca6 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -272,6 +272,15 @@
 (defvar compilation-error-regexp-alist)
 (defvar outline-heading-end-regexp)
 
+(declare-function treesit-parser-create "treesit.c")
+(declare-function treesit-induce-sparse-tree "treesit.c")
+(declare-function treesit-node-child-by-field-name "treesit.c")
+(declare-function treesit-node-type "treesit.c")
+(declare-function treesit-node-start "treesit.c")
+(declare-function treesit-node-end "treesit.c")
+(declare-function treesit-node-parent "treesit.c")
+
+
 (autoload 'comint-mode "comint")
 (autoload 'help-function-arglist "help-fns")
 
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 1d1ca046cc..35e6b9ce3e 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -44,6 +44,13 @@
                    (require 'rx))
 (require 'treesit)
 
+(declare-function treesit-parser-create "treesit.c")
+(declare-function treesit-induce-sparse-tree "treesit.c")
+(declare-function treesit-node-type "treesit.c")
+(declare-function treesit-node-start "treesit.c")
+(declare-function treesit-node-child "treesit.c")
+
+
 (defgroup css nil
   "Cascading Style Sheets (CSS) editing mode."
   :group 'languages)

commit 24509731652e11bfed4537d7e5ef544014d2970c
Author: Mattias Engdegård <mattiase@acm.org>
Date:   Mon Nov 21 16:52:05 2022 +0100

    ; * test/src/treesit-tests.el (treesit-misc): Don't fail without ts

diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index 2a3f43916a..c736f97e31 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -524,6 +524,7 @@ treesit-node-check
 
 (ert-deftest treesit-misc ()
   "Misc helper functions."
+  (skip-unless (treesit-available-p))
   (let ((settings '((t 0 t)
                     (c-mode 1 t)
                     (text-mode 2 nil)

commit 27e89ff1163ca54ae8d31ee1cc8b7e79c34762ff
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Mon Nov 21 17:24:42 2022 +0200

    ; * lisp/treesit.el (treesit-parser-add-notifier): Add declaration.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 7af64b4392..79c23e798a 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -56,6 +56,7 @@
 
 (declare-function treesit-parser-set-included-ranges "treesit.c")
 (declare-function treesit-parser-included-ranges "treesit.c")
+(declare-function treesit-parser-add-notifier "treesit.c")
 
 (declare-function treesit-node-type "treesit.c")
 (declare-function treesit-node-start "treesit.c")

commit 87c696b7a8db5ba1e43c9c52d7e0c1367e347eb6
Author: Mattias Engdegård <mattiase@acm.org>
Date:   Mon Nov 21 15:41:28 2022 +0100

    ; Repair build without tree-sitter

diff --git a/src/treesit.c b/src/treesit.c
index 599a9b883e..07d78626e6 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -21,10 +21,10 @@ Copyright (C) 2021-2022 Free Software Foundation, Inc.
 #include "lisp.h"
 #include "buffer.h"
 
-#if HAVE_TREE_SITTER
-
 #include "treesit.h"
 
+#if HAVE_TREE_SITTER
+
 
 /* Dynamic loading of libtree-sitter.  */
 
diff --git a/src/treesit.h b/src/treesit.h
index 2d2a91cd36..1473126c5b 100644
--- a/src/treesit.h
+++ b/src/treesit.h
@@ -20,6 +20,10 @@ Copyright (C) 2021-2022 Free Software Foundation, Inc.
 #ifndef EMACS_TREESIT_H
 #define EMACS_TREESIT_H
 
+#include <config.h>
+
+#ifdef HAVE_TREE_SITTER
+
 #include <tree_sitter/api.h>
 #include "lisp.h"
 
@@ -176,6 +180,8 @@ CHECK_TS_COMPILED_QUERY (Lisp_Object query)
 	      Qtreesit_compiled_query_p, query);
 }
 
+INLINE_HEADER_END
+
 extern void treesit_record_change (ptrdiff_t, ptrdiff_t, ptrdiff_t);
 extern Lisp_Object make_treesit_parser (Lisp_Object, TSParser *, TSTree *,
 					Lisp_Object);
@@ -187,8 +193,8 @@ CHECK_TS_COMPILED_QUERY (Lisp_Object query)
 extern void treesit_delete_query (struct Lisp_TS_Query *);
 extern bool treesit_named_node_p (TSNode);
 
-extern void syms_of_treesit (void);
+#endif	/* HAVE_TREE_SITTER */
 
-INLINE_HEADER_END
+extern void syms_of_treesit (void);
 
 #endif /* EMACS_TREESIT_H */

commit f176a36f4629b56c9fd9e3fc15aebd04a168c4f5
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Mon Nov 21 15:18:54 2022 +0100

    ; Doc fixes: remove references to missing symbols
    
    * lisp/allout.el (allout-process-exposed): Don't refer to missing
    value 'flat-indented'.
    * lisp/help.el (resize-temp-buffer-window): Don't refer to missing
    function 'preserve-window-size'.
    * lisp/pcomplete.el (pcomplete-stub): Don't refer to missing
    function 'pcomplete-filename'.

diff --git a/lisp/allout.el b/lisp/allout.el
index 5f7087829e..df0181cecb 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -5356,9 +5356,6 @@ allout-process-exposed
 
  `flat' -- Present prefix as numeric section.subsection..., starting with
 	 section indicated by the START-NUM, innermost nesting first.
- X`flat-indented' -- Prefix is like `flat' for first topic at each
- X		   level, but subsequent topics have only leaf topic
- X		   number, padded with blanks to line up with first.
  `indent' (symbol) --  Convert header prefixes to all white space,
 		       except for distinctive bullets.
 
diff --git a/lisp/help.el b/lisp/help.el
index b25a8ce299..f956111a52 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1945,10 +1945,7 @@ resize-temp-buffer-window
 `fit-window-to-buffer-horizontally' can inhibit resizing.
 
 If WINDOW is the root window of its frame, resize the frame
-provided `fit-frame-to-buffer' is non-nil.
-
-This function may call `preserve-window-size' to preserve the
-size of WINDOW."
+provided `fit-frame-to-buffer' is non-nil."
   (setq window (window-normalize-window window t))
   (let* ((buffer (window-buffer window))
          (height (if (functionp temp-buffer-max-height)
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 8cb0aa3b7a..ef286b70fe 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -1210,9 +1210,7 @@ pcomplete-stub
 Returns `sole' if completed with the only completion match.
 Returns `shortest' if completed with the shortest of the matches.
 Returns `partial' if completed as far as possible with the matches.
-Returns `listed' if a completion listing was shown.
-
-See also `pcomplete-filename'."
+Returns `listed' if a completion listing was shown."
   (let* ((completion-ignore-case completion-ignore-case)
 	 (completions (all-completions stub candidates))
          (entry (try-completion stub candidates))

commit beaa2e49530b8149d2c22cb5fa15b8d48f7937b6
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Mon Nov 21 15:16:08 2022 +0100

    ; Fix typos (misspelled symbols)

diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi
index c075f0298a..4561b760c0 100644
--- a/doc/misc/flymake.texi
+++ b/doc/misc/flymake.texi
@@ -844,8 +844,8 @@ The legacy Proc backend
 * Interaction with other modes::
 @end menu
 
-@findex flymake-proc-legacy-backend
-The backend @code{flymake-proc-legacy-backend} was originally designed
+@findex flymake-proc-legacy-flymake
+The backend @code{flymake-proc-legacy-flymake} was originally designed
 to be extended for supporting new syntax check tools and error message
 patterns.  It is also controlled by its own set of customization variables
 
@@ -1053,7 +1053,7 @@ Implementation overview
 @cindex syntax check models
 @cindex master file
 
-@code{flymake-proc-legacy-backend} saves a copy of the buffer in a
+@code{flymake-proc-legacy-flymake} saves a copy of the buffer in a
 temporary file in the buffer's directory (or in the system temporary
 directory, for Java files), creates a syntax check command and
 launches a process with this command.  The output is parsed using a
diff --git a/lisp/cedet/semantic/tag.el b/lisp/cedet/semantic/tag.el
index 16695a108a..aa5b17e9bb 100644
--- a/lisp/cedet/semantic/tag.el
+++ b/lisp/cedet/semantic/tag.el
@@ -1176,7 +1176,7 @@ semantic--tag-link-cache-to-buffer
 (defsubst semantic--tag-expanded-p (tag)
   "Return non-nil if TAG is expanded.
 This function is for internal use only.
-See also the function `semantic--expand-tag'."
+See also the function `semantic--tag-expand'."
   ;; In fact a cooked tag is actually a list of cooked tags
   ;; because a raw tag can be expanded in several cooked ones!
   (when (consp tag)
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 6dc47000fa..a999596785 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -234,7 +234,7 @@ package-vc--query-spec
 
 (defun package-vc--read-archive-data (archive)
   "Update `package-vc--archive-spec-alist' for ARCHIVE.
-This function is meant to be used as a hook for `package--read-archive-hook'."
+This function is meant to be used as a hook for `package-read-archive-hook'."
   (let ((contents-file (expand-file-name
                         (format "archives/%s/elpa-packages.eld" archive)
                         package-user-dir)))
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index e69f0857e7..c7ec65da79 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -393,17 +393,15 @@ gnus-group-icons
   "Add Icons to your group buffer."
   :group 'gnus-group-visual)
 
-(defcustom gnus-group-icon-list
-  nil
+(defcustom gnus-group-icon-list nil
   "Controls the insertion of icons into group buffer lines.
 
 Below is a list of `Form'/`File' pairs.  When deciding how a
 particular group line should be displayed, each form is evaluated.
 The icon from the file field after the first true form is used.  You
 can change how those group lines are displayed by editing the file
-field.  The File will either be found in the
-`gnus-group-glyph-directory' or by designating absolute name of the
-file.
+field.  The File will either be found in the `image-load-path'
+or by specifying the absolute name of the file.
 
 It is also possible to change and add form fields, but currently that
 requires an understanding of Lisp expressions.  Hopefully this will
diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index 324165a8ff..231fa69baa 100644
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -357,7 +357,7 @@ reporter-submit-bug-report
 	  (goto-char final-resting-place))
       (set-marker final-resting-place nil))
 
-    ;; save initial text and set up the `no-empty-submission' hook.
+    ;; save initial text and set up the no empty submission hook.
     ;; This only works for mailers that support a pre-send hook, and
     ;; for which the paradigm has a non-nil value for the `hookvar'
     ;; key in its agent (i.e. sendmail.el's mail-send-hook).
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index 316463b989..c0b42171b9 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -607,8 +607,9 @@ mh-mime-display-alternative
 
 (defun mh-mime-maybe-display-alternatives (alternatives)
   "Show buttons for ALTERNATIVES.
-If `mh-mime-display-alternatives-flag' is non-nil then display
-buttons for alternative parts that are usually suppressed."
+If `mh-display-buttons-for-alternatives-flag' is non-nil then
+display buttons for alternative parts that are usually
+suppressed."
   (when (and mh-display-buttons-for-alternatives-flag alternatives)
     (insert "\n----------------------------------------------------\n")
     (insert "Alternatives:\n")
diff --git a/lisp/mh-e/mh-scan.el b/lisp/mh-e/mh-scan.el
index 4b4c594286..abbf7422b5 100644
--- a/lisp/mh-e/mh-scan.el
+++ b/lisp/mh-e/mh-scan.el
@@ -279,9 +279,9 @@ mh-scan-sent-to-me-sender-regexp
   ^ *[0-9]+.\\\\([bct]\\\\).....[ ]*\\\\(..................\\\\)
 
 If this regular expression is not correct, the notation hints
-will not be highlighted with the face
-`mh-mh-folder-sent-to-me-hint' and the sender will not be
-highlighted with the face `mh-folder-sent-to-me-sender'.")
+will not be highlighted with the face `mh-folder-sent-to-me-hint'
+and the sender will not be highlighted with the face
+`mh-folder-sent-to-me-sender'.")
 
 (defvar mh-scan-subject-regexp
   "^ *[0-9]+........[ ]*...................\\([Rr][Ee]\\(\\[[0-9]+\\]\\)?:\\s-*\\)*\\([^<\n]*\\)"
diff --git a/lisp/org/ob-R.el b/lisp/org/ob-R.el
index cd822ef837..93d1d34229 100644
--- a/lisp/org/ob-R.el
+++ b/lisp/org/ob-R.el
@@ -545,7 +545,7 @@ ob-session-async-org-babel-R-evaluate-session
 
 (defun ob-session-async-R-value-callback (params tmp-file)
   "Callback for async value results.
-Assigned locally to `ob-session-async-file-callback' in R
+Assigned locally to `org-babel-comint-async-file-callback' in R
 comint buffers used for asynchronous Babel evaluation."
   (let* ((graphics-file (and (member "graphics" (assq :result-params params))
 			     (org-babel-graphical-output-file params)))
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 38e0826075..42de0a0cf9 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -428,8 +428,7 @@ org-clock-frame-title-format
 or `both', clocking in will replace `frame-title-format' with
 this value.  Clocking out will restore `frame-title-format'.
 
-`org-frame-title-string' is a format string using the same
-specifications than `frame-title-format', which see."
+This uses the same format as `frame-title-format', which see."
   :version "24.1"
   :group 'org-clock
   :type 'sexp)
diff --git a/lisp/org/org-element.el b/lisp/org/org-element.el
index 4c018062af..474a93577a 100644
--- a/lisp/org/org-element.el
+++ b/lisp/org/org-element.el
@@ -139,7 +139,7 @@ org-element-paragraph-separate
 (defvar org-element--object-regexp nil
   "Regexp possibly matching the beginning of an object.
 This regexp allows false positives.  Dedicated parser (e.g.,
-`org-export-bold-parser') will take care of further filtering.
+`org-element-bold-parser') will take care of further filtering.
 Radio links are not matched by this regexp, as they are treated
 specially in `org-element--object-lex'.")
 
diff --git a/lisp/org/org-id.el b/lisp/org/org-id.el
index 7334050b8b..2fb299d5e8 100644
--- a/lisp/org/org-id.el
+++ b/lisp/org/org-id.el
@@ -591,7 +591,7 @@ org-id-locations-load
 			(setf (car item) (expand-file-name (car item) loc))))
 		    org-id-locations)))
 	(error
-	 (message "Could not read `org-id-values' from %s, setting it to nil"
+         (message "Could not read `org-id-locations' from %s, setting it to nil"
 		  org-id-locations-file))))
     (setq org-id-files (mapcar 'car org-id-locations))
     (setq org-id-locations (org-id-alist-to-hash org-id-locations))))
diff --git a/lisp/org/org-protocol.el b/lisp/org/org-protocol.el
index 137a11f3d9..cd99f30e7b 100644
--- a/lisp/org/org-protocol.el
+++ b/lisp/org/org-protocol.el
@@ -687,7 +687,7 @@ org-protocol-check-filename-for-protocol
       fname)))
 
 (defadvice server-visit-files (before org-protocol-detect-protocol-server activate)
-  "Advice server-visit-flist to call `org-protocol-modify-filename-for-protocol'."
+  "Advice server-visit-flist to call `org-protocol-check-filename-for-protocol'."
   (let ((flist (if org-protocol-reverse-list-of-files
                    (reverse  (ad-get-arg 0))
                  (ad-get-arg 0)))
diff --git a/lisp/org/ox-koma-letter.el b/lisp/org/ox-koma-letter.el
index 5f62cd1c04..6b5edd20f5 100644
--- a/lisp/org/ox-koma-letter.el
+++ b/lisp/org/ox-koma-letter.el
@@ -35,7 +35,7 @@
 ;; `org-koma-letter-export-to-pdf' ("pdf" file).
 ;;
 ;; On top of buffer keywords supported by `latex' back-end (see
-;; `org-latex-options-alist'), this back-end introduces the following
+;; `org-latex-packages-alist'), this back-end introduces the following
 ;; keywords:
 ;;   - CLOSING: see `org-koma-letter-closing',
 ;;   - FROM_ADDRESS: see `org-koma-letter-from-address',
@@ -66,7 +66,7 @@
 ;;   - from-logo (see `org-koma-letter-use-from-logo')
 ;;   - email (see `org-koma-letter-use-email')
 ;;   - place (see `org-koma-letter-use-place')
-;;   - location (see `org-koma-letter-use-location')
+;;   - location (see `org-koma-letter-location')
 ;;   - subject, a list of format options
 ;;     (see `org-koma-letter-subject-format')
 ;;   - after-closing-order, a list of the ordering of headings with
diff --git a/lisp/org/ox-odt.el b/lisp/org/ox-odt.el
index 7f2e8ba47f..8c8c80136a 100644
--- a/lisp/org/ox-odt.el
+++ b/lisp/org/ox-odt.el
@@ -3227,8 +3227,7 @@ org-odt-get-table-cell-styles
 When STYLE-SPEC is nil, style the table cell the conventional way
 - choose cell borders based on row and column groupings and
 choose paragraph alignment based on `org-col-cookies' text
-property.  See also
-`org-odt-get-paragraph-style-cookie-for-table-cell'.
+property.  See also `org-odt-table-style-spec'.
 
 When STYLE-SPEC is non-nil, ignore the above cookie and return
 styles congruent with the ODF-1.2 specification."
@@ -3573,8 +3572,7 @@ org-odt-table
     ;;   item, but also within description lists and low-level
     ;;   headlines.
 
-    ;; See `org-odt-translate-description-lists' and
-    ;; `org-odt-translate-low-level-headlines' for how this is
+    ;; See `org-odt--translate-description-lists' for how this is
     ;; tackled.
 
     (concat "\n"
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index 56bb4b74df..ca6b3f2208 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -6291,7 +6291,7 @@ org-export-translate
 ;;
 ;; Export Stack is viewed through a dedicated major mode
 ;;`org-export-stack-mode' and tools: `org-export-stack-refresh',
-;;`org-export-stack-delete', `org-export-stack-view' and
+;;`org-export-stack-remove', `org-export-stack-view' and
 ;;`org-export-stack-clear'.
 ;;
 ;; For back-ends, `org-export-add-to-stack' add a new source to stack.
diff --git a/lisp/outline.el b/lisp/outline.el
index 7d9e7e10d0..2465a4963a 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -1065,6 +1065,8 @@ outline-hide-region-body
   ;; Nullify the hook to avoid repeated calls to `outline-flag-region'
   ;; wasting lots of time running `lazy-lock-fontify-after-outline'
   ;; and run the hook finally.
+  ;; FIXME: The above comment seems outdated, as lazy-lock has been
+  ;;        removed from Emacs.
   (let (outline-view-change-hook)
     (save-excursion
       (save-restriction
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index c1bda7081c..bbd902c1c7 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -2452,7 +2452,7 @@ eglot-flymake-backend
 Calls REPORT-FN (or arranges for it to be called) when the server
 publishes diagnostics.  Between calls to this function, REPORT-FN
 may be called multiple times (respecting the protocol of
-`flymake-backend-functions')."
+`flymake-diagnostic-functions')."
   (cond (eglot--managed-mode
          (setq eglot--current-flymake-report-fn report-fn)
          (eglot--report-to-flymake eglot--diagnostics))
diff --git a/lisp/progmodes/flymake-cc.el b/lisp/progmodes/flymake-cc.el
index 49e36f4280..b44e625565 100644
--- a/lisp/progmodes/flymake-cc.el
+++ b/lisp/progmodes/flymake-cc.el
@@ -114,7 +114,7 @@ flymake-cc
 REPORT-FN is Flymake's callback."
   ;; HACK: XXX: Assuming this backend function is run before it in
   ;; `flymake-diagnostic-functions', very hackingly convince the other
-  ;; backend `flymake-proc-legacy-backend', which is on by default, to
+  ;; backend `flymake-proc-legacy-flymake', which is on by default, to
   ;; disable itself.
   ;;
   (setq-local flymake-proc-allowed-file-name-masks nil)
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index 63f032b7b3..20472a6034 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -448,7 +448,7 @@ idlwave-shell-overlay-arrow
 We use a single character by default, since the main block of IDL procedures
 often has no indentation.  Where possible, IDLWAVE will use overlays to
 display the stop-lines.  The arrow is only used on character-based terminals.
-See also `idlwave-shell-use-overlay-arrow'."
+See also `idlwave-shell-mark-stop-line'."
   :group 'idlwave-shell-highlighting-and-faces
   :type 'string)
 
diff --git a/lisp/term/pgtk-win.el b/lisp/term/pgtk-win.el
index 20f1573916..a398bb9fb2 100644
--- a/lisp/term/pgtk-win.el
+++ b/lisp/term/pgtk-win.el
@@ -184,7 +184,7 @@ pgtk-preedit-overlay
 (defun pgtk-preedit-text (event)
   "An internal function to display preedit text from input method.
 
-EVENT is a `preedit-text-event'."
+EVENT is a `preedit-text' event."
   (interactive "e")
   (when pgtk-preedit-overlay
     (delete-overlay pgtk-preedit-overlay))
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 791a0a0b4e..25ea07e9db 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -746,7 +746,7 @@ whitespace-indentation-regexp
 visualization of SPACEs, and the cdr specifies the regexp to match
 visualization of TABs.
 
-The indentation characters are highlighted using the `whitespace-indentationp'
+The indentation characters are highlighted using the `whitespace-indentation'
 face.
 This variable is used when `whitespace-style' includes `indentation',
 `indentation::tab' or  `indentation::space'."

commit 61e96789ddb1fe81520c3b1cc6c7ff43da5bc26f
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Mon Nov 21 14:49:54 2022 +0100

    Activate direct asynchronous processes for Tramp container methods
    
    * doc/misc/tramp.texi (Remote processes): Mention also
    tramp-container.el.
    
    * lisp/emacs-lisp/ert-x.el (ert-remote-temporary-file-directory):
    Add `tramp-direct-async' to "mock" method.
    
    * lisp/net/tramp-container.el
    (tramp-methods) <docker, podman, kubernetes>: Add `tramp-direct-async'.
    
    * lisp/net/tramp.el (tramp-methods): Adapt docstring.
    (tramp-handle-make-process): Handle `tramp-direct-async'.
    
    * test/lisp/net/tramp-tests.el (tramp-methods) <mock>:
    Add `tramp-direct-async'.

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 19f82b2447..403c0daa67 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -4253,8 +4253,9 @@ Remote processes
 
 @itemize
 @item
-It works only for connection methods defined in @file{tramp-adb.el},
-@file{tramp-sh.el} and @file{tramp-sshfs.el}.
+It works only for some connection methods defined in
+@file{tramp-adb.el}, @file{tramp-container.el}, @file{tramp-sh.el} and
+@file{tramp-sshfs.el}.
 
 @item
 It does not support interactive user authentication.  With
diff --git a/lisp/emacs-lisp/ert-x.el b/lisp/emacs-lisp/ert-x.el
index a891f068a7..49f2a1d696 100644
--- a/lisp/emacs-lisp/ert-x.el
+++ b/lisp/emacs-lisp/ert-x.el
@@ -560,6 +560,7 @@ ert-remote-temporary-file-directory
          '("mock"
 	   (tramp-login-program	     "sh")
 	   (tramp-login-args	     (("-i")))
+           (tramp-direct-async       ("-c"))
 	   (tramp-remote-shell	     "/bin/sh")
 	   (tramp-remote-shell-args  ("-c"))
 	   (tramp-connection-timeout 10)))
diff --git a/lisp/net/tramp-container.el b/lisp/net/tramp-container.el
index 328625b776..7b94253226 100644
--- a/lisp/net/tramp-container.el
+++ b/lisp/net/tramp-container.el
@@ -163,6 +163,7 @@ tramp-default-remote-shell
                                    ("-u" "%u")
                                    ("%h")
 			           ("%l")))
+		(tramp-direct-async (,tramp-default-remote-shell "-c"))
                 (tramp-remote-shell ,tramp-default-remote-shell)
                 (tramp-remote-shell-login ("-l"))
                 (tramp-remote-shell-args ("-i" "-c"))))
@@ -174,6 +175,7 @@ tramp-default-remote-shell
                                    ("-u" "%u")
                                    ("%h")
 			           ("%l")))
+		(tramp-direct-async (,tramp-default-remote-shell "-c"))
                 (tramp-remote-shell ,tramp-default-remote-shell)
                 (tramp-remote-shell-login ("-l"))
                 (tramp-remote-shell-args ("-i" "-c"))))
@@ -186,6 +188,7 @@ tramp-default-remote-shell
                                    ("--")
 			           ("%l")))
 		(tramp-config-check tramp-kubernetes--current-context-data)
+		(tramp-direct-async (,tramp-default-remote-shell "-c"))
                 (tramp-remote-shell ,tramp-default-remote-shell)
                 (tramp-remote-shell-login ("-l"))
                 (tramp-remote-shell-args ("-i" "-c"))))
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index b08bc63e8a..e9f30bea7b 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -278,8 +278,9 @@ tramp-methods
 
   * `tramp-direct-async'
     Whether the method supports direct asynchronous processes.
-    Until now, just \"ssh\"-based, \"sshfs\"-based and
-    \"adb\"-based methods do.
+    Until now, just \"ssh\"-based, \"sshfs\"-based, \"adb\"-based
+    and container methods do.  If it is a list of strings, they
+    are used to construct the remote command.
 
   * `tramp-config-check'
     A function to be called with one argument, VEC.  It should
@@ -4804,7 +4805,14 @@ tramp-handle-make-process
 	       (command
 	        (append
 		 `("cd" ,(tramp-shell-quote-argument localname) "&&" "(" "env")
-		 env `(,command ")"))))
+		 env `(,command ")")))
+		;; Add remote shell if needed.
+	       (command
+		(if (consp (tramp-get-method-parameter v 'tramp-direct-async))
+		    (append
+		     (tramp-get-method-parameter v 'tramp-direct-async)
+                     `(,(mapconcat #'identity command " ")))
+		  command)))
 
 	  ;; Check for `tramp-sh-file-name-handler', because something
 	  ;; is different between tramp-sh.el, and tramp-adb.el or
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index 46fef558bf..a5bae46a58 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -140,10 +140,11 @@ dired-copy-dereference
        ((eq system-type 'windows-nt) null-device)
        (t (add-to-list
            'tramp-methods
-           '("mock"
-	     (tramp-login-program	"sh")
+           `("mock"
+	     (tramp-login-program	,tramp-default-remote-shell)
 	     (tramp-login-args		(("-i")))
-	     (tramp-remote-shell	"/bin/sh")
+             (tramp-direct-async	("-c"))
+	     (tramp-remote-shell	,tramp-default-remote-shell)
 	     (tramp-remote-shell-args	("-c"))
 	     (tramp-connection-timeout	10)))
           (add-to-list

commit a3b654e069e563b0a2a6335ec310ada51400ac09
Author: Gregory Heytings <gregory@heytings.org>
Date:   Mon Nov 21 12:44:13 2022 +0000

    Make sed invocation in Makefile POSIX-compliant
    
    * Makefile.in: Add a semicolon before the closing brace, which is
    required by POSIX.  Fixes bug#59444.

diff --git a/Makefile.in b/Makefile.in
index 3109472a8a..93609a4e16 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -410,7 +410,7 @@ advice-on-failure:
 	@echo >&2 '*** '"\"make ${make-target}\" failed with exit status ${exit-status}."
 	@echo >&2 '***'
 	@cat Makefile | \
-	  sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q};' | \
+	  sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q;};' | \
 	  sed 's/^# /*** /' | grep -v '^\*\*\* ADVICE-ON-FAILURE-' >&2
 	@echo >&2 '***'
 	@exit ${exit-status}
@@ -425,7 +425,7 @@ sanity-check:
 	echo >&2 '*** '"\"make ${make-target}\" succeeded, but Emacs is not functional."; \
 	echo >&2 '***'; \
 	cat Makefile | \
-	  sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q};' | \
+	  sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q;};' | \
 	  sed 's/^# /*** /' | grep -v '^\*\*\* ADVICE-ON-FAILURE-' >&2; \
 	echo >&2 '***'; \
 	exit 1

commit 0fa916c7ddc308e70229254693f3f82378637fe4
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Mon Nov 21 11:30:58 2022 +0100

    * lisp/forms.el (forms-mode): Prefer setq-local.

diff --git a/lisp/forms.el b/lisp/forms.el
index b97fdbe04c..97c7cb79d3 100644
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -487,17 +487,11 @@ forms-mode
 	(make-local-variable 'forms-insert-after)
 	(make-local-variable 'forms-use-text-properties)
 
-	;; Filter functions.
-	(make-local-variable 'forms-read-file-filter)
-	(make-local-variable 'forms-write-file-filter)
-	(make-local-variable 'forms-new-record-filter)
-	(make-local-variable 'forms-modified-record-filter)
-
-	;; Make sure no filters exist.
-	(setq forms-read-file-filter nil)
-	(setq forms-write-file-filter nil)
-	(setq forms-new-record-filter nil)
-	(setq forms-modified-record-filter nil)
+        ;; Make sure no filters exist.
+        (setq-local forms-read-file-filter nil)
+        (setq-local forms-write-file-filter nil)
+        (setq-local forms-new-record-filter nil)
+        (setq-local forms-modified-record-filter nil)
 
 	;; Setup faces to show read-only and read-write fields.
 	(make-local-variable 'forms-ro-face)
@@ -615,10 +609,10 @@ forms-mode
   (make-local-variable 'forms--the-record-list)
   (make-local-variable 'forms--search-regexp)
 
-  ; The keymaps are global, so multiple forms mode buffers can share them.
-  ;(make-local-variable 'forms-mode-map)
-  ;(make-local-variable 'forms-mode-ro-map)
-  ;(make-local-variable 'forms-mode-edit-map)
+  ;; The keymaps are global, so multiple forms mode buffers can share them.
+  ;;(make-local-variable 'forms-mode-map)
+  ;;(make-local-variable 'forms-mode-ro-map)
+  ;;(make-local-variable 'forms-mode-edit-map)
   (if forms-mode-map			; already defined
       nil
     ;;(message "forms: building keymap...")
@@ -715,8 +709,8 @@ forms-mode
   ;;(message "forms: setting up... done.")
 
   ;; be helpful
-  (forms--help)
-)
+  (forms--help))
+
 
 (defun forms--process-format-list ()
   ;; Validate `forms-format-list' and set some global variables.

commit f7ba92287d9eda38c5a65f78b3e009ea151c6fdb
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Mon Nov 21 11:20:01 2022 +0100

    Make instructions for updating ancient filesets obsolete
    
    * lisp/filesets.el (filesets-update-pre010505): Make update
    information for filesets older than 2001 obsolete.  Note that this
    dates back to before filesets.el was even added to Emacs.

diff --git a/lisp/filesets.el b/lisp/filesets.el
index aeebd907c3..9f07072e78 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -2390,6 +2390,7 @@ filesets-update-cleanup
   (filesets-menu-cache-file-load))
 
 (defun filesets-update-pre010505 ()
+  (declare (obsolete nil "29.1"))
   (let ((msg (format-message
 "Filesets: manual editing of user data required!
 
@@ -2435,7 +2436,8 @@ filesets-update
    ((or (not cached-version)
 	(string< cached-version "1.5.5")
 	(boundp 'filesets-subdocument-patterns))
-    (filesets-update-pre010505)))
+    (with-suppressed-warnings ((obsolete filesets-update-pre010505))
+      (filesets-update-pre010505))))
   (filesets-update-cleanup))
 
 (defun filesets-menu-cache-file-load ()

commit c96157c8f8290bc2049dc947b6d264564659a545
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Nov 21 01:27:55 2022 -0800

    Use constant face for labels in c-ts-mode
    
    * lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings): Use
    constant face for labels.

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 3b7007bfee..6ba209c0fb 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -301,7 +301,7 @@ c-ts-mode--font-lock-settings
    :feature 'label
    '((expression_statement (identifier) @font-lock-variable-name-face)
      (labeled_statement
-      label: (statement_identifier) @font-lock-type-face))
+      label: (statement_identifier) @font-lock-constant-face))
 
    :language mode
    :feature 'error

commit a7ed5071b70f07da4c99198126c48cc6b448090a
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Nov 20 20:52:16 2022 -0800

    ; * lisp/textmodes/css-mode.el (css-ts-mode): Fix typo.

diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 5d4dbe155a..1d1ca046cc 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -1789,7 +1789,7 @@ css-ts-mode
 can also be used to fill comments.
 
 \\{css-mode-map}"
-  (when (treesit-ready-p 'css-mode 'css)
+  (when (treesit-ready-p 'css)
     ;; Borrowed from `css-native-mode'.
     (add-hook 'completion-at-point-functions
               #'css-completion-at-point nil 'local)

commit 1e624452004e17bec2070b0c0b9f5639f66df1f8
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Nov 20 20:43:15 2022 -0800

    Add separate keymaps for js/python/css-ts-mode
    
    * lisp/progmodes/js.el (js-ts-mode-map)
    * lisp/progmodes/python.el (python-ts-mode-map)
    * lisp/textmodes/css-mode.el (css-ts-mode-map): New keymap.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 50674a1c03..6d4f7d4f84 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -665,6 +665,9 @@ js-mode-map
   :doc "Keymap for `js-mode'."
   "M-." #'js-find-symbol)
 
+(defvar js-ts-mode-map (copy-keymap js-mode-map)
+  "Keymap used in `js-ts-mode'.")
+
 ;;; Syntax table and parsing
 
 (defvar js-mode-syntax-table
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index d38d029277..c9a69a924e 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -396,6 +396,9 @@ python-mode-map
     map)
   "Keymap for `python-mode'.")
 
+(defvar python-ts-mode-map (copy-keymap python-mode-map)
+  "Keymap for `(copy-keymap python-mode-map)'.")
+
 
 ;;; Python specialized rx
 
@@ -6597,7 +6600,7 @@ python-mode
 (define-derived-mode python-ts-mode python-base-mode "Python"
   "Major mode for editing Python files, using tree-sitter library.
 
-\\{python-mode-map}"
+\\{python-ts-mode-map}"
   (when (treesit-ready-p 'python)
     (treesit-parser-create 'python)
     (setq-local treesit-font-lock-feature-list
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 97272cb714..5d4dbe155a 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -1323,6 +1323,9 @@ css-smie-rules
 
 ;;; Tree-sitter
 
+(defvar css-ts-mode-map (copy-keymap css-mode-map)
+  "Keymap used in `css-ts-mode'.")
+
 (defvar css--treesit-indent-rules
   '((css
      ((node-is "}") parent-bol 0)

commit 3f25b22cadc9f73583e83b00f828ee00efa8764e
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Nov 20 20:31:42 2022 -0800

    Tweak python-ts-mode fontification
    
    * lisp/progmodes/python.el (python--treesit-fontify-string): Make the
    matching condition for docstrings more specific.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index c49af223c6..d38d029277 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1020,12 +1020,18 @@ python--treesit-fontify-string
 fontified."
   (let* ((string-beg (treesit-node-start node))
          (string-end (treesit-node-end node))
+         (maybe-expression (treesit-node-parent node))
          (maybe-defun (treesit-node-parent
                        (treesit-node-parent
-                        (treesit-node-parent node))))
-         (face (if (member (treesit-node-type maybe-defun)
-                           '("function_definition"
-                             "class_definition"))
+                        maybe-expression)))
+         (face (if (and (member (treesit-node-type maybe-defun)
+                                '("function_definition"
+                                  "class_definition"))
+                        ;; This check filters out this case:
+                        ;; def function():
+                        ;;     return "some string"
+                        (equal (treesit-node-type maybe-expression)
+                               "expression_statement"))
                    'font-lock-doc-face
                  'font-lock-string-face)))
     (when (eq (char-after string-beg) ?f)

commit 938e68bb280c96eaf163bd932ab2582fbe27e780
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Nov 20 20:29:53 2022 -0800

    Fix tree-sitter fontification heuristic
    
    Previously applied heuristic 2 sometimes invalidates heuristic 1, add
    a guard so it doesn't.
    
    The new function is just for clearity of the code and has nothing to
    do with the change itself.
    
    * lisp/treesit.el (treesit--node-length): New function
    (treesit-font-lock-fontify-region): Use the new function.  Only do
    heuristic 2 when the node is large.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index f9f807947c..7af64b4392 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -779,6 +779,10 @@ treesit--children-covering-range-recurse
     ;; If NODE has no child, keep NODE.
     (or result node)))
 
+(defsubst treesit--node-length (node)
+  "Return the length of the text of NODE."
+  (- (treesit-node-end node) (treesit-node-start node)))
+
 ;; Some details worth explaining:
 ;;
 ;; 1. When we apply face to a node, we clip the face into the
@@ -817,19 +821,21 @@ treesit-font-lock-fontify-region
                  (activate (eq t enable)))
         (ignore activate)
 
-        ;; The node seems small, enlarge it.
-        (while (and (< (- (treesit-node-end node-on)
-                          (treesit-node-start node-on))
-                       40)
+        ;; Heuristic 1: The node seems small, enlarge it.
+        (while (and (< (treesit--node-length node-on) 40)
                     (treesit-node-parent node-on))
           (setq node-on (treesit-node-parent node-on)))
 
-        ;; Maybe the node returned by `treesit-node-on' is the root
-        ;; node, because the region between START and END contains
-        ;; several top-level constructs (e.g., variable declarations
-        ;; in C).
-        (setq node-on (treesit--children-covering-range
-                       node-on start end))
+        ;; Heuristic 2: Maybe the node returned by `treesit-node-on'
+        ;; is the root node or some excessively large node, because
+        ;; the region between START and END contains several top-level
+        ;; constructs (e.g., variable declarations in C), try find a
+        ;; list of children that spans the fontification range.
+        (if (> (treesit--node-length node-on)
+               (* 4 (max jit-lock-chunk-size (- end start))))
+            (setq node-on (treesit--children-covering-range
+                           node-on start end))
+          (setq node-on (list node-on)))
 
         (dolist (sub-node node-on)
           (let ((captures (treesit-query-capture

commit 4536ce86d00111c0530334abe085f6bd6a7da92f
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Mon Nov 21 09:28:05 2022 +0100

    * lisp/woman.el (woman-mode-map): Prefer defvar-keymap.

diff --git a/lisp/woman.el b/lisp/woman.el
index 7f494a3b68..2b456fed3c 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1751,21 +1751,17 @@ woman-insert-file-contents
 
 ;;; Major mode (Man) interface:
 
-(defvar woman-mode-map
-  (let ((map (make-sparse-keymap)))
-    (set-keymap-parent map Man-mode-map)
-
-    (define-key map "R" #'woman-reformat-last-file)
-    (define-key map "w" #'woman)
-    (define-key map "\en" #'WoMan-next-manpage)
-    (define-key map "\ep" #'WoMan-previous-manpage)
-    (define-key map [M-mouse-2] #'woman-follow-word)
-
-    ;; We don't need to call `man' when we are in `woman-mode'.
-    (define-key map [remap man] #'woman)
-    (define-key map [remap man-follow] #'woman-follow)
-    map)
-  "Keymap for `woman-mode'.")
+(defvar-keymap woman-mode-map
+  :doc "Keymap for `woman-mode'."
+  :parent Man-mode-map
+  "R"   #'woman-reformat-last-file
+  "w"   #'woman
+  "M-n" #'WoMan-next-manpage
+  "M-p" #'WoMan-previous-manpage
+  "M-<mouse-2>"          #'woman-follow-word
+  ;; We don't need to call `man' when we are in `woman-mode'.
+  "<remap> <man>"        #'woman
+  "<remap> <man-follow>" #'woman-follow)
 
 (defun woman-follow (topic)
   "Get a Un*x manual page of the item under point and put it in a buffer."

commit d9d8a2eba92c4e6ef4145f222c43c86f75875ce2
Author: Juri Linkov <juri@linkov.net>
Date:   Mon Nov 21 09:56:06 2022 +0200

    * lisp/outline.el (outline-search-function): New variable (bug#53981).
    
    (outline-font-lock-keywords, outline-font-lock-face)
    (outline-minor-mode-highlight-buffer, outline-next-preface)
    (outline-next-heading, outline-previous-heading)
    (outline-back-to-heading, outline-on-heading-p, outline-demote)
    (outline-map-region, outline-next-visible-heading)
    (outline-hide-sublevels, outline-up-heading): Use outline-search-function
    when it's non-nil as an alternative to searching outline-regexp.
    (outline-search-level, outline-search-text-property): New functions.
    
    * lisp/apropos.el (apropos-mode): Set outline-search-function
    instead of unreliable outline-regexp.
    (apropos-print): Add text property outline-level.
    
    * lisp/emacs-lisp/shortdoc.el (shortdoc-display-group):
    Add text property outline-level on text separate from final newlines.
    (shortdoc-display-group): Add a narrow newline to not show
    text properties of the final line when the outline is hidden.
    (shortdoc--display-function): Add text property outline-level.
    (shortdoc-mode): Set buffer-local outline-search-function and outline-level.

diff --git a/lisp/apropos.el b/lisp/apropos.el
index d9d8f4c372..a731926f45 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -492,7 +492,7 @@ apropos-mode
 \\{apropos-mode-map}"
   (make-local-variable 'apropos--current)
   (setq-local revert-buffer-function #'apropos--revert-buffer)
-  (setq-local outline-regexp "^[^ \n]+"
+  (setq-local outline-search-function #'outline-search-level
               outline-level (lambda () 1)
               outline-minor-mode-cycle t
               outline-minor-mode-highlight t
@@ -1188,7 +1188,8 @@ apropos-print
 	  (insert-text-button (symbol-name symbol)
 			      'type 'apropos-symbol
 			      'skip apropos-multi-type
-			      'face 'apropos-symbol)
+			      'face 'apropos-symbol
+			      'outline-level 1)
 	  (setq button-end (point))
 	  (if (and (eq apropos-sort-by-scores 'verbose)
 		   (cadr apropos-item))
diff --git a/lisp/emacs-lisp/shortdoc.el b/lisp/emacs-lisp/shortdoc.el
index 022bf1e736..8328324715 100644
--- a/lisp/emacs-lisp/shortdoc.el
+++ b/lisp/emacs-lisp/shortdoc.el
@@ -1374,13 +1374,20 @@ shortdoc-display-group
          (unless (bobp)
            (insert "\n"))
          (insert (propertize
-                  (concat (substitute-command-keys data) "\n\n")
+                  (substitute-command-keys data)
+                  'face 'shortdoc-heading
+                  'shortdoc-section t
+                  'outline-level 1))
+         (insert (propertize
+                  "\n\n"
                   'face 'shortdoc-heading
                   'shortdoc-section t)))
         ;; There may be functions not yet defined in the data.
         ((fboundp (car data))
          (when prev
-           (insert (make-separator-line)))
+           (insert (make-separator-line)
+                   ;; This helps with hidden outlines (bug#53981)
+                   (propertize "\n" 'face '(:height 0))))
          (setq prev t)
          (shortdoc--display-function data))))
      (cdr (assq group shortdoc--groups))))
@@ -1397,7 +1404,7 @@ shortdoc--display-function
         (start-section (point))
         arglist-start)
     ;; Function calling convention.
-    (insert (propertize "(" 'shortdoc-function function))
+    (insert (propertize "(" 'shortdoc-function function 'outline-level 2))
     (if (plist-get data :no-manual)
         (insert-text-button
          (symbol-name function)
@@ -1531,7 +1538,10 @@ shortdoc-mode-map
 
 (define-derived-mode shortdoc-mode special-mode "shortdoc"
   "Mode for shortdoc."
-  :interactive nil)
+  :interactive nil
+  (setq-local outline-search-function #'outline-search-level
+              outline-level (lambda ()
+                              (get-text-property (point) 'outline-level))))
 
 (defun shortdoc--goto-section (arg sym &optional reverse)
   (unless (natnump arg)
diff --git a/lisp/outline.el b/lisp/outline.el
index 92135f8b48..7d9e7e10d0 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -59,6 +59,18 @@ outline-heading-end-regexp
 in the file it applies to.")
 ;;;###autoload(put 'outline-heading-end-regexp 'safe-local-variable 'stringp)
 
+(defvar outline-search-function nil
+  "Function to search the next outline heading.
+The function is called with four optional arguments: BOUND, MOVE, BACKWARD,
+LOOKING-AT.  The first two arguments BOUND and MOVE are almost the same as
+the BOUND and NOERROR arguments of `re-search-forward', with the difference
+that MOVE accepts only a boolean, either nil or non-nil.  When the argument
+BACKWARD is non-nil, the search should search backward like
+`re-search-backward' does.  In case of a successful search, the
+function should return non-nil, move point, and set match-data
+appropriately.  When the argument LOOKING-AT is non-nil, it should
+imitate the function `looking-at'.")
+
 (defvar outline-mode-prefix-map
   (let ((map (make-sparse-keymap)))
     (define-key map "@" 'outline-mark-subtree)
@@ -233,7 +245,8 @@ outline-mode-map
 (defvar outline-font-lock-keywords
   '(
     ;; Highlight headings according to the level.
-    (eval . (list (concat "^\\(?:" outline-regexp "\\).*")
+    (eval . (list (or outline-search-function
+                      (concat "^\\(?:" outline-regexp "\\).*"))
                   0 '(if outline-minor-mode
                          (if outline-minor-mode-highlight
                              (list 'face (outline-font-lock-face)))
@@ -366,7 +379,9 @@ outline-font-lock-face
   "Return one of `outline-font-lock-faces' for current level."
   (save-excursion
     (goto-char (match-beginning 0))
-    (looking-at outline-regexp)
+    (if outline-search-function
+        (funcall outline-search-function nil nil nil t)
+      (looking-at outline-regexp))
     (aref outline-font-lock-faces
           (% (1- (funcall outline-level))
              (length outline-font-lock-faces)))))
@@ -474,8 +489,11 @@ outline-minor-mode-highlight-buffer
   ;; Fallback to overlays when font-lock is unsupported.
   (save-excursion
     (goto-char (point-min))
-    (let ((regexp (concat "^\\(?:" outline-regexp "\\).*$")))
-      (while (re-search-forward regexp nil t)
+    (let ((regexp (unless outline-search-function
+                    (concat "^\\(?:" outline-regexp "\\).*$"))))
+      (while (if outline-search-function
+                 (funcall outline-search-function)
+               (re-search-forward regexp nil t))
         (let ((overlay (make-overlay (match-beginning 0) (match-end 0))))
           (overlay-put overlay 'outline-highlight t)
           ;; FIXME: Is it possible to override all underlying face attributes?
@@ -592,26 +610,37 @@ outline-next-preface
   "Skip forward to just before the next heading line.
 If there's no following heading line, stop before the newline
 at the end of the buffer."
-  (if (re-search-forward (concat "\n\\(?:" outline-regexp "\\)")
-			 nil 'move)
-      (goto-char (match-beginning 0)))
-  (if (and (bolp) (or outline-blank-line (eobp)) (not (bobp)))
-      (forward-char -1)))
+  (when (if outline-search-function
+            (progn
+              ;; Emulate "\n" to force finding the next preface
+              (unless (eobp) (forward-char 1))
+              (funcall outline-search-function nil t))
+          (re-search-forward (concat "\n\\(?:" outline-regexp "\\)")
+			     nil 'move))
+    (goto-char (match-beginning 0))
+    ;; Compensate "\n" from the beginning of regexp
+    (when (and outline-search-function (not (bobp))) (forward-char -1)))
+  (when (and (bolp) (or outline-blank-line (eobp)) (not (bobp)))
+    (forward-char -1)))
 
 (defun outline-next-heading ()
   "Move to the next (possibly invisible) heading line."
   (interactive)
   ;; Make sure we don't match the heading we're at.
-  (if (and (bolp) (not (eobp))) (forward-char 1))
-  (if (re-search-forward (concat "^\\(?:" outline-regexp "\\)")
-			 nil 'move)
-      (goto-char (match-beginning 0))))
+  (when (and (bolp) (not (eobp))) (forward-char 1))
+  (when (if outline-search-function
+            (funcall outline-search-function nil t)
+          (re-search-forward (concat "^\\(?:" outline-regexp "\\)")
+			     nil 'move))
+    (goto-char (match-beginning 0))))
 
 (defun outline-previous-heading ()
   "Move to the previous (possibly invisible) heading line."
   (interactive)
-  (re-search-backward (concat "^\\(?:" outline-regexp "\\)")
-		      nil 'move))
+  (if outline-search-function
+      (funcall outline-search-function nil t t)
+    (re-search-backward (concat "^\\(?:" outline-regexp "\\)")
+		        nil 'move)))
 
 (defsubst outline-invisible-p (&optional pos)
   "Non-nil if the character after POS has outline invisible property.
@@ -628,8 +657,10 @@ outline-back-to-heading
       (let (found)
 	(save-excursion
 	  (while (not found)
-	    (or (re-search-backward (concat "^\\(?:" outline-regexp "\\)")
-				    nil t)
+	    (or (if outline-search-function
+                    (funcall outline-search-function nil nil t)
+                  (re-search-backward (concat "^\\(?:" outline-regexp "\\)")
+				      nil t))
                 (signal 'outline-before-first-heading nil))
 	    (setq found (and (or invisible-ok (not (outline-invisible-p)))
 			     (point)))))
@@ -642,7 +673,9 @@ outline-on-heading-p
   (save-excursion
     (beginning-of-line)
     (and (bolp) (or invisible-ok (not (outline-invisible-p)))
-	 (looking-at outline-regexp))))
+	 (if outline-search-function
+             (funcall outline-search-function nil nil nil t)
+           (looking-at outline-regexp)))))
 
 (defun outline-insert-heading ()
   "Insert a new heading at same depth at point."
@@ -754,7 +787,9 @@ outline-demote
 		      (while (and (progn (outline-next-heading) (not (eobp)))
 				  (<= (funcall outline-level) level))))
 		    (unless (eobp)
-		      (looking-at outline-regexp)
+		      (if outline-search-function
+                          (funcall outline-search-function nil nil nil t)
+                        (looking-at outline-regexp))
 		      (match-string-no-properties 0))))
                 ;; Bummer!! There is no higher-level heading in the buffer.
                 (outline-invent-heading head nil))))
@@ -805,7 +840,9 @@ outline-map-region
   (save-excursion
     (setq end (copy-marker end))
     (goto-char beg)
-    (when (re-search-forward (concat "^\\(?:" outline-regexp "\\)") end t)
+    (when (if outline-search-function
+              (funcall outline-search-function end)
+            (re-search-forward (concat "^\\(?:" outline-regexp "\\)") end t))
       (goto-char (match-beginning 0))
       (funcall fun)
       (while (and (progn
@@ -873,21 +910,23 @@ outline-next-visible-heading
   (if (< arg 0)
       (beginning-of-line)
     (end-of-line))
-  (let (found-heading-p)
+  (let ((regexp (unless outline-search-function
+                  (concat "^\\(?:" outline-regexp "\\)")))
+        found-heading-p)
     (while (and (not (bobp)) (< arg 0))
       (while (and (not (bobp))
 		  (setq found-heading-p
-			(re-search-backward
-			 (concat "^\\(?:" outline-regexp "\\)")
-			 nil 'move))
+			(if outline-search-function
+                            (funcall outline-search-function nil t t)
+                          (re-search-backward regexp nil 'move)))
 		  (outline-invisible-p)))
       (setq arg (1+ arg)))
     (while (and (not (eobp)) (> arg 0))
       (while (and (not (eobp))
 		  (setq found-heading-p
-			(re-search-forward
-			 (concat "^\\(?:" outline-regexp "\\)")
-			 nil 'move))
+			(if outline-search-function
+                            (funcall outline-search-function nil t)
+                          (re-search-forward regexp nil 'move)))
 		  (outline-invisible-p (match-beginning 0))))
       (setq arg (1- arg)))
     (if found-heading-p (beginning-of-line))))
@@ -1107,8 +1146,11 @@ outline-hide-sublevels
   (interactive (list
 		(cond
 		 (current-prefix-arg (prefix-numeric-value current-prefix-arg))
-		 ((save-excursion (beginning-of-line)
-				  (looking-at outline-regexp))
+		 ((save-excursion
+                    (beginning-of-line)
+		    (if outline-search-function
+                        (funcall outline-search-function nil nil nil t)
+                      (looking-at outline-regexp)))
 		  (funcall outline-level))
 		 (t 1))))
   (if (< levels 1)
@@ -1255,7 +1297,9 @@ outline-up-heading
 	  (setq level (funcall outline-level)))
 	(setq start-level level))
       (setq arg (- arg 1))))
-  (looking-at outline-regexp))
+  (if outline-search-function
+      (funcall outline-search-function nil nil nil t)
+    (looking-at outline-regexp)))
 
 (defun outline-forward-same-level (arg)
   "Move forward to the ARG'th subheading at same level as this one.
@@ -1313,6 +1357,60 @@ outline-get-last-sibling
       (if (< (funcall outline-level) level)
 	  nil
         (point)))))
+
+
+;;; Search text-property for outline headings
+
+;;;###autoload
+(defun outline-search-level (&optional bound move backward looking-at)
+  "Search for the next text property `outline-level'.
+The arguments are the same as in `outline-search-text-property',
+except the hard-coded property name `outline-level'.
+This function is intended to be used in `outline-search-function'."
+  (outline-search-text-property 'outline-level nil bound move backward looking-at))
+
+(autoload 'text-property-search-forward "text-property-search")
+(autoload 'text-property-search-backward "text-property-search")
+
+(defun outline-search-text-property (property &optional value bound move backward looking-at)
+  "Search for the next text property PROPERTY with VALUE.
+The rest of arguments are described in `outline-search-function'."
+  (if looking-at
+      (when (if value (eq (get-text-property (point) property) value)
+              (get-text-property (point) property))
+        (set-match-data (list (pos-bol) (pos-eol)))
+        t)
+    ;; Go to the end when in the middle of heading
+    (when (and (not backward)
+               (if value (eq (get-text-property (point) property) value)
+                 (get-text-property (point) property))
+               (not (or (bobp)
+                        (not (if value
+                                 (eq (get-text-property (1- (point)) property) value)
+                               (get-text-property (1- (point)) property))))))
+      (goto-char (1+ (pos-eol))))
+    (let ((prop-match (if backward
+                          (text-property-search-backward property value (and value t))
+                        (text-property-search-forward property value (and value t)))))
+      (if prop-match
+          (let ((beg (prop-match-beginning prop-match))
+                (end (prop-match-end prop-match)))
+            (if (or (null bound) (if backward (>= beg bound) (<= end bound)))
+                (cond (backward
+                       (goto-char beg)
+                       (goto-char (pos-bol))
+                       (set-match-data (list (point) end))
+                       t)
+                      (t
+                       (goto-char end)
+                       (goto-char (if (bolp) (1- (point)) (pos-eol)))
+                       (set-match-data (list beg (point)))
+                       t))
+              (when move (goto-char bound))
+              nil))
+        (when move (goto-char (or bound (if backward (point-min) (point-max)))))
+        nil))))
+
 
 (defun outline-headers-as-kill (beg end)
   "Save the visible outline headers between BEG and END to the kill ring.

commit 3069849bd4c1048a8f8c0467d26560fad939e791
Author: Po Lu <luangruo@yahoo.com>
Date:   Mon Nov 21 13:24:15 2022 +0800

    * src/treesit.c (treesit_load_language): Fix uninitialized uses.

diff --git a/src/treesit.c b/src/treesit.c
index 291698e4e4..599a9b883e 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -554,9 +554,11 @@ treesit_load_language (Lisp_Object language_symbol,
      when succeed, record the error message and try the next one when
      fail.  */
   dynlib_handle_ptr handle;
-  char const *error;
+  const char *error;
 
   tail = path_candidates;
+  error = NULL;
+  handle = NULL;
 
   FOR_EACH_TAIL (tail)
     {
@@ -568,6 +570,9 @@ treesit_load_language (Lisp_Object language_symbol,
 	break;
     }
 
+  /* ??? */
+  eassume (handle != NULL);
+
   if (error != NULL)
     {
       *signal_symbol = Qtreesit_load_language_error;

commit d45253996670509e668d266d577f48deb9c7018f
Author: Po Lu <luangruo@yahoo.com>
Date:   Mon Nov 21 13:17:48 2022 +0800

    Avoid usage of intern_c_string in treesit.c
    
    * src/treesit.c (Ftreesit_pattern_expand): Use DEFSYM'd symbols
    when the naming makes sense.
    (syms_of_treesit): Add new defsyms QCanchor, QCequal, QCmatch.

diff --git a/src/treesit.c b/src/treesit.c
index a2f528860f..291698e4e4 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2042,7 +2042,7 @@ DEFUN ("treesit-pattern-expand",
 See Info node `(elisp)Pattern Matching' for detailed explanation.  */)
   (Lisp_Object pattern)
 {
-  if (EQ (pattern, intern_c_string (":anchor")))
+  if (EQ (pattern, QCanchor))
     return build_pure_c_string (".");
   if (EQ (pattern, intern_c_string (":?")))
     return build_pure_c_string ("?");
@@ -2050,9 +2050,9 @@ DEFUN ("treesit-pattern-expand",
     return build_pure_c_string ("*");
   if (EQ (pattern, intern_c_string (":+")))
     return build_pure_c_string ("+");
-  if (EQ (pattern, intern_c_string (":equal")))
+  if (EQ (pattern, QCequal))
     return build_pure_c_string ("#equal");
-  if (EQ (pattern, intern_c_string (":match")))
+  if (EQ (pattern, QCmatch))
     return build_pure_c_string ("#match");
   Lisp_Object opening_delimeter
     = build_pure_c_string (VECTORP (pattern) ? "[" : "(");
@@ -2060,7 +2060,7 @@ DEFUN ("treesit-pattern-expand",
     = build_pure_c_string (VECTORP (pattern) ? "]" : ")");
   if (VECTORP (pattern) || CONSP (pattern))
     return concat3 (opening_delimeter,
-		    Fmapconcat (intern_c_string ("treesit-pattern-expand"),
+		    Fmapconcat (Qtreesit_pattern_expand,
 				pattern,
 				build_pure_c_string (" ")),
 		    closing_delimiter);
@@ -2938,6 +2938,10 @@ syms_of_treesit (void)
   DEFSYM (Qoutdated, "outdated");
   DEFSYM (Qhas_error, "has-error");
 
+  DEFSYM (QCanchor, ":anchor");
+  DEFSYM (QCequal, ":equal");
+  DEFSYM (QCmatch, ":match");
+
   DEFSYM (Qnot_found, "not-found");
   DEFSYM (Qsymbol_error, "symbol-error");
   DEFSYM (Qversion_mismatch, "version-mismatch");

commit 43f25120c9a2578df3df47491ed68a0566ff6f61
Author: Po Lu <luangruo@yahoo.com>
Date:   Mon Nov 21 13:14:43 2022 +0800

    Stylistic fixes to treesit.c
    
    * src/treesit.c (treesit_make_ranges):
    (Ftreesit_parser_set_included_ranges): Fix coding style.

diff --git a/src/treesit.c b/src/treesit.c
index 53b1e0d8dc..a2f528860f 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -844,8 +844,7 @@ treesit_check_buffer_size (struct buffer *buffer)
 	      make_fixnum (buffer_size));
 }
 
-static Lisp_Object
-treesit_make_ranges (const TSRange *, uint32_t, struct buffer *);
+static Lisp_Object treesit_make_ranges (const TSRange *, uint32_t, struct buffer *);
 
 static void
 treesit_call_after_change_functions (TSTree *old_tree, TSTree *new_tree,
@@ -1366,8 +1365,9 @@ treesit_check_range_argument (Lisp_Object ranges)
 /* Generate a list of ranges in Lisp from RANGES.  This function
    doens't take ownership of RANGES.  BUFFER is used to convert
    between tree-sitter buffer offset and buffer position.  */
-static Lisp_Object treesit_make_ranges (const TSRange *ranges, uint32_t len,
-					struct buffer *buffer)
+static Lisp_Object
+treesit_make_ranges (const TSRange *ranges, uint32_t len,
+		     struct buffer *buffer)
 {
   Lisp_Object list = Qnil;
   for (int idx = 0; idx < len; idx++)
@@ -1430,7 +1430,7 @@ DEFUN ("treesit-parser-set-included-ranges",
       if (list_length (ranges) > UINT32_MAX)
 	xsignal (Qargs_out_of_range, list2 (ranges, Flength (ranges)));
       uint32_t len = (uint32_t) list_length (ranges);
-      TSRange *treesit_ranges = xmalloc (sizeof(TSRange) * len);
+      TSRange *treesit_ranges = xmalloc (sizeof (TSRange) * len);
       struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
 
       for (int idx = 0; !NILP (ranges); idx++, ranges = XCDR (ranges))
@@ -1446,7 +1446,7 @@ DEFUN ("treesit-parser-set-included-ranges",
 	  eassert (end_byte - BUF_BEGV_BYTE (buffer) <= UINT32_MAX);
 	  /* We don't care about start and end points, put in dummy
 	     values.  */
-	  TSRange rg = {{0,0}, {0,0},
+	  TSRange rg = {{0, 0}, {0, 0},
 			(uint32_t) beg_byte - BUF_BEGV_BYTE (buffer),
 			(uint32_t) end_byte - BUF_BEGV_BYTE (buffer)};
 	  treesit_ranges[idx] = rg;

commit 9d266f2a6c0e51f184d55c8bba4551abdeca02bc
Author: Po Lu <luangruo@yahoo.com>
Date:   Mon Nov 21 13:12:16 2022 +0800

    Fix MS-DOS build
    
    * msdos/sed1v2.inp: Edit out tree-sitter stuff.

diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index b7818f8b21..9c9d1eded1 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -179,6 +179,8 @@ s/ *@WEBP_LIBS@//
 /^LIBGCCJIT_OBJ *=/s/@LIBGCCJIT_OBJ@//
 /^LIBGCCJIT_CFLAGS *=/s/@LIBGCCJIT_CFLAGS@//
 /^LIBGCCJIT_LIBS *=/s/@LIBGCCJIT_LIBS@//
+/^TREE_SITTER_LIBS *=/s/@TREE_SITTER_LIBS@//
+/^TREE_SITTER_CFLAGS *=/s/@TREE_SITTER_CFLAGS@//
 /^HARFBUZZ_CFLAGS *=/s/@HARFBUZZ_CFLAGS@//
 /^HARFBUZZ_LIBS *=/s/@HARFBUZZ_LIBS@//
 /^LCMS2_CFLAGS *=/s/@LCMS2_CFLAGS@//

commit 76eb88df0243dd15492e71f068fd476be8efc800
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Nov 20 17:15:42 2022 -0800

    Add another heuristic to speed up tree-sitter fontification
    
    * lisp/treesit.el (treesit-font-lock-fontify-region): Use
    treesit--children-covering-range to reduce the node size.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index d65ad31b47..f9f807947c 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -816,41 +816,51 @@ treesit-font-lock-fontify-region
                  ;; Only activate if ENABLE flag is t.
                  (activate (eq t enable)))
         (ignore activate)
+
         ;; The node seems small, enlarge it.
         (while (and (< (- (treesit-node-end node-on)
                           (treesit-node-start node-on))
                        40)
                     (treesit-node-parent node-on))
           (setq node-on (treesit-node-parent node-on)))
-        (let ((captures (treesit-query-capture
-                         node-on query start end))
-              (inhibit-point-motion-hooks t))
-          (with-silent-modifications
-            (dolist (capture captures)
-              (let* ((face (car capture))
-                     (node (cdr capture))
-                     (node-start (treesit-node-start node))
-                     (node-end (treesit-node-end node)))
-                ;; Turns out it is possible to capture a node that's
-                ;; completely outside the region between START and
-                ;; END.  If the node is outside of that region, (max
-                ;; node-start start) and friends return bad values.
-                (when (and (< start node-end)
-                           (< node-start end))
-                  (cond
-                   ((facep face)
-                    (treesit-fontify-with-override
-                     (max node-start start) (min node-end end)
-                     face override))
-                   ((functionp face)
-                    (funcall face node override start end)))
-                  ;; Don't raise an error if FACE is neither a face nor
-                  ;; a function.  This is to allow intermediate capture
-                  ;; names used for #match and #eq.
-                  (when (or loudly treesit--font-lock-verbose)
-                    (message "Fontifying text from %d to %d, Face: %s, Node: %s"
-                             (max node-start start) (min node-end end)
-                             face (treesit-node-type node)))))))))))
+
+        ;; Maybe the node returned by `treesit-node-on' is the root
+        ;; node, because the region between START and END contains
+        ;; several top-level constructs (e.g., variable declarations
+        ;; in C).
+        (setq node-on (treesit--children-covering-range
+                       node-on start end))
+
+        (dolist (sub-node node-on)
+          (let ((captures (treesit-query-capture
+                           sub-node query start end))
+                (inhibit-point-motion-hooks t))
+            (with-silent-modifications
+              (dolist (capture captures)
+                (let* ((face (car capture))
+                       (node (cdr capture))
+                       (node-start (treesit-node-start node))
+                       (node-end (treesit-node-end node)))
+                  ;; Turns out it is possible to capture a node that's
+                  ;; completely outside the region between START and
+                  ;; END.  If the node is outside of that region, (max
+                  ;; node-start start) and friends return bad values.
+                  (when (and (< start node-end)
+                             (< node-start end))
+                    (cond
+                     ((facep face)
+                      (treesit-fontify-with-override
+                       (max node-start start) (min node-end end)
+                       face override))
+                     ((functionp face)
+                      (funcall face node override start end)))
+                    ;; Don't raise an error if FACE is neither a face nor
+                    ;; a function.  This is to allow intermediate capture
+                    ;; names used for #match and #eq.
+                    (when (or loudly treesit--font-lock-verbose)
+                      (message "Fontifying text from %d to %d, Face: %s, Node: %s"
+                               (max node-start start) (min node-end end)
+                               face (treesit-node-type node))))))))))))
   `(jit-lock-bounds ,start . ,end))
 
 (defun treesit--font-lock-notifier (ranges parser)

commit 32870d2f207536bb7932beeb2e0ec9a4e0146560
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Nov 20 16:56:33 2022 -0800

    Limit recursion level for tree-sitter imenu functions
    
    Generating imenu index doesn't require going down to the bottom of the
    tree (defun's are usually top-level).  Add limit so we don't go too
    far down on very large buffers.
    
    * lisp/progmodes/c-ts-mode.el (c-ts-mode--imenu)
    * lisp/progmodes/java-ts-mode.el (java-ts-mode--imenu)
    * lisp/progmodes/js.el (js--treesit-imenu)
    * lisp/progmodes/json-ts-mode.el (json-ts-mode--imenu)
    * lisp/progmodes/python.el (python-imenu-treesit-create-index)
    * lisp/textmodes/css-mode.el (css--treesit-imenu): Add limit to
    treesit-induce-sparse-tree.

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 9fc7e6f67c..3b7007bfee 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -448,11 +448,11 @@ c-ts-mode--imenu
   "Return Imenu alist for the current buffer."
   (let* ((node (treesit-buffer-root-node))
          (func-tree (treesit-induce-sparse-tree
-                     node "^function_definition$"))
+                     node "^function_definition$" nil 1000))
          (var-tree (treesit-induce-sparse-tree
-                    node "^declaration$"))
+                    node "^declaration$" nil 1000))
          (struct-tree (treesit-induce-sparse-tree
-                       node "^struct_specifier$"))
+                       node "^struct_specifier$" nil 1000))
          (func-index (c-ts-mode--imenu-1 func-tree))
          (var-index (c-ts-mode--imenu-1 var-tree))
          (struct-index (c-ts-mode--imenu-1 struct-tree)))
diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index 6a800d292c..62962b7293 100644
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -246,23 +246,23 @@ java-ts-mode--imenu
          (class-tree
           `("Class" . ,(java-ts-mode--imenu-1
                         (treesit-induce-sparse-tree
-                         node "^class_declaration$"))))
+                         node "^class_declaration$" nil 1000))))
          (interface-tree
           `("Interface" . ,(java-ts-mode--imenu-1
                             (treesit-induce-sparse-tree
-                             node "^interface_declaration$"))))
+                             node "^interface_declaration$"  nil 1000))))
          (enum-tree
           `("Enum" . ,(java-ts-mode--imenu-1
                        (treesit-induce-sparse-tree
-                        node "^enum_declaration$"))))
+                        node "^enum_declaration$"  nil 1000))))
          (record-tree
           `("Record" . ,(java-ts-mode--imenu-1
                          (treesit-induce-sparse-tree
-                          node "^record_declaration$"))))
+                          node "^record_declaration$"  nil 1000))))
          (method-tree
           `("Method" . ,(java-ts-mode--imenu-1
                          (treesit-induce-sparse-tree
-                          node "^method_declaration$")))))
+                          node "^method_declaration$"  nil 1000)))))
     (cl-remove-if
      #'null
      `(,(when (cdr class-tree) class-tree)
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 4b07c0d12c..50674a1c03 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3688,11 +3688,12 @@ js--treesit-imenu
   (let* ((node (treesit-buffer-root-node))
          (class-tree (treesit-induce-sparse-tree
                       node (rx (or "class_declaration"
-                                   "method_definition"))))
+                                   "method_definition"))
+                      nil 1000))
          (func-tree (treesit-induce-sparse-tree
-                     node "function_declaration"))
+                     node "function_declaration" nil 1000))
          (var-tree (treesit-induce-sparse-tree
-                    node "lexical_declaration")))
+                    node "lexical_declaration" nil 1000)))
     `(("Class" . ,(js--treesit-imenu-1 class-tree))
       ("Varieable" . ,(js--treesit-imenu-1 var-tree))
       ("Function" . ,(js--treesit-imenu-1 func-tree)))))
diff --git a/lisp/progmodes/json-ts-mode.el b/lisp/progmodes/json-ts-mode.el
index 7e0dd17911..c03ff85150 100644
--- a/lisp/progmodes/json-ts-mode.el
+++ b/lisp/progmodes/json-ts-mode.el
@@ -115,7 +115,7 @@ json-ts-mode--imenu
   "Return Imenu alist for the current buffer."
   (let* ((node (treesit-buffer-root-node))
          (tree (treesit-induce-sparse-tree
-                node "pair")))
+                node "pair" nil 1000)))
     (json-ts-mode--imenu-1 tree)))
 
 ;;;###autoload
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 2f967ebab2..c49af223c6 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -5492,7 +5492,8 @@ python-imenu-treesit-create-index
                 (rx (seq bol
                          (or "function" "class")
                          "_definition"
-                         eol)))))
+                         eol))
+                nil 1000)))
     (python--imenu-treesit-create-index-1 tree)))
 
 (defun python-imenu-treesit-create-flat-index ()
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 6915e499bb..97272cb714 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -1406,7 +1406,8 @@ css--treesit-imenu
   "Return Imenu alist for the current buffer."
   (let* ((node (treesit-buffer-root-node))
          (tree (treesit-induce-sparse-tree
-                node (rx (or "rule_set" "media_statement")))))
+                node (rx (or "rule_set" "media_statement"))
+                nil 1000)))
     (css--treesit-imenu-1 tree)))
 
 ;;; Completion

commit 625ea08652053617034bf8ceee0d6cfae34f2dcc
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Nov 20 16:37:19 2022 -0800

    Improve tree-sitter fontification on large buffers
    
    * lisp/treesit.el (treesit--children-covering-range)
    (treesit--children-covering-range-recurse): New functions.  They are
    not currently used but could be useful in the future, so I left them
    in place.
    (treesit-font-lock-fontify-region):
    * lisp/treesit.el (treesit-font-lock-fontify-region): Use the result
    of treesit-node-on instead of the root node.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 674c984dfe..d65ad31b47 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -748,6 +748,37 @@ treesit--set-nonsticky
         (remove-text-properties start end '(rear-nonsticky nil))
       (put-text-property start end 'rear-nonsticky new-prop))))
 
+(defun treesit--children-covering-range (node start end)
+  "Return a list of children of NODE covering a range.
+The range is between START and END."
+  (let* ((child (treesit-node-first-child-for-pos node start))
+         (result (list child)))
+    (while (and (< (treesit-node-end child) end)
+                (setq child (treesit-node-next-sibling child)))
+      (push child result))
+    (nreverse result)))
+
+(defun treesit--children-covering-range-recurse (node start end threshold)
+  "Return a list of children of NODE covering a range.
+Recursively go down the parse tree and collect children, until
+all nodes in the returned list are smaller than THRESHOLD.  The
+range is between START and END."
+  (let* ((child (treesit-node-first-child-for-pos node start))
+         result)
+    (while (and child (<= (treesit-node-start child) end))
+      ;; If child still too large, recurse down.  Otherwise collect
+      ;; child.
+      (if (> (- (treesit-node-end child)
+                (treesit-node-start child))
+             threshold)
+          (dolist (r (treesit--children-covering-range-recurse
+                      child start end threshold))
+            (push r result))
+        (push child result))
+      (setq child (treesit-node-next-sibling child)))
+    ;; If NODE has no child, keep NODE.
+    (or result node)))
+
 ;; Some details worth explaining:
 ;;
 ;; 1. When we apply face to a node, we clip the face into the
@@ -768,18 +799,31 @@ treesit-font-lock-fontify-region
            (enable (nth 1 setting))
            (override (nth 3 setting))
            (language (treesit-query-language query)))
-      ;; Why root node rather than (treesit-node-on start end)?  If
-      ;; you insert an ending quote into a buffer, jit-lock only wants
-      ;; to fontify that single quote, and (treesit-node-on start end)
-      ;; will give you that quote node.  We want to capture the string
-      ;; and apply string face to it, but querying on the quote node
-      ;; will not give us the string node.
-      (when-let ((root (treesit-buffer-root-node language))
+      ;; If you insert an ending quote into a buffer, jit-lock only
+      ;; wants to fontify that single quote, and (treesit-node-on
+      ;; start end) will give you that quote node.  We want to capture
+      ;; the string and apply string face to it, but querying on the
+      ;; quote node will not give us the string node.  OTOH, if you
+      ;; query the root node, it will be very slow in very large
+      ;; (MB's) buffers.  So we still use `treesit-node-on', but try
+      ;; to enlarge it if the node seems small.  (The threshold for
+      ;; small is arbitrary.) TODO: Sometimes the node returned by
+      ;; `treesit-node-on' is still much larger than the region we
+      ;; want to fontify.  I tried to recursively go down to its
+      ;; children and get a set of smaller nodes that span the region.
+      ;; But this didn't work too well.
+      (when-let ((node-on (treesit-node-on start end language))
                  ;; Only activate if ENABLE flag is t.
                  (activate (eq t enable)))
         (ignore activate)
+        ;; The node seems small, enlarge it.
+        (while (and (< (- (treesit-node-end node-on)
+                          (treesit-node-start node-on))
+                       40)
+                    (treesit-node-parent node-on))
+          (setq node-on (treesit-node-parent node-on)))
         (let ((captures (treesit-query-capture
-                         root query start end))
+                         node-on query start end))
               (inhibit-point-motion-hooks t))
           (with-silent-modifications
             (dolist (capture captures)

commit 6b0179f7908c658342d1e642e5444e3d2e1cd997
Author: Stephen Leake <stephen_leake@stephe-leake.org>
Date:   Sun Nov 20 13:45:13 2022 -0800

    Delete eglot spinner; not useful
    
    * lisp/progmodes/eglot.el (eglot-lsp-server): Delete slot spinner.
    (eglot--mode-line-format): Don't include spinner in mode-line.
    (eglot--signal-textDocument/didChange): Don't set spinner.

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 9555d21b00..c1bda7081c 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -821,9 +821,6 @@ eglot-lsp-server
    (project
     :documentation "Project associated with server."
     :accessor eglot--project)
-   (spinner
-    :documentation "List (ID DOING-WHAT DONE-P) representing server progress."
-    :initform `(nil nil t) :accessor eglot--spinner)
    (inhibit-autoreconnect
     :initform t
     :documentation "Generalized boolean inhibiting auto-reconnection if true."
@@ -1924,12 +1921,11 @@ eglot--mode-line-props
 
 (defun eglot--mode-line-format ()
   "Compose the Eglot's mode-line."
-  (pcase-let* ((server (eglot-current-server))
-               (nick (and server (eglot-project-nickname server)))
-               (pending (and server (hash-table-count
-                                     (jsonrpc--request-continuations server))))
-               (`(,_id ,doing ,done-p ,_detail) (and server (eglot--spinner server)))
-               (last-error (and server (jsonrpc-last-error server))))
+  (let* ((server (eglot-current-server))
+         (nick (and server (eglot-project-nickname server)))
+         (pending (and server (hash-table-count
+                               (jsonrpc--request-continuations server))))
+         (last-error (and server (jsonrpc-last-error server))))
     (append
      `(,(propertize
          eglot-menu-string
@@ -1955,14 +1951,11 @@ eglot--mode-line-format
                      '((mouse-3 eglot-clear-status  "Clear this status"))
                      (format "An error occurred: %s\n" (plist-get last-error
                                                                  :message)))))
-         ,@(when (and doing (not done-p))
-             `("/" ,(eglot--mode-line-props doing
-                                            'compilation-mode-line-run '())))
-         ,@(when (cl-plusp pending)
-             `("/" ,(eglot--mode-line-props
-                     (format "%d" pending) 'warning
-                     '((mouse-3 eglot-forget-pending-continuations
-                                "Forget pending continuations"))
+       ,@(when (cl-plusp pending)
+           `("/" ,(eglot--mode-line-props
+                   (format "%d" pending) 'warning
+                   '((mouse-3 eglot-forget-pending-continuations
+                              "Forget pending continuations"))
                      "Number of outgoing, \
 still unanswered LSP requests to the server\n"))))))))
 
@@ -2414,7 +2407,6 @@ eglot--signal-textDocument/didChange
                    vconcat `[,(list :range `(:start ,beg :end ,end)
                                     :rangeLength len :text text)]))))
       (setq eglot--recent-changes nil)
-      (setf (eglot--spinner server) (list nil :textDocument/didChange t))
       (jsonrpc--call-deferred server))))
 
 (defun eglot--signal-textDocument/didOpen ()

commit 8ec8decd9f1ab642c7f1406b37a89773345b5aba
Author: Juanma Barranquero <lekktu@gmail.com>
Date:   Sun Nov 20 21:40:08 2022 +0100

    Avoid native compiler setting user-init-file to warnings.el (bug#59358)
    
    * src/lread.c (maybe_swap_for_eln): Use a delayed warning
    instead of `display-warning' to avoid a recursive call to
    Fload while loading the init file that sets `user-init-file'
    to a bogus value.

diff --git a/src/lread.c b/src/lread.c
index c28324dc35..2a57f72194 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1741,12 +1741,15 @@ maybe_swap_for_eln (bool no_native, Lisp_Object *filename, int *fd,
 					       Vload_path,
 					       Qnil, Qnil)))
 		return;
-	      call2 (intern_c_string ("display-warning"),
-		     Qcomp,
-		     CALLN (Fformat,
-			    build_string ("Cannot look up eln file as "
-					  "no source file was found for %s"),
-			    *filename));
+	      Vdelayed_warnings_list
+		= Fcons (list2
+			 (Qcomp,
+			  CALLN (Fformat,
+				 build_string ("Cannot look up eln "
+					       "file as no source file "
+					       "was found for %s"),
+				 *filename)),
+			 Vdelayed_warnings_list);
 	      return;
 	    }
 	}

commit 4bc9fe33afa4a2dc063e7c25d6098ad98fcb0208
Author: Juri Linkov <juri@linkov.net>
Date:   Sun Nov 20 20:10:45 2022 +0200

    Rename 'elisp-eval-buffer' to 'elisp-eval-region-or-buffer' (bug#59350)
    
    * lisp/progmodes/elisp-mode.el (elisp-eval-region-or-buffer):
    Rename recently added command 'elisp-eval-buffer' to support active region.
    (emacs-lisp-mode-map, lisp-interaction-mode-map): Rebind 'C-c C-e'
    from elisp-eval-buffer to elisp-eval-region-or-buffer.

diff --git a/etc/NEWS b/etc/NEWS
index 8a34afe8d2..9345cb06f5 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1464,8 +1464,8 @@ This command visits the file on the current line with EWW.
 ** Elisp
 
 ---
-*** New command 'elisp-eval-buffer' (bound to 'C-c C-e').
-This command evals the forms in the current buffer.
+*** New command 'elisp-eval-region-or-buffer' (bound to 'C-c C-e').
+This command evals the forms in the active region or in the whole buffer.
 
 ---
 *** New commands 'elisp-byte-compile-file' and 'elisp-byte-compile-buffer'.
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 44c8ca7cb9..7c470de195 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -52,7 +52,7 @@ emacs-lisp-mode-map
   :parent lisp-mode-shared-map
   "M-TAB" #'completion-at-point
   "C-M-x" #'eval-defun
-  "C-c C-e" #'elisp-eval-buffer
+  "C-c C-e" #'elisp-eval-region-or-buffer
   "C-c C-f" #'elisp-byte-compile-file
   "C-c C-b" #'elisp-byte-compile-buffer
   "C-M-q" #'indent-pp-sexp)
@@ -1234,7 +1234,7 @@ lisp-interaction-mode-map
   :parent lisp-mode-shared-map
   "C-M-x" #'eval-defun
   "C-M-q" #'indent-pp-sexp
-  "C-c C-e" #'elisp-eval-buffer
+  "C-c C-e" #'elisp-eval-region-or-buffer
   "C-c C-b" #'elisp-byte-compile-buffer
   "M-TAB" #'completion-at-point
   "C-j"   #'eval-print-last-sexp)
@@ -2212,11 +2212,17 @@ elisp-flymake--batch-compile-for-flymake
     (terpri)
     (pp collected)))
 
-(defun elisp-eval-buffer ()
-  "Evaluate the forms in the current buffer."
+(defun elisp-eval-region-or-buffer ()
+  "Evaluate the forms in the active region or the whole current buffer.
+In Transient Mark mode when the mark is active, call `eval-region'.
+Otherwise, call `eval-buffer'."
   (interactive)
-  (eval-buffer)
-  (message "Evaluated the %s buffer" (buffer-name)))
+  (if (use-region-p)
+      (eval-region (region-beginning) (region-end))
+    (eval-buffer))
+  (message "Evaluated the %s%s buffer"
+           (if (use-region-p) "region in the " "")
+           (buffer-name)))
 
 (defun elisp-byte-compile-file (&optional load)
   "Byte compile the file the current buffer is visiting.

commit 5c709bd605d39032362a2850321615faed4d1eb3
Author: Juri Linkov <juri@linkov.net>
Date:   Sun Nov 20 20:02:20 2022 +0200

    Disable display-line-numbers-mode in string-pixel-width (bug#59311)
    
    * lisp/emacs-lisp/subr-x.el (string-pixel-width):
    Turn off display-line-numbers-mode when it's enabled.

diff --git a/lisp/emacs-lisp/subr-x.el b/lisp/emacs-lisp/subr-x.el
index 6e4d88b4df..18087bc937 100644
--- a/lisp/emacs-lisp/subr-x.el
+++ b/lisp/emacs-lisp/subr-x.el
@@ -322,6 +322,10 @@ string-pixel-width
     ;; Keeping a work buffer around is more efficient than creating a
     ;; new temporary buffer.
     (with-current-buffer (get-buffer-create " *string-pixel-width*")
+      ;; `display-line-numbers-mode' is enabled in internal buffers
+      ;; that breaks width calculation, so need to disable (bug#59311)
+      (when (bound-and-true-p display-line-numbers-mode)
+        (display-line-numbers-mode -1))
       (delete-region (point-min) (point-max))
       (insert string)
       (car (buffer-text-pixel-size nil nil t)))))

commit 79eca4652b4d84ea355587dd62caff7dff6cb141
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Sun Nov 20 17:58:49 2022 +0100

    * doc/misc/Makefile.in (INFO_COMMON): Sort alphabetically.

diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index b6eef7ea79..a7dbbbb48f 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -68,13 +68,13 @@ DOCMISC_W32 =
 
 ## Info files to build and install on all platforms.
 INFO_COMMON = auth autotype bovine calc ccmode cl \
-	dbus dired-x ebrowse ede ediff edt eglot eieio \
-	emacs-mime epa erc ert eshell eudc efaq eww \
-	flymake forms gnus emacs-gnutls htmlfontify idlwave ido info.info \
-	mairix-el message mh-e modus-themes newsticker nxml-mode octave-mode \
-	org pcl-cvs pgg rcirc remember reftex sasl \
-	sc semantic ses sieve smtpmail speedbar srecode todo-mode transient \
-	tramp url vhdl-mode vip viper vtable widget wisent woman
+	dbus dired-x ebrowse ede ediff edt efaq eglot eieio \
+	emacs-gnutls emacs-mime epa erc ert eshell eudc eww \
+	flymake forms gnus htmlfontify idlwave ido info.info \
+	mairix-el message mh-e modus-themes newsticker nxml-mode \
+	octave-mode org pcl-cvs pgg rcirc reftex remember sasl \
+	sc semantic ses sieve smtpmail speedbar srecode todo-mode \
+	tramp transient url vhdl-mode vip viper vtable widget wisent woman
 
 ## Info files to install on current platform.
 INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_W32)

commit 7ad6104a17d2cff0be24fecb9eae58a8b41d5139
Author: Michael Albinus <michael.albinus@gmx.de>
Date:   Sun Nov 20 17:58:34 2022 +0100

    Rework tramp-archive autoloads
    
    * lisp/net/tramp-archive.el (tramp-archive-autoload-file-name-regexp):
    Use `tramp-compat-rx'.  Protect `tramp-archive-suffixes' and
    `tramp-archive-compression-suffixes'.
    (tramp-archive-file-name-handler): Don't autoload.
    (tramp-register-archive-autoload-file-name-handler): Rename from
    `tramp-register-archive-file-name-handler'.  Adapt callees.

diff --git a/lisp/net/tramp-archive.el b/lisp/net/tramp-archive.el
index 646ae86452..5b2af7c6b2 100644
--- a/lisp/net/tramp-archive.el
+++ b/lisp/net/tramp-archive.el
@@ -183,18 +183,20 @@ tramp-archive-compression-suffixes
 ;; The definition of `tramp-archive-file-name-regexp' contains calls
 ;; to `regexp-opt', which cannot be autoloaded while loading
 ;; loaddefs.el.  So we use a macro, which is evaluated only when needed.
+;; When tramp-archive.el is unloaded and reloaded, it gripes about
+;; missing `tramp-archive{-compression]-suffixes'.  We protect this.
 ;;;###autoload
 (progn (defmacro tramp-archive-autoload-file-name-regexp ()
   "Regular expression matching archive file names."
-  `(rx
+  `(tramp-compat-rx
     bos
     ;; This group is used in `tramp-archive-file-name-archive'.
     (group
      (+ nonl)
      ;; Default suffixes ...
-     "." ,(cons '| tramp-archive-suffixes)
+     "." ,(cons '| (bound-and-true-p tramp-archive-suffixes))
      ;; ... with compression.
-     (? "." ,(cons '| tramp-archive-compression-suffixes)))
+     (? "." ,(cons '| (bound-and-true-p tramp-archive-compression-suffixes))))
     ;; This group is used in `tramp-archive-file-name-localname'.
     (group "/" (* nonl))
     eos)))
@@ -330,10 +332,6 @@ tramp-archive-file-name-for-operation
 	 (inhibit-file-name-operation operation))
     (apply operation args))))
 
-;; Starting with Emacs 29, `tramp-archive-file-name-handler' is
-;; autoloaded.  But it must still be in tramp-loaddefs.el for older
-;; versions of Emacs.
-;;;###autoload(autoload 'tramp-archive-file-name-handler "tramp-archive")
 ;;;###tramp-autoload
 (defun tramp-archive-file-name-handler (operation &rest args)
   "Invoke the file archive related OPERATION.
@@ -396,30 +394,30 @@ tramp-archive-file-name-handler
 (put #'tramp-archive-autoload-file-name-handler 'tramp-autoload t)
 
 ;;;###autoload
-(progn (defun tramp-register-archive-file-name-handler ()
+(progn (defun tramp-register-archive-autoload-file-name-handler ()
   "Add archive file name handler to `file-name-handler-alist'."
   (when (and tramp-archive-enabled
              (not
-              (rassq #'tramp-archive-file-name-handler file-name-handler-alist)))
+              (rassq 'tramp-archive-file-name-handler file-name-handler-alist)))
     (add-to-list 'file-name-handler-alist
 	         (cons (tramp-archive-autoload-file-name-regexp)
 		       #'tramp-archive-autoload-file-name-handler))
     (put #'tramp-archive-autoload-file-name-handler 'safe-magic t))))
 
-(put #'tramp-register-archive-file-name-handler 'tramp-autoload t)
+(put #'tramp-register-archive-autoload-file-name-handler 'tramp-autoload t)
 
 ;;;###autoload
 (progn
-  (add-hook 'after-init-hook #'tramp-register-archive-file-name-handler)
+  (add-hook 'after-init-hook #'tramp-register-archive-autoload-file-name-handler)
   (add-hook
    'tramp-archive-unload-hook
    (lambda ()
      (remove-hook
-      'after-init-hook #'tramp-register-archive-file-name-handler))))
+      'after-init-hook #'tramp-register-archive-autoload-file-name-handler))))
 
 ;; In older Emacsen (prior 27.1), the autoload above does not exist.
 ;; So we call it again; it doesn't hurt.
-(tramp-register-archive-file-name-handler)
+(tramp-register-archive-autoload-file-name-handler)
 
 ;; Mark `operations' the handler is responsible for.
 (put #'tramp-archive-file-name-handler 'operations

commit 8874cd908c0ea0e2200f6f4f596bf645e76a0c0c
Author: Po Lu <luangruo@yahoo.com>
Date:   Sun Nov 20 21:01:10 2022 +0800

    Coalesce duplicate scroll valuator handling code
    
    Also, write more commentary.
    
    * src/xterm.c (xi_populate_scroll_valuator): New function.
    Describe the meaning of each field in xi_scroll_valuator_t.
    (xi_populate_device_from_info, xi_handle_new_classes): Factor
    out duplicate code to that function.

diff --git a/src/xterm.c b/src/xterm.c
index 500d80cad7..af652a0d85 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -5323,6 +5323,46 @@ x_free_xi_devices (struct x_display_info *dpyinfo)
   struct xi_known_valuator *next;
 };
 
+/* Populate the scroll valuator at INDEX in DEVICE with the scroll
+   valuator information provided in INFO.
+
+   The information consists of:
+
+     - whether or not the valuator is horizontal.
+
+     - whether or not the valuator's value is currently unknown,
+       until the next XI_Motion event is received or the valuator's
+       value is restored by the caller upon encountering valuator
+       class data.
+
+     - what the current value of the valuator is.  This is set to
+       DBL_MIN for debugging purposes, but can be any value, as
+       invalid_p is currently true.
+
+     - the increment, which defines the amount of movement equal to a
+       single unit of scrolling.  For example, if the increment is
+       2.0, then a WHEEL_DOWN or WHEEL_UP event will be sent every
+       time the valuator value changes by 2.0, unless
+       mwheel-coalesce-scroll-events is nil.
+
+     - the number used in XI_Motion events and elsewhere to identify
+       the valuator.  */
+
+static void
+xi_populate_scroll_valuator (struct xi_device_t *device,
+			     int index, XIScrollClassInfo *info)
+{
+  struct xi_scroll_valuator_t *valuator;
+
+  valuator = &device->valuators[index];
+  valuator->horizontal
+    = (info->scroll_type == XIScrollTypeHorizontal);
+  valuator->invalid_p = true;
+  valuator->emacs_value = DBL_MIN;
+  valuator->increment = info->increment;
+  valuator->number = info->number;
+}
+
 #endif
 
 static void
@@ -5331,7 +5371,6 @@ xi_populate_device_from_info (struct x_display_info *dpyinfo,
 			      XIDeviceInfo *device)
 {
 #ifdef HAVE_XINPUT2_1
-  struct xi_scroll_valuator_t *valuator;
   struct xi_known_valuator *values, *tem;
   int actual_valuator_count, c;
   XIScrollClassInfo *info;
@@ -5432,15 +5471,8 @@ xi_populate_device_from_info (struct x_display_info *dpyinfo,
 	case XIScrollClass:
 	  {
 	    info = (XIScrollClassInfo *) device->classes[c];
-
-	    valuator = &xi_device->valuators[actual_valuator_count++];
-	    valuator->horizontal
-	      = (info->scroll_type == XIScrollTypeHorizontal);
-	    valuator->invalid_p = true;
-	    valuator->emacs_value = DBL_MIN;
-	    valuator->increment = info->increment;
-	    valuator->number = info->number;
-
+	    xi_populate_scroll_valuator (xi_device, actual_valuator_count++,
+					 info);
 	    break;
 	  }
 
@@ -13164,13 +13196,9 @@ xi_handle_new_classes (struct x_display_info *dpyinfo, struct xi_device_t *devic
 	case XIScrollClass:
 	  scroll = (XIScrollClassInfo *) classes[i];
 
-	  valuator = &device->valuators[device->scroll_valuator_count++];
-	  valuator->horizontal = (scroll->scroll_type
-				  == XIScrollTypeHorizontal);
-	  valuator->invalid_p = true;
-	  valuator->emacs_value = 0;
-	  valuator->increment = scroll->increment;
-	  valuator->number = scroll->number;
+	  xi_populate_scroll_valuator (device,
+				       device->scroll_valuator_count++,
+				       scroll);
 	  break;
 
 #ifdef HAVE_XINPUT2_2

commit 16318bfb518aa7bc06e502e6fad7e53ec91067f9
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Sun Nov 20 12:59:39 2022 +0100

    ; Fix typos

diff --git a/ChangeLog.3 b/ChangeLog.3
index 3ebe74e76b..d27a14d427 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -12670,7 +12670,7 @@
 
 2021-09-03  Lars Ingebrigtsen  <larsi@gnus.org>
 
-	Fix `describe-function' for autoloaded adviced functions
+	Fix `describe-function' for autoloaded advised functions
 
 	* lisp/emacs-lisp/nadvice.el (advice--make-single-doc): Factor
 	out.
@@ -21063,7 +21063,7 @@
 	Fix prompting for large files when loading literally
 
 	* lisp/files.el (find-file-noselect): Don't include "literally" in
-	the "large file" prompt if we're gonna load literally anyway
+	the "large file" prompt if we're going to load literally anyway
 	(bug#49144).
 
 2021-06-21  Lars Ingebrigtsen  <larsi@gnus.org>
@@ -75941,7 +75941,7 @@
 
 2020-07-13  Andrea Corallo  <akrl@sdf.org>
 
-	Rework the backend to allocate arument arrays for call by references
+	Rework the backend to allocate argument arrays for call by references
 
 	* src/comp.c (comp_t): Add 'zero' field.
 	(emit_limple_call_ref): Allocate an array to host the parameters
@@ -79675,7 +79675,7 @@
 	Simply return the directory selected by the user.
 	(project-switch-project-find-file): Remove.
 	(project-switch-project-dired): Rename to project-dired and make
-	it follow the convention of existing projec tcommands.
+	it follow the convention of existing project tcommands.
 	(project-switch-project-eshell): Ditto.
 	(project-switch-project): Instead of passing the project instance
 	to the command, just bind default-directory.
@@ -80910,7 +80910,7 @@
 	'lambda_gc_guard' 'lambda_c_name_idx_h' 'data_imp_relocs'
 	'loaded_once' fields.
 
-	* src/comp.c (load_comp_unit): Use compilaiton unit 'loaded_once'
+	* src/comp.c (load_comp_unit): Use compilation unit 'loaded_once'
 	field.
 	(make_subr, Fcomp__register_lambda): New functions.
 	(Fcomp__register_subr): Make use of 'make_subr'.
@@ -90740,7 +90740,7 @@
 
 	compute dominator tree
 
-	ssa and endge number generation with generator
+	ssa and edge number generation with generator
 
 	add edge computation
 
@@ -140170,7 +140170,7 @@
 
 	* doc/misc/eshell.texi (Built-ins): Fix alias description
 
-	Dear eamcs developers, eshells current documentation first states
+	Dear emacs developers, eshell's current documentation first states
 	that alias definitions are not saved to an alias file, later that
 	they are saved to an alias file.  I tested it and the latter is
 	correct.
@@ -165960,7 +165960,7 @@
 	cl-loop: Calculate the array length just once
 
 	* lisp/emacs-lisp/cl-macs.el (cl--parse-loop-clause):
-	Dont calculate the array length on each iteration (Bug#29866).
+	Don't calculate the array length on each iteration (Bug#29866).
 
 2018-01-07  Philipp Stephani  <phst@google.com>
 
@@ -169297,7 +169297,7 @@
 	2e1b3522b8 Improve documentation of 'line-number-display-width'
 	5b6e59cfdb Implement vc-default-dir-extra-headers for vc-rcs
 	22adeca42a In NEWS give advice on use of `switch-to-buffer' (Bug#28645)
-	2c3e6f1ddc Dont update primary selection with winner-undo
+	2c3e6f1ddc Don't update primary selection with winner-undo
 	b38724ab67 Work around ImageMagick bug 825
 	20cc68e871 Document rectangle-preview option more (Bug#27974)
 	a0b7b301dd Do not reject https://gnu.org in commit messages
@@ -172340,7 +172340,7 @@
 
 	* doc/misc/eshell.texi (Built-ins): Fix alias description
 
-	Dear eamcs developers, eshells current documentation first states
+	Dear emacs developers, eshell's current documentation first states
 	that alias definitions are not saved to an alias file, later that
 	they are saved to an alias file.  I tested it and the latter is
 	correct.
@@ -185296,10 +185296,10 @@
 2017-10-17  Tino Calancha  <tino.calancha@gmail.com>
 	    Noam Postavsky  <npostavs@gmail.com>
 
-	Dont update primary selection with winner-undo
+	Don't update primary selection with winner-undo
 
 	* lisp/winner.el (winner-set):
-	Dont update primary selection when select-enable-primary
+	Don't update primary selection when select-enable-primary
 	is non-nil (Bug#28631).
 
 2017-10-17  Paul Eggert  <eggert@cs.ucla.edu>
@@ -195520,7 +195520,7 @@
 
 	Ignore mouse-movement for describe-key-briefly (Bug#12204)
 
-	* lisp/help.el (help-read-key-sequence): Add optional argument ot
+	* lisp/help.el (help-read-key-sequence): Add optional argument to
 	ignore `mouse-movement' events.
 	(describe-key-briefly): Use it.
 	* doc/emacs/help.texi (Key Help):
@@ -198690,7 +198690,7 @@
 	(tramp-adb-ls-toolbox-regexp):
 	Ignore addition links column on Android 7.
 	(tramp-adb-get-ls-command):
-	Dont use --color=none when using toybox (Android 7).  It's not
+	Don't use --color=none when using toybox (Android 7).  It's not
 	possible to disable coloring explicitly for toybox ls.
 
 2017-05-27  Svante Carl v. Erichsen  <Svante.v.Erichsen@web.de>  (tiny change)
@@ -199186,7 +199186,7 @@
 
 2017-05-23  Paul Eggert  <eggert@cs.ucla.edu>
 
-	Don't warn about missing brances on macOS
+	Don't warn about missing branches on macOS
 
 	On macOS, removing -Wmissing-braces is not enough; the warning has to
 	be disabled explicitly.
diff --git a/admin/cus-test.el b/admin/cus-test.el
index 22d5a3a151..7e73f2e44a 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -131,7 +131,7 @@ viper-mode
 ;; Don't create a file `abbrev-file-name'.
 (setq save-abbrevs nil)
 
-;; Avoid compile logs from adviced functions.
+;; Avoid compile logs from advised functions.
 (eval-after-load "bytecomp"
   '(setq ad-default-compilation-action 'never))
 
diff --git a/admin/grammars/srecode-template.wy b/admin/grammars/srecode-template.wy
index c3531ebd54..7ba73d2921 100644
--- a/admin/grammars/srecode-template.wy
+++ b/admin/grammars/srecode-template.wy
@@ -126,7 +126,7 @@ variable
   : SET symbol insertable-string-list newline
     (VARIABLE-TAG $2 nil $3)
   | SET symbol number newline
-    ;; This so a common error w/ priority works.
+    ;; This so a common error with priority works.
     ;; Note that "number" still has a string value in the lexer.
     (VARIABLE-TAG $2 nil (list $3))
   | SHOW symbol newline
diff --git a/admin/last-chance.el b/admin/last-chance.el
index 30d6a25a28..45d470cacd 100644
--- a/admin/last-chance.el
+++ b/admin/last-chance.el
@@ -41,7 +41,7 @@
 ;;
 ;; will show you any references to `change-log-date-face' in the
 ;; *.el files in a new buffer (in Grep mode).  Hopefully you see
-;; only the obsolete declaration and can proceed w/ its removal.
+;; only the obsolete declaration and can proceed with its removal.
 ;; If not, please DTRT and refrain from the removal until those
 ;; references are properly transitioned.
 ;;
diff --git a/admin/notes/bug-triage b/admin/notes/bug-triage
index 3d9a275c9d..bee7242337 100644
--- a/admin/notes/bug-triage
+++ b/admin/notes/bug-triage
@@ -73,7 +73,7 @@ the ones that are not reproducible on the current release.
          know if you are able to?  If I don't hear back in a few
          weeks, I'll just close this bug as unreproducible."
      [ ] Check that the priority is reasonable.  Most bugs should be
-         marked as normal, but crashers and security issues can be
+         marked as normal, but crashes and security issues can be
          marked as serious.
   3. Your changes will take some time to take effect.  After a period of minutes
      to hours, you will get a mail telling you the control message has been
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index 7a26fe0e57..0463d068c2 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -2536,7 +2536,7 @@ ede-target
 @end deffn
 
 @deffn Method project-edit-file-target :AFTER ot
-Edit the target @var{OT} associated w/ this file.
+Edit the target @var{OT} associated with this file.
 @end deffn
 
 @deffn Method ede-documentation :AFTER this
@@ -3563,7 +3563,7 @@ project-am-target
 @end deffn
 
 @deffn Method project-edit-file-target :AFTER obj
-Edit the target associated w/ this file.
+Edit the target associated with this file.
 @end deffn
 
 @node project-am-objectcode
diff --git a/doc/misc/org.org b/doc/misc/org.org
index ae3ca0b64f..6ad8c462cc 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -16569,7 +16569,7 @@ identifying a reference in the bibliography.
 
 - Each key can be qualified by a /prefix/ (e.g.\nbsp{}"see ") and/or
   a /suffix/ (e.g.\nbsp{}"p.\nbsp{}123"), giving information useful or necessary
-  fo the comprehension of the citation but not included in the
+  for the comprehension of the citation but not included in the
   reference.
 
 - A single citation can cite more than one reference ; the keys are
diff --git a/doc/misc/srecode.texi b/doc/misc/srecode.texi
index a0cbf7e33f..d7356fef58 100644
--- a/doc/misc/srecode.texi
+++ b/doc/misc/srecode.texi
@@ -1595,7 +1595,7 @@ Template Naming Conventions
 
 NOTES ON THIS CHAPTER:
 
-These conventions are being worked on.  Check w/ CEDET-DEVEL mailing
+These conventions are being worked on.  Check with CEDET-DEVEL mailing
 list if you want to support a language, or write an application and
 provide your opinions on this topic.  Any help is appreciated.
 
diff --git a/etc/NEXTSTEP b/etc/NEXTSTEP
index dacbed2045..0570f70795 100644
--- a/etc/NEXTSTEP
+++ b/etc/NEXTSTEP
@@ -206,7 +206,7 @@ Release History
 				keys, fix border and box drawing, remove
 				glitches in modeline drawing, support
 				overstrike for unavailable bold fonts, fix XPM
-				related crasher bugs.  Incremental font
+				related crashes.  Incremental font
 				metrics caching and other performance
 				improvements.  Shared-lisp builds now possible.
 
diff --git a/etc/themes/dichromacy-theme.el b/etc/themes/dichromacy-theme.el
index fe44d520cc..c9d73983b5 100644
--- a/etc/themes/dichromacy-theme.el
+++ b/etc/themes/dichromacy-theme.el
@@ -39,7 +39,7 @@ dichromacy
       (bluegreen "#009e73")
       (yellow "#f8ec59")
       (blue "#0072b2")
-      (vermillion "#d55e00")
+      (vermilion "#d55e00")
       (redpurple "#cc79a7")
       (bluegray "#848ea9"))
   (custom-theme-set-faces
@@ -51,9 +51,9 @@ dichromacy
    `(highlight ((,class (:foreground ,blue :background "#e5e5e5"))))
    `(region ((,class (:foreground unspecified :background ,yellow))))
    `(secondary-selection ((,class (:background "#e5e5e5"))))
-   `(isearch ((,class (:foreground "white" :background ,vermillion))))
+   `(isearch ((,class (:foreground "white" :background ,vermilion))))
    `(lazy-highlight ((,class (:foreground "white" :background ,redpurple))))
-   `(trailing-whitespace ((,class (:background ,vermillion))))
+   `(trailing-whitespace ((,class (:background ,vermilion))))
    ;; Mode line faces
    `(mode-line ((,class (:box (:line-width -1 :style released-button)
 			      :background "#e5e5e5" :foreground "black"))))
@@ -62,17 +62,17 @@ dichromacy
 				       :foreground "black"))))
    ;; Escape and prompt faces
    `(minibuffer-prompt ((,class (:weight bold :foreground ,blue))))
-   `(escape-glyph ((,class (:foreground ,vermillion))))
-   `(homoglyph ((,class (:foreground ,vermillion))))
+   `(escape-glyph ((,class (:foreground ,vermilion))))
+   `(homoglyph ((,class (:foreground ,vermilion))))
    `(error ((,class (:weight bold :slant italic
-			     :foreground ,vermillion))))
+			     :foreground ,vermilion))))
    `(warning ((,class (:foreground ,orange))))
    `(success ((,class (:foreground ,bluegreen))))
    ;; Font lock faces
    `(font-lock-builtin-face ((,class (:foreground ,blue))))
    `(font-lock-comment-face ((,class (:slant italic :foreground ,bluegreen))))
-   `(font-lock-constant-face ((,class (:weight bold :foreground ,vermillion))))
-   `(font-lock-function-name-face ((,class (:foreground ,vermillion))))
+   `(font-lock-constant-face ((,class (:weight bold :foreground ,vermilion))))
+   `(font-lock-function-name-face ((,class (:foreground ,vermilion))))
    `(font-lock-keyword-face ((,class (:weight bold :foreground ,skyblue))))
    `(font-lock-string-face ((,class (:foreground ,bluegray))))
    `(font-lock-type-face ((,class (:weight bold :foreground ,blue))))
@@ -81,8 +81,8 @@ dichromacy
    `(link ((,class (:underline t :foreground ,blue))))
    `(link-visited ((,class (:underline t :foreground ,redpurple))))
    ;; Gnus faces
-   `(gnus-group-news-1 ((,class (:weight bold :foreground ,vermillion))))
-   `(gnus-group-news-1-low ((,class (:foreground ,vermillion))))
+   `(gnus-group-news-1 ((,class (:weight bold :foreground ,vermilion))))
+   `(gnus-group-news-1-low ((,class (:foreground ,vermilion))))
    `(gnus-group-news-2 ((,class (:weight bold :foreground ,orange))))
    `(gnus-group-news-2-low ((,class (:foreground ,orange))))
    `(gnus-group-news-3 ((,class (:weight bold :foreground ,skyblue))))
@@ -92,8 +92,8 @@ dichromacy
    `(gnus-group-news-5 ((,class (:weight bold :foreground ,blue))))
    `(gnus-group-news-5-low ((,class (:foreground ,blue))))
    `(gnus-group-news-low ((,class (:foreground ,bluegreen))))
-   `(gnus-group-mail-1 ((,class (:weight bold :foreground ,vermillion))))
-   `(gnus-group-mail-1-low ((,class (:foreground ,vermillion))))
+   `(gnus-group-mail-1 ((,class (:weight bold :foreground ,vermilion))))
+   `(gnus-group-mail-1-low ((,class (:foreground ,vermilion))))
    `(gnus-group-mail-2 ((,class (:weight bold :foreground ,orange))))
    `(gnus-group-mail-2-low ((,class (:foreground ,orange))))
    `(gnus-group-mail-3 ((,class (:weight bold :foreground ,skyblue))))
@@ -103,13 +103,13 @@ dichromacy
    `(gnus-header-from ((,class (:weight bold :foreground ,blue))))
    `(gnus-header-subject ((,class (:foreground ,orange))))
    `(gnus-header-name ((,class (:foreground ,skyblue))))
-   `(gnus-header-newsgroups ((,class (:foreground ,vermillion))))
+   `(gnus-header-newsgroups ((,class (:foreground ,vermilion))))
    ;; Image-Dired
-   `(image-dired-thumb-flagged ((,class (:background ,vermillion))))
+   `(image-dired-thumb-flagged ((,class (:background ,vermilion))))
    `(image-dired-thumb-mark ((,class (:background ,orange))))
    ;; Message faces
    `(message-header-name ((,class (:foreground ,skyblue))))
-   `(message-header-cc ((,class (:foreground ,vermillion))))
+   `(message-header-cc ((,class (:foreground ,vermilion))))
    `(message-header-other ((,class (:foreground ,bluegreen))))
    `(message-header-subject ((,class (:foreground ,orange))))
    `(message-header-to ((,class (:weight bold :foreground ,blue))))
@@ -122,8 +122,8 @@ dichromacy
 				  :slant unspecified :underline ,redpurple))))
    ;; ANSI color
    `(ansi-color-black ((,class (:background "black" :foreground "black"))))
-   `(ansi-color-red ((,class (:background ,vermillion
-			      :foreground ,vermillion))))
+   `(ansi-color-red ((,class (:background ,vermilion
+			      :foreground ,vermilion))))
    `(ansi-color-green ((,class (:background ,bluegreen
 				:foreground ,bluegreen))))
    `(ansi-color-yellow ((,class (:background ,yellow :foreground ,yellow))))
@@ -134,8 +134,8 @@ dichromacy
    `(ansi-color-white ((,class (:background "gray90" :foreground "gray90"))))
    `(ansi-color-bright-black ((,class (:background "black"
 				       :foreground "black"))))
-   `(ansi-color-bright-red ((,class (:background ,vermillion
-				     :foreground ,vermillion))))
+   `(ansi-color-bright-red ((,class (:background ,vermilion
+				     :foreground ,vermilion))))
    `(ansi-color-bright-green ((,class (:background ,bluegreen
 				       :foreground ,bluegreen))))
    `(ansi-color-bright-yellow ((,class (:background ,yellow
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index db27bd225d..0796965a9b 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -5551,7 +5551,7 @@
 	(cperl-next-interpolated-REx-1): Likewise.
 	"\C-c\C-x", "\C-c\C-y", "\C-c\C-v": New keybinding for these functions.
 	Perl/Regexp menu: 3 new entries for `cperl-next-interpolated-REx'.
-	(cperl-praise): Mention finded interpolated RExen.
+	(cperl-praise): Mention finding interpolated RExen.
 
 	After 5.19:
 	(cperl-init-faces): Highlight %$foo, @$foo too.
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15
index 9aa4caedfe..8a21c291e7 100644
--- a/lisp/ChangeLog.15
+++ b/lisp/ChangeLog.15
@@ -22575,7 +22575,7 @@
 
 2009-06-28  Juri Linkov  <juri@jurta.org>
 
-	* help-fns.el (describe-function-1): Correctly locate adviced
+	* help-fns.el (describe-function-1): Correctly locate advised
 	functions in hyperlink (Bug#2438).
 
 2009-06-28  Chong Yidong  <cyd@stupidchicken.com>
diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16
index 85f8cdd7b0..7b57c014d2 100644
--- a/lisp/ChangeLog.16
+++ b/lisp/ChangeLog.16
@@ -10931,7 +10931,7 @@
 
 2012-05-29  Aaron S. Hawley  <aaron.s.hawley@gmail.com>
 
-	* vc/vc.el (vc-revert, vc-rollback): Dont kill vc-diff buffer on
+	* vc/vc.el (vc-revert, vc-rollback): Don't kill vc-diff buffer on
 	revert (Bug#11488).
 
 2012-05-29  Juri Linkov  <juri@jurta.org>
diff --git a/lisp/cedet/ChangeLog.1 b/lisp/cedet/ChangeLog.1
index 7803fc7f0c..78275f4db3 100644
--- a/lisp/cedet/ChangeLog.1
+++ b/lisp/cedet/ChangeLog.1
@@ -1546,7 +1546,7 @@
 	(ede-proj-makefile-dependencies): Update pattern rule so that
 	resulting parsers are also byte-compiled.
 	(semantic-ede-grammar-compiler-bovine)
-	(semantic-ede-source-grammar-wisent): Remove .elc from gargage
+	(semantic-ede-source-grammar-wisent): Remove .elc from garbage
 	pattern, since this is already covered by the elisp compiler.
 	(project-compile-target): Add compatibility code for Emacs 23,
 	which does not have `byte-recompile-file'.
diff --git a/lisp/cedet/ede/makefile-edit.el b/lisp/cedet/ede/makefile-edit.el
index 1b424bc6d0..5aaa5b2687 100644
--- a/lisp/cedet/ede/makefile-edit.el
+++ b/lisp/cedet/ede/makefile-edit.el
@@ -35,7 +35,7 @@
 ;;    SOURCE always keep in the order of .c, .h, the other stuff.
 
 ;;; Things to do
-;; makefile-fill-paragraph -- refill a macro w/ backslashes
+;; makefile-fill-paragraph -- refill a macro with backslashes
 ;; makefile-insert-macro -- insert "foo = "
 
 
diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index 64f2651622..398e08a1a9 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -43,7 +43,7 @@
 (autoload 'ede-proj-target-scheme "ede/proj-scheme"
   "Target class for a group of lisp files." nil nil)
 (autoload 'ede-proj-target-makefile-miscelaneous "ede/proj-misc"
-  "Target class for a group of miscellaneous w/ a special makefile." nil nil)
+  "Target class for a group of miscellaneous with a special makefile." nil nil)
 (autoload 'ede-proj-target-makefile-program "ede/proj-prog"
   "Target class for building a program." nil nil)
 (autoload 'ede-proj-target-makefile-archive "ede/proj-archive"
@@ -67,7 +67,7 @@ 'ede-proj-target-scheme
   "Target class for a group of lisp files.")
 (eieio-defclass-autoload 'ede-proj-target-makefile-miscelaneous '(ede-proj-target-makefile)
   "ede/proj-misc"
-  "Target class for a group of miscellaneous w/ a special makefile.")
+  "Target class for a group of miscellaneous with a special makefile.")
 (eieio-defclass-autoload 'ede-proj-target-makefile-program '(ede-proj-target-makefile-objectcode)
   "ede/proj-prog"
   "Target class for building a program.")
diff --git a/lisp/cedet/ede/project-am.el b/lisp/cedet/ede/project-am.el
index de6936ad1a..75fde2043c 100644
--- a/lisp/cedet/ede/project-am.el
+++ b/lisp/cedet/ede/project-am.el
@@ -195,7 +195,7 @@ project-add-file
   "Add the current buffer into a project.
 _FILE is ignored.
 OT is the object target.  DIR is the directory to start in."
-  (let* ((target (if ede-object (error "Already associated w/ a target")
+  (let* ((target (if ede-object (error "Already associated with a target")
 		   (let ((amf (project-am-load default-directory)))
 		     (if (not amf) (error "No project file"))
 		     (completing-read "Target: "
@@ -231,7 +231,7 @@ project-remove-file
   (setq ede-object nil))
 
 (cl-defmethod project-edit-file-target ((obj project-am-target))
-  "Edit the target associated w/ this file."
+  "Edit the target associated with this file."
   (find-file (concat (oref obj path) "Makefile.am"))
   (goto-char (point-min))
   (makefile-move-to-macro (project-am-macro obj))
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index 3166279de4..adb4705620 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -186,13 +186,13 @@ semantic-parse-tree-state
   "State of the current parse tree.")
 
 (defmacro semantic-parse-tree-unparseable ()
-  "Indicate that the current buffer is unparseable.
+  "Indicate that the current buffer is unparsable.
 It is also true that the parse tree will need either updating or
 a rebuild.  This state will be changed when the user edits the buffer."
   '(setq semantic-parse-tree-state 'unparseable))
 
 (defmacro semantic-parse-tree-unparseable-p ()
-  "Return non-nil if the current buffer has been marked unparseable."
+  "Return non-nil if the current buffer has been marked unparsable."
   '(eq semantic-parse-tree-state 'unparseable))
 
 (defmacro semantic-parse-tree-set-needs-update ()
@@ -528,14 +528,14 @@ semantic-fetch-tags
 If the buffer has not been parsed before, or if the incremental reparse
 fails, then parse the entire buffer.
 If a lexical error had been previously discovered and the buffer
-was marked unparseable, then do nothing, and return the cache."
+was marked unparsable, then do nothing, and return the cache."
   (and
    ;; Is this a semantic enabled buffer?
    (semantic-active-p)
    ;; Application hooks say the buffer is safe for parsing
    (run-hook-with-args-until-failure
     'semantic--before-fetch-tags-hook)
-   ;; If the buffer was previously marked unparseable,
+   ;; If the buffer was previously marked unparsable,
    ;; then don't waste our time.
    (not (semantic-parse-tree-unparseable-p))
    ;; The parse tree actually needs to be refreshed
@@ -606,7 +606,7 @@ semantic-refresh-tags-safe
   ;; do them here, then all the bovination hooks are not run, and
   ;; we save lots of time.
   (cond
-   ;; If the buffer was previously marked unparseable,
+   ;; If the buffer was previously marked unparsable,
    ;; then don't waste our time.
    ((semantic-parse-tree-unparseable-p)
     nil)
diff --git a/lisp/cedet/semantic/analyze/fcn.el b/lisp/cedet/semantic/analyze/fcn.el
index af7da9cc63..ef372b5d8b 100644
--- a/lisp/cedet/semantic/analyze/fcn.el
+++ b/lisp/cedet/semantic/analyze/fcn.el
@@ -67,7 +67,7 @@ semantic-analyze-select-best-tag
   "For a SEQUENCE of tags, all with good names, pick the best one.
 If SEQUENCE is made up of namespaces, merge the namespaces together.
 If SEQUENCE has several prototypes, find the non-prototype.
-If SEQUENCE has some items w/ no type information, find the one with a type.
+If SEQUENCE has some items with no type information, find the one with a type.
 If SEQUENCE is all prototypes, or has no prototypes, get the first one.
 Optional TAGCLASS indicates to restrict the return to only
 tags of TAGCLASS."
diff --git a/lisp/cedet/semantic/bovine/c.el b/lisp/cedet/semantic/bovine/c.el
index d4ce20589e..5e08413a96 100644
--- a/lisp/cedet/semantic/bovine/c.el
+++ b/lisp/cedet/semantic/bovine/c.el
@@ -1344,7 +1344,7 @@ semantic-c-reconstitute-token
 	    :reentrant-flag (if (member "reentrant" (nth 6 tokenpart)) t)
 	    ;; A function post-const is funky.  Try stuff
 	    :methodconst-flag (if (member "const" (nth 6 tokenpart)) t)
-	    ;; prototypes are functions w/ no body
+            ;; prototypes are functions with no body
 	    :prototype-flag (if (nth 8 tokenpart) t)
 	    ;; Pure virtual
 	    :pure-virtual-flag (if (eq (nth 8 tokenpart) :pure-virtual-flag) t)
@@ -2015,7 +2015,7 @@ semantic-idle-summary-current-symbol-info
 	    (setq txt (concat txt (format "%S" arg)))
 	    (setq sv (cdr sv)))
 
-	  ;; This is optional, and potentially fraught w/ errors.
+          ;; This is optional, and potentially fraught with errors.
 	  (condition-case nil
 	      (dolist (lt sv)
 		(setq txt (concat txt " " (semantic-lex-token-text lt))))
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el
index dc270603a0..00fe081acb 100644
--- a/lisp/cedet/semantic/complete.el
+++ b/lisp/cedet/semantic/complete.el
@@ -667,7 +667,7 @@ semantic-complete-inline-exit
 		)
 	    (delete-overlay semantic-complete-inline-overlay)
 	    (setq semantic-complete-inline-overlay nil)
-	    ;; DONT restore the window configuration if we just
+	    ;; DON'T restore the window configuration if we just
 	    ;; switched windows!
 	    (when (eq buf (current-buffer))
 	      (set-window-configuration wc))
diff --git a/lisp/cedet/semantic/db-ebrowse.el b/lisp/cedet/semantic/db-ebrowse.el
index f0e1d9f029..fa608c7c46 100644
--- a/lisp/cedet/semantic/db-ebrowse.el
+++ b/lisp/cedet/semantic/db-ebrowse.el
@@ -275,7 +275,7 @@ semanticdb-ebrowse-get-ebrowse-structure
       (let ((ans nil)
 	    (efcn (symbol-function 'ebrowse-show-progress)))
         (fset 'ebrowse-show-progress (lambda (&rest _junk) nil))
-	(unwind-protect ;; Protect against errors w/ ebrowse
+        (unwind-protect ; Protect against errors with ebrowse
 	    (setq ans (list B (ebrowse-read)))
 	  ;; These items must always happen
 	  (erase-buffer)
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index 3012af41c5..e9d5aaa177 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -1277,7 +1277,7 @@ semanticdb-brute-find-tags-by-class
 ;;; Specialty Search Routines
 (defun semanticdb-find-tags-external-children-of-type
   (type &optional path find-file-match)
-  "Search for all tags defined outside of TYPE w/ TYPE as a parent.
+  "Search for all tags defined outside of TYPE with TYPE as a parent.
 See `semanticdb-find-translate-path' for details on PATH.
 FIND-FILE-MATCH indicates that any time a match is found, the file
 associated with that tag should be loaded into a buffer."
diff --git a/lisp/cedet/semantic/decorate/include.el b/lisp/cedet/semantic/decorate/include.el
index 144e2ce018..fe510c371e 100644
--- a/lisp/cedet/semantic/decorate/include.el
+++ b/lisp/cedet/semantic/decorate/include.el
@@ -330,7 +330,7 @@ semantic-decoration-on-includes-highlight-default
 	)
       ))
 
-    ;; @TODO - if not a tag w/ a position, we need to get one.  How?
+    ;; @TODO - if not a tag with a position, we need to get one.  How?
 
     (when (semantic-tag-with-position-p tag)
       (let ((ol (semantic-decorate-tag tag
diff --git a/lisp/cedet/semantic/edit.el b/lisp/cedet/semantic/edit.el
index 4efc283520..d752ecdf38 100644
--- a/lisp/cedet/semantic/edit.el
+++ b/lisp/cedet/semantic/edit.el
@@ -40,7 +40,7 @@
 ;;    of themselves that can be edited w/out affecting the definition of
 ;;    that tag.
 ;;
-;; 2. Tags w/ positioned children could have a property of an
+;; 2. Tags with positioned children could have a property of an
 ;;    overlay marking the region in themselves that contain the
 ;;    children.  This could be used to better improve splicing near
 ;;    the beginning and end of the child lists.
diff --git a/lisp/cedet/semantic/idle.el b/lisp/cedet/semantic/idle.el
index 2d6f26919d..e53dd9104a 100644
--- a/lisp/cedet/semantic/idle.el
+++ b/lisp/cedet/semantic/idle.el
@@ -396,7 +396,7 @@ semantic-idle-work-core-handler
 	      (semanticdb-save-all-db-idle)
 	      )
 
-	    ;; Done w/ processing
+            ;; Done with processing
 	    nil))))
 
     ;; Done
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el
index 50d7c8adf1..45964a1a17 100644
--- a/lisp/cedet/semantic/scope.el
+++ b/lisp/cedet/semantic/scope.el
@@ -577,7 +577,7 @@ semantic-analyze-scoped-type-parts
 	    (if (semantic-tag-file-name TAG)
 		;; If it has a filename, just go with it...
 		(setq copyslots (cons TAG copyslots))
-	      ;; Otherwise, copy the tag w/ the guessed filename.
+              ;; Otherwise, copy the tag with the guessed filename.
 	      (setq copyslots (cons (semantic-tag-copy TAG nil fname)
 				    copyslots)))
 	    )
diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el
index 013864f81c..1cb5d5b04a 100644
--- a/lisp/cedet/semantic/symref/list.el
+++ b/lisp/cedet/semantic/symref/list.el
@@ -51,7 +51,7 @@ semantic-symref
   (let ((ct (semantic-current-tag)))
     ;; Must have a tag...
     (when (not ct) (error "Place cursor inside tag to be searched for"))
-    ;; Check w/ user.
+    ;; Check with user.
     (when (not (y-or-n-p (format "Find references for %s? "
                                  (semantic-tag-name ct))))
       (error "Quit"))
diff --git a/lisp/cedet/semantic/util-modes.el b/lisp/cedet/semantic/util-modes.el
index 96d1de5a26..bcded23aec 100644
--- a/lisp/cedet/semantic/util-modes.el
+++ b/lisp/cedet/semantic/util-modes.el
@@ -133,7 +133,7 @@ semantic-add-minor-mode
                                        semantic-minor-mode-alist))))
   (semantic-mode-line-update)
 
-  ;; Semantic minor modes don't work w/ Desktop restore.
+  ;; Semantic minor modes don't work with Desktop restore.
   ;; This line will disable this minor mode from being restored
   ;; by Desktop.
   (when (boundp 'desktop-minor-mode-handlers)
diff --git a/lisp/cedet/srecode/document.el b/lisp/cedet/srecode/document.el
index a25d1441f1..c264ebaa70 100644
--- a/lisp/cedet/srecode/document.el
+++ b/lisp/cedet/srecode/document.el
@@ -29,7 +29,8 @@
 ;;
 ;;; Origins:
 ;;
-;; Document was first written w/ cparse, a custom regexp based c parser.
+;; Document was first written with cparse, a custom regexp based c
+;; parser.
 ;;
 ;; Document was then ported to cedet/semantic using sformat (super
 ;; format) as the templating engine.
diff --git a/lisp/cedet/srecode/extract.el b/lisp/cedet/srecode/extract.el
index 7d4539dcb4..f218f1c6e9 100644
--- a/lisp/cedet/srecode/extract.el
+++ b/lisp/cedet/srecode/extract.el
@@ -219,7 +219,7 @@ srecode-inserter-extract
       ;; With a name, do the insertion.
       (let ((subdict (srecode-dictionary-add-section-dictionary
 		      dict (oref ins object-name))))
-	(error "Need to implement include w/ name extractor")
+        (error "Need to implement include with name extractor")
 	;; Recurse into the new template while no errors.
 	(while (condition-case nil
 		   (progn
diff --git a/lisp/cedet/srecode/semantic.el b/lisp/cedet/srecode/semantic.el
index ea7fda004e..c5ceb89d2d 100644
--- a/lisp/cedet/srecode/semantic.el
+++ b/lisp/cedet/srecode/semantic.el
@@ -43,8 +43,8 @@
 
 ;;; The SEMANTIC TAG inserter
 ;;
-;; Put a tag into the dictionary that can be used w/ arbitrary
-;; lisp expressions.
+;; Put a tag into the dictionary that can be used with arbitrary
+;; Lisp expressions.
 
 (defclass srecode-semantic-tag (srecode-dictionary-compound-value)
   ((prime :initarg :prime
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 3f9bc28e0b..3bddb93b64 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -2265,8 +2265,8 @@ checkdoc-ispell-docstring-engine
             (unless (and sym (or (boundp sym) (fboundp sym)))
               ;; Find out how we spell-check this word.
               (unless (or
-                       ;; All caps w/ option th, or s tacked on the end
-                       ;; for pluralization or number.
+                       ;; All caps with option th, or s tacked on the
+                       ;; end for pluralization or number.
                        (string-match "^[A-Z][A-Z]+\\(s\\|th\\)?$" word)
                        (looking-at "}") ; a keymap expression
                        )
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 9e2bd106cb..6dc47000fa 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -659,7 +659,7 @@ package-vc-install
 the package's repository; this is only possible if NAME-OR-URL is a URL,
 a string.  If BACKEND is omitted or nil, the function
 uses `package-vc-heuristic-alist' to guess the backend.
-Note that by default, a source package will be prioritised over a
+Note that by default, a source package will be prioritized over a
 regular package, but it will not remove a source package."
   (interactive
    (progn
diff --git a/lisp/erc/ChangeLog.1 b/lisp/erc/ChangeLog.1
index 89c24758cb..64231f365e 100644
--- a/lisp/erc/ChangeLog.1
+++ b/lisp/erc/ChangeLog.1
@@ -11075,7 +11075,8 @@
 	stay at your current version. It seems fairly stable though.
 	That changed? erc-buffer-name handling was completely rewritten,
 	and erc-buffer-list local variable handling removed.
-	Simplifies alot of code. Poke at it. read the diff. report bug/send patches!
+	Simplifies a lot of code.  Poke at it.  Read the diff.  Report
+	bug/send patches!
 
 	* erc.el: * Added variable listing when /set is used without args
 
@@ -11448,7 +11449,7 @@
 2001-10-03  Mario Lang  <mlang@delysid.org>
 
 	* erc.el:
-	* Removed alot of (progn ...) where they were not necessary
+	* Removed a lot of (progn ...) where they were not necessary
 	* Changed some (if ...) without else part to (when ...)
 	* Some (while ...) to use (dolist ...)
 	* Fix for completion popup generating tracebacks.
diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el
index bb928fc5fb..950922ea7f 100644
--- a/lisp/eshell/esh-proc.el
+++ b/lisp/eshell/esh-proc.el
@@ -552,7 +552,7 @@ eshell-round-robin-kill
 	(setq sigs (cdr sigs))))))
 
 (defun eshell-query-kill-processes ()
-  "Kill processes belonging to the current Eshell buffer, possibly w/ query."
+  "Kill processes belonging to the current Eshell buffer, possibly with query."
   (when (and eshell-kill-processes-on-exit
 	     eshell-process-list)
     (save-window-excursion
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index e8291cfe6f..ebd0adf2e2 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -1446,7 +1446,7 @@ mml-attach-file
     (mml-insert-empty-tag 'part
 			  'type type
 			  ;; icicles redefines read-file-name and returns a
-			  ;; string w/ text properties :-/
+                          ;; string with text properties :-/
 			  'filename (substring-no-properties file)
 			  'disposition (or disposition "attachment")
 			  'description description)
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index eb6a071bf4..97d20cca15 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -2766,7 +2766,7 @@ feedmail-fiddle-date
   (cond
    ;; nil means do nothing
    ((eq nil feedmail-date-generator) nil)
-   ;; t is the same a using the function feedmail-default-date-generator, so let it and recurse
+   ;; t is the same as using the function feedmail-default-date-generator, so let it and recurse
    ((eq t feedmail-date-generator)
     (let ((feedmail-date-generator (feedmail-default-date-generator maybe-file)))
       (feedmail-fiddle-date maybe-file)))
@@ -2822,7 +2822,7 @@ feedmail-fiddle-message-id
   (cond
    ;; nil means do nothing
    ((eq nil feedmail-message-id-generator) nil)
-   ;; t is the same a using the function feedmail-default-message-id-generator, so let it and recurse
+   ;; t is the same as using the function feedmail-default-message-id-generator, so let it and recurse
    ((eq t feedmail-message-id-generator)
     (let ((feedmail-message-id-generator (feedmail-default-message-id-generator maybe-file)))
       (feedmail-fiddle-message-id maybe-file)))
@@ -2864,7 +2864,7 @@ feedmail-fiddle-x-mailer
   (cond
    ;; nil means do nothing
    ((eq nil feedmail-x-mailer-line) nil)
-   ;; t is the same a using the function feedmail-default-x-mailer-generator, so let it and recurse
+   ;; t is the same as using the function feedmail-default-x-mailer-generator, so let it and recurse
    ((eq t feedmail-x-mailer-line)
     (let ((feedmail-x-mailer-line (feedmail-default-x-mailer-generator)))
       (feedmail-fiddle-x-mailer)))
diff --git a/lisp/mail/rfc6068.el b/lisp/mail/rfc6068.el
index 54035b6698..4863f3582c 100644
--- a/lisp/mail/rfc6068.el
+++ b/lisp/mail/rfc6068.el
@@ -43,9 +43,9 @@ rfc6068-unhexify-string
 
 (defun rfc6068-parse-mailto-url (mailto-url)
   "Parse MAILTO-URL, and return an alist of header-name, header-value pairs.
-MAILTO-URL should be a RFC 6068 (mailto) compliant url.  A cons cell w/ a
+MAILTO-URL should be a RFC 6068 (mailto) compliant url.  A cons cell with a
 key of `Body' is a special case and is considered a header for this purpose.
-The returned alist is intended for use w/ the `compose-mail' interface.
+The returned alist is intended for use with the `compose-mail' interface.
 Note: make sure MAILTO-URL has been \"unhtmlized\" (e.g., &amp; -> &), before
 calling this function."
   (let ((case-fold-search t)
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index e3372a6ff4..2421b283e6 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2599,7 +2599,7 @@ rmail-unknown-mail-followup-to
   "Handle a \"Mail-Followup-To\" header field with an unknown mailing list.
 Ask the user whether to add that list name to `mail-mailing-lists'."
   ;; FIXME s-r not needed?  Use rmail-get-header?
-  ;; We have not narrowed to the headers at ths point?
+  ;; We have not narrowed to the headers at this point?
    (save-restriction
      (let ((mail-followup-to (mail-fetch-field "mail-followup-to" nil t)))
        (when mail-followup-to
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index 98f46a3af5..558785de14 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -1350,7 +1350,7 @@ sc-guess-nesting
      nesting)))
 
 (defun sc-add-citation-level ()
-  "Add a citation level for nested citation style w/ coercion."
+  "Add a citation level for nested citation style with coercion."
   (let* ((nesting (sc-guess-nesting))
 	 (citation (make-string (1+ (length nesting))
 				(string-to-char sc-citation-delimiter)))
diff --git a/lisp/man.el b/lisp/man.el
index 9dd247cc31..3802362da0 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -331,7 +331,7 @@ Man-see-also-regexp
 ;; This used to have leading space [ \t]*, but was removed because it
 ;; causes false page splits on an occasional NAME with leading space
 ;; inside a manpage.  And `Man-heading-regexp' doesn't have [ \t]* anyway.
-(defvar Man-first-heading-regexp "^NAME$\\|^[ \t]*No manual entry fo.*$"
+(defvar Man-first-heading-regexp "^NAME$\\|^[ \t]*No manual entry for.*$"
   "Regular expression describing first heading on a manpage.
 This regular expression should start with a `^' character.")
 
diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1
index 6cc76db8df..1491a4645a 100644
--- a/lisp/org/ChangeLog.1
+++ b/lisp/org/ChangeLog.1
@@ -10556,7 +10556,7 @@
 	* org-element.el (org-element-paragraph-separate): Fix comments in
 	paragraph separator regexp.  Optimize it.
 
-	* org-element.el: Update code commets.
+	* org-element.el: Update code comments.
 
 	* org.el (org-mark-subtree): Fix bug when marking subtree with
 	point on an inlinetask.  Refactor code.
@@ -24341,7 +24341,7 @@
 2010-07-19  Bernt Hansen  <bernt@norang.ca>
 
 	* org.el (org-time-string-to-absolute): Ignore cyclic repeater
-	when displaying items on todays agenda date.
+	when displaying items on today's agenda date.
 
 2010-07-19  Carsten Dominik  <carsten.dominik@gmail.com>
 
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index c2d7fc309d..9555d21b00 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -1238,7 +1238,7 @@ eglot--connect
            :request-dispatcher (funcall spread #'eglot-handle-request)
            :on-shutdown #'eglot--on-shutdown
            initargs))
-         (cancelled nil)
+         (canceled nil)
          (tag (make-symbol "connected-catch-tag")))
     (when server-info
       (jsonrpc--debug server "Running language server: %s"
@@ -1277,7 +1277,7 @@ eglot--connect
                             :workspaceFolders (eglot-workspace-folders server))
                       :success-fn
                       (eglot--lambda ((InitializeResult) capabilities serverInfo)
-                        (unless cancelled
+                        (unless canceled
                           (push server
                                 (gethash project eglot--servers-by-project))
                           (setf (eglot--capabilities server) capabilities)
@@ -1315,13 +1315,13 @@ eglot--connect
                           (when tag (throw tag t))))
                       :timeout eglot-connect-timeout
                       :error-fn (eglot--lambda ((ResponseError) code message)
-                                  (unless cancelled
+                                  (unless canceled
                                     (jsonrpc-shutdown server)
                                     (let ((msg (format "%s: %s" code message)))
                                       (if tag (throw tag `(error . ,msg))
                                         (eglot--error msg)))))
                       :timeout-fn (lambda ()
-                                    (unless cancelled
+                                    (unless canceled
                                       (jsonrpc-shutdown server)
                                       (let ((msg (format "Timed out after %s seconds"
                                                          eglot-connect-timeout)))
@@ -1338,7 +1338,7 @@ eglot--connect
                                       (jsonrpc-name server))
                       nil)
                 (_ server)))
-          (quit (jsonrpc-shutdown server) (setq cancelled 'quit)))
+          (quit (jsonrpc-shutdown server) (setq canceled 'quit)))
       (setq tag nil))))
 
 (defun eglot--inferior-bootstrap (name contact &optional connect-args)
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index 00507a3c1a..655dd6a5d9 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -276,7 +276,7 @@ hs-special-modes-alist
 defined as text surrounded by START and END.
 
 As a special case, START may be a list of the form (COMPLEX-START
-MDATA-SELECTOR), where COMPLEX-START is a regexp w/ multiple parts and
+MDATA-SELECTOR), where COMPLEX-START is a regexp with multiple parts and
 MDATA-SELECTOR an integer that specifies which sub-match is the proper
 place to adjust point, before calling `hs-forward-sexp-func'.  Point
 is adjusted to the beginning of the specified match.  For example,
@@ -576,7 +576,7 @@ hs-looking-at-block-start-p
        (save-match-data (not (nth 8 (syntax-ppss))))))
 
 (defun hs-forward-sexp (match-data arg)
-  "Adjust point based on MATCH-DATA and call `hs-forward-sexp-func' w/ ARG.
+  "Adjust point based on MATCH-DATA and call `hs-forward-sexp-func' with ARG.
 Original match data is restored upon return."
   (save-match-data
     (set-match-data match-data)
diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el
index f87230bd2f..58cb48f182 100644
--- a/lisp/progmodes/prog-mode.el
+++ b/lisp/progmodes/prog-mode.el
@@ -155,7 +155,7 @@ prettify-symbols-alist
 third argument of `compose-region'.")
 
 (defun prettify-symbols-default-compose-p (start end _match)
-  "Return non-nil iff the symbol MATCH should be composed.
+  "Return non-nil if the symbol MATCH should be composed.
 The symbol starts at position START and ends at position END.
 This is the default for `prettify-symbols-compose-predicate'
 which is suitable for most programming languages such as C or Lisp."
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el
index 310a9be4f6..e5458e6a07 100644
--- a/lisp/progmodes/verilog-mode.el
+++ b/lisp/progmodes/verilog-mode.el
@@ -7719,7 +7719,7 @@ 'verilog--complete-with-action
                           (setq match t)
                           (setq elm nil))
                       (setq elm (cdr elm)))))
-                ;; If this is a test just for exact match, return nil ot t
+                ;; If this is a test just for exact match, return nil or t
                 (if (and (equal flag 'lambda) (not (equal match 't)))
                     nil
                   match))))
diff --git a/lisp/subr.el b/lisp/subr.el
index a42b61d9b6..261ec512d8 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2584,7 +2584,7 @@ major-mode-suspend
 (defun major-mode-restore (&optional avoided-modes)
   "Restore major mode earlier suspended with `major-mode-suspend'.
 If there was no earlier suspended major mode, then fallback to `normal-mode',
-tho trying to avoid AVOIDED-MODES."
+though trying to avoid AVOIDED-MODES."
   (if major-mode--suspended
       (funcall (prog1 major-mode--suspended
                  (kill-local-variable 'major-mode--suspended)))
diff --git a/lisp/url/ChangeLog.1 b/lisp/url/ChangeLog.1
index 2f7813e64c..1b5ddc1e76 100644
--- a/lisp/url/ChangeLog.1
+++ b/lisp/url/ChangeLog.1
@@ -366,7 +366,7 @@
 	* url.el, url-queue.el, url-parse.el, url-http.el, url-future.el:
 	* url-dav.el, url-cookie.el: Use cl-lib.
 	* url-util.el, url-privacy.el, url-nfs.el, url-misc.el, url-methods.el:
-	* url-gw.el, url-file.el, url-expand.el: Dont use CL.
+	* url-gw.el, url-file.el, url-expand.el: Don't use CL.
 
 2012-06-30  Glenn Morris  <rgm@gnu.org>
 
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index a4345c7d7e..c41835e19f 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -1192,7 +1192,7 @@ vc-rcs-set-default-branch
 (defun vc-rcs-parse (&optional buffer)
   "Parse current buffer, presumed to be in RCS-style masterfile format.
 Optional arg BUFFER specifies another buffer to parse.  Return an alist
-of two elements, w/ keys `headers' and `revisions' and values in turn
+of two elements, with keys `headers' and `revisions' and values in turn
 sub-alists.  For `headers', the values unless otherwise specified are
 strings and the keys are:
 
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 1ec09d0a81..a00ca453ca 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -11988,7 +11988,7 @@
 
 	* cmds.c (nonundocount): New global variable.
 	(keys_of_cmds): Initialize it.
-	(Fself_insert_command): Use it to combine upto 20 sequential chars
+	(Fself_insert_command): Use it to combine up to 20 sequential chars
 	into a single undo entry, just like the Qself_insert_command code in
 	keyboard.c does.
 	Call frame_make_pointer_invisible, also like the Qself_insert_command
diff --git a/src/ChangeLog.12 b/src/ChangeLog.12
index cb373803a0..7f77c0ca07 100644
--- a/src/ChangeLog.12
+++ b/src/ChangeLog.12
@@ -14132,7 +14132,7 @@
 	(coding_set_destination): Return how many bytes
 	coding->destination was relocated.
 	(CODING_DECODE_CHAR, CODING_ENCODE_CHAR, CODING_CHAR_CHARSET)
-	(CODING_CHAR_CHARSET_P): Adjust for the avove changes.
+	(CODING_CHAR_CHARSET_P): Adjust for the above changes.
 
 2011-12-05  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny change)
 
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index effdf8a7ac..c0e3523c64 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -3155,7 +3155,7 @@
 
 	* xdisp.c (resize_mini_window): Don't resize if
 	Vmax_mini_window_height is nil.  Otherwise, use a default if
-	Vmax_mini_window_height is not ot a number.
+	Vmax_mini_window_height is not a number.
 	(syms_of_xdisp): Extend documentation of Vmax_mini_window_height.
 
 1999-08-25  Alexandre Oliva  <oliva@dcc.unicamp.br>
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 1c74180f15..440142757e 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -422,7 +422,7 @@ xd_signature (char *signature, int dtype, int parent_type, Lisp_Object object)
     case DBUS_TYPE_STRING:
     case DBUS_TYPE_OBJECT_PATH:
     case DBUS_TYPE_SIGNATURE:
-      /* We dont check the syntax of signature.  This will be done by
+      /* We don't check the syntax of signature.  This will be done by
 	 libdbus.  */
       if (dtype == DBUS_TYPE_OBJECT_PATH)
 	XD_DBUS_VALIDATE_PATH (object)
@@ -748,7 +748,7 @@ xd_append_arg (int dtype, Lisp_Object object, DBusMessageIter *iter)
       case DBUS_TYPE_STRING:
       case DBUS_TYPE_OBJECT_PATH:
       case DBUS_TYPE_SIGNATURE:
-	/* We dont check the syntax of signature.  This will be done
+	/* We don't check the syntax of signature.  This will be done
 	   by libdbus.  */
 	if (dtype == DBUS_TYPE_OBJECT_PATH)
 	  XD_DBUS_VALIDATE_PATH (object)
diff --git a/src/font.h b/src/font.h
index 3475189206..d36c45a53c 100644
--- a/src/font.h
+++ b/src/font.h
@@ -220,13 +220,13 @@ #define FONT_SLANT_FOR_FACE(font)	\
 #define FONT_WIDTH_FOR_FACE(font)	\
   font_style_symbolic (font, FONT_WIDTH_INDEX, true)
 
-/* Return the numeric weight value corresponding ot the symbol NAME.  */
+/* Return the numeric weight value corresponding to the symbol NAME.  */
 #define FONT_WEIGHT_NAME_NUMERIC(name)	\
   (font_style_to_value (FONT_WEIGHT_INDEX, (name), false) >> 8)
-/* Return the numeric slant value corresponding ot the symbol NAME.  */
+/* Return the numeric slant value corresponding to the symbol NAME.  */
 #define FONT_SLANT_NAME_NUMERIC(name)	\
   (font_style_to_value (FONT_SLANT_INDEX, (name), false) >> 8)
-/* Return the numeric width value corresponding ot the symbol NAME.  */
+/* Return the numeric width value corresponding to the symbol NAME.  */
 #define FONT_WIDTH_NAME_NUMERIC(name)	\
   (font_style_to_value (FONT_WIDTH_INDEX, (name), false) >> 8)
 
diff --git a/src/itree.c b/src/itree.c
index abd060d6fb..04fa9e827a 100644
--- a/src/itree.c
+++ b/src/itree.c
@@ -1389,7 +1389,7 @@ itree_iterator_start (struct itree_iterator *iter,
   iter->end = end;
   iter->otick = tree->otick;
   iter->order = order;
-  /* Beware: the `node` field alwyas holds "the next" node to consider.
+  /* Beware: the `node` field always holds "the next" node to consider.
      so it's always "one node ahead" of what the iterator loop sees.
      In most respects this makes no difference, but we depend on this
      detail in `delete_all_overlays` where this allows us to modify
diff --git a/src/xselect.c b/src/xselect.c
index 9480ac18c1..a381fa2352 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -967,7 +967,7 @@ x_handle_selection_request (struct selection_input_event *event)
    x_reply_selection_request.  If FOR_MULTIPLE, write out
    the data even if conversion fails, using conversion_fail_tag.
 
-   Return true iff successful.  */
+   Return true if successful.  */
 
 static bool
 x_convert_selection (Lisp_Object selection_symbol,
diff --git a/src/xsettings.c b/src/xsettings.c
index f1ee84a1a0..00b67539d4 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -766,7 +766,7 @@ parse_settings (unsigned char *prop,
 #ifndef HAVE_PGTK
 /* Read settings from the XSettings property window on display for DPYINFO.
    Store settings read in SETTINGS.
-   Return true iff successful.  */
+   Return true if successful.  */
 
 static bool
 read_settings (Display_Info *dpyinfo, struct xsettings *settings)
diff --git a/test/lisp/auth-source-pass-tests.el b/test/lisp/auth-source-pass-tests.el
index 8bcb2739bb..6e6671efca 100644
--- a/test/lisp/auth-source-pass-tests.el
+++ b/test/lisp/auth-source-pass-tests.el
@@ -59,7 +59,7 @@ auth-source-pass--debug-log
   "Contains a list of all messages passed to `auth-source-do-debug'.")
 
 (defun auth-source-pass--have-message-matching (regexp)
-  "Return non-nil iff at least one `auth-source-do-debug' match REGEXP."
+  "Return non-nil if at least one `auth-source-do-debug' match REGEXP."
   (seq-find (lambda (message)
               (string-match regexp message))
             auth-source-pass--debug-log))
@@ -109,7 +109,7 @@ auth-source-pass--explain-match-entry-p
 (put 'auth-source-pass-match-entry-p 'ert-explainer #'auth-source-pass--explain-match-entry-p)
 
 (defun auth-source-pass--includes-sorted-entries (entries hostname &optional user port)
-  "Return non-nil iff ENTRIES matching the parameters are found in store.
+  "Return non-nil if ENTRIES matching the parameters are found in store.
 ENTRIES should be sorted from most specific to least specific.
 
 HOSTNAME, USER and PORT are passed unchanged to
@@ -157,7 +157,7 @@ auth-source-pass--matching-entries
             (auth-source-pass--generate-entry-suffixes hostname user port))))
 
 (defun auth-source-pass-match-entry-p (entry hostname &optional user port)
-  "Return non-nil iff an ENTRY matching the parameters is found in store.
+  "Return non-nil if an ENTRY matching the parameters is found in store.
 
 HOSTNAME, USER and PORT are passed unchanged to
 `auth-source-pass--matching-entries'."
@@ -166,7 +166,7 @@ auth-source-pass-match-entry-p
    (auth-source-pass--matching-entries hostname user port)))
 
 (defun auth-source-pass-match-any-entry-p (hostname &optional user port)
-  "Return non-nil iff there is at least one entry matching the parameters.
+  "Return non-nil if there is at least one entry matching the parameters.
 
 HOSTNAME, USER and PORT are passed unchanged to
 `auth-source-pass--matching-entries'."
diff --git a/test/lisp/cedet/srecode/fields-tests.el b/test/lisp/cedet/srecode/fields-tests.el
index 292ac4e3b5..c9e0d4601b 100644
--- a/test/lisp/cedet/srecode/fields-tests.el
+++ b/test/lisp/cedet/srecode/fields-tests.el
@@ -66,7 +66,7 @@ srecode-field-utest-impl
 
       (when (and (overlayp (oref f overlay))
 		 (not (overlay-get (oref f overlay) 'srecode-init-only)))
-	(error "Field creation overlay is not tagged w/ init flag"))
+        (error "Field creation overlay is not tagged with init flag"))
 
       (srecode-overlaid-activate f)
 
diff --git a/test/lisp/net/dbus-tests.el b/test/lisp/net/dbus-tests.el
index 558799286f..c808e6350e 100644
--- a/test/lisp/net/dbus-tests.el
+++ b/test/lisp/net/dbus-tests.el
@@ -407,7 +407,7 @@ dbus-test01-compound-types
     :session dbus--test-service
     '(:array (:dict-entry :string "string" :boolean t :boolean t)))
    :type 'wrong-type-argument)
-  ;; The first element ist not of a basic type.
+  ;; The first element is not of a basic type.
   (should-error
    (dbus-check-arguments
     :session dbus--test-service
diff --git a/test/lisp/vc/vc-tests.el b/test/lisp/vc/vc-tests.el
index dc4d3af699..13248a3650 100644
--- a/test/lisp/vc/vc-tests.el
+++ b/test/lisp/vc/vc-tests.el
@@ -127,7 +127,7 @@ vc-test--revision-granularity-function
 
 (defun vc-test--create-repo-function (backend)
   "Run the `vc-create-repo' backend function.
-For backends which dont support it, it is emulated."
+For backends which don't support it, it is emulated."
 
   (cond
    ((eq backend 'CVS)
diff --git a/test/src/comp-resources/comp-test-funcs.el b/test/src/comp-resources/comp-test-funcs.el
index 9092f040c8..03925d4d2e 100644
--- a/test/src/comp-resources/comp-test-funcs.el
+++ b/test/src/comp-resources/comp-test-funcs.el
@@ -211,10 +211,10 @@ comp-tests-condition-case-0-f
       (comp-tests-err-arith-f)
     (arith-error (concat "arith-error "
                          (error-message-string err)
-                         " catched"))
+                         " caught"))
     (error (concat "error "
                    (error-message-string err)
-                   " catched"))))
+                   " caught"))))
 (defun comp-tests-condition-case-1-f ()
   ;; Bpushhandler Bpophandler
   (condition-case
@@ -222,10 +222,10 @@ comp-tests-condition-case-1-f
       (comp-tests-err-foo-f)
     (arith-error (concat "arith-error "
                          (error-message-string err)
-                         " catched"))
+                         " caught"))
     (error (concat "error "
                    (error-message-string err)
-                   " catched"))))
+                   " caught"))))
 (defun comp-tests-catch-f (f)
   (catch 'foo
     (funcall f)))
diff --git a/test/src/comp-tests.el b/test/src/comp-tests.el
index 734b4a0d22..4e512098a3 100644
--- a/test/src/comp-tests.el
+++ b/test/src/comp-tests.el
@@ -298,9 +298,9 @@ stack
 (comp-deftest non-locals ()
   "Test non locals."
   (should (string= (comp-tests-condition-case-0-f)
-                   "arith-error Arithmetic error catched"))
+                   "arith-error Arithmetic error caught"))
   (should (string= (comp-tests-condition-case-1-f)
-                   "error Foo catched"))
+                   "error Foo caught"))
   (should (= (comp-tests-catch-f
               (lambda () (throw 'foo 3)))
              3))
diff --git a/test/src/eval-tests.el b/test/src/eval-tests.el
index bb2f04e8ee..0e12e4dbd8 100644
--- a/test/src/eval-tests.el
+++ b/test/src/eval-tests.el
@@ -222,7 +222,7 @@ eval-tests/backtrace-in-batch-mode/demoted-errors
 
 (ert-deftest eval-tests/funcall-with-delayed-message ()
   ;; Check that `funcall-with-delayed-message' displays its message before
-  ;; its function terminates iff the timeout is short enough.
+  ;; its function terminates if the timeout is short enough.
 
   ;; This also serves as regression test for bug#55628 where a short
   ;; timeout was rounded up to the next whole second.

commit 6082ab9697fa8c18e9049d24840d07efe6f95625
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Sun Nov 20 12:25:54 2022 +0100

    ; Add .no-advice-on-failure to .gitignore
    
    This is for the new "disable advice on failure" feature added by
    Gregory Heytings <gregory@heytings.org>.
    * .gitignore: Add .no-advice-on-failure.

diff --git a/.gitignore b/.gitignore
index a7828d3386..e6310b644a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@
 
 # Personal customization.
 .dir-locals-2.el
+.no-advice-on-failure
 
 # Built by 'autogen.sh'.
 /aclocal.m4

commit 50e6bc72c21701cdd99c314e3d2948fbc0724e04
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sun Nov 20 13:51:22 2022 +0200

    ; * lisp/proced.el (proced-auto-update-timer): Fix last change.

diff --git a/lisp/proced.el b/lisp/proced.el
index 67c1cf48c1..ac44ae1513 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -746,8 +746,8 @@ proced-auto-update-timer
   (unless (seq-filter (lambda (buf)
                         (with-current-buffer buf
                           (when (eq major-mode 'proced-mode)
-                            (when proced-auto-update-flag
-                              (proced-update t t))
+                            (if proced-auto-update-flag
+                                (proced-update t t))
                             t)))
                       (buffer-list))
     (cancel-timer proced-auto-update-timer)

commit 07705f5ddc35e8788dbe953e3491a132c4a3f2e7
Author: Laurence Warne <laurencewarne@gmail.com>
Date:   Tue Nov 15 18:48:40 2022 +0000

    Cancel proced auto update timer if no proced buffers are open
    
    * lisp/proced.el (proced-auto-update-timer): Cancel timer if no proced
    buffers are open.

diff --git a/lisp/proced.el b/lisp/proced.el
index a6f1a71778..67c1cf48c1 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -740,12 +740,18 @@ proced
         "Type \\<proced-mode-map>\\[quit-window] to quit, \\[proced-help] for help")))))
 
 (defun proced-auto-update-timer ()
-  "Auto-update Proced buffers using `run-at-time'."
-  (dolist (buf (buffer-list))
-    (with-current-buffer buf
-      (if (and (eq major-mode 'proced-mode)
-               proced-auto-update-flag)
-          (proced-update t t)))))
+  "Auto-update Proced buffers using `run-at-time'.
+
+If there are no proced buffers, cancel the timer."
+  (unless (seq-filter (lambda (buf)
+                        (with-current-buffer buf
+                          (when (eq major-mode 'proced-mode)
+                            (when proced-auto-update-flag
+                              (proced-update t t))
+                            t)))
+                      (buffer-list))
+    (cancel-timer proced-auto-update-timer)
+    (setq proced-auto-update-timer nil)))
 
 (defun proced-toggle-auto-update (arg)
   "Change whether this Proced buffer is updated automatically.

commit 7b09ed28ba395030e5117344bb5b97b8ee4a8b40
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sun Nov 20 13:10:08 2022 +0200

    Advise against using too-high GC thresholds
    
    * doc/lispref/internals.texi (Garbage Collection):
    * src/alloc.c (syms_of_alloc) <gc-cons-threshold>
    <gc-cons-percentage>: Advise against enlarging the GC thresholds
    more than needed and for prolonged periods of time.

diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi
index ea1679f693..4640b6d759 100644
--- a/doc/lispref/internals.texi
+++ b/doc/lispref/internals.texi
@@ -554,12 +554,17 @@ Garbage Collection
 object type; space allocated to the contents of buffers does not count.
 
 The initial threshold value is @code{GC_DEFAULT_THRESHOLD}, defined in
-@file{alloc.c}.  Since it's defined in @code{word_size} units, the value
-is 400,000 for the default 32-bit configuration and 800,000 for the 64-bit
-one.  If you specify a larger value, garbage collection will happen less
-often.  This reduces the amount of time spent garbage collecting, but
-increases total memory use.  You may want to do this when running a program
-that creates lots of Lisp data.
+@file{alloc.c}.  Since it's defined in @code{word_size} units, the
+value is 400,000 for the default 32-bit configuration and 800,000 for
+the 64-bit one.  If you specify a larger value, garbage collection
+will happen less often.  This reduces the amount of time spent garbage
+collecting, but increases total memory use.  You may want to do this
+when running a program that creates lots of Lisp data.  However, we
+recommend against increasing the threshold for prolonged periods of
+time, and advise that you never set it higher than needed for the
+program to run in reasonable time.  Using thresholds higher than
+necessary could potentially cause system-wide memory pressure, and
+should therefore be avoided.
 
 You can make collections more frequent by specifying a smaller value, down
 to 1/10th of @code{GC_DEFAULT_THRESHOLD}.  A value less than this minimum
@@ -576,6 +581,9 @@ Garbage Collection
 As the heap size increases, the time to perform a garbage collection
 increases.  Thus, it can be desirable to do them less frequently in
 proportion.
+
+As with @code{gc-cons-threshold}, do not enlarge this more than
+necessary, and never for prolonged periods of time.
 @end defopt
 
   Control over the garbage collector via @code{gc-cons-threshold} and
diff --git a/src/alloc.c b/src/alloc.c
index b9d12dff7e..d3f696d5ad 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -7775,13 +7775,23 @@ syms_of_alloc (void)
 Garbage collection happens automatically only when `eval' is called.
 
 By binding this temporarily to a large number, you can effectively
-prevent garbage collection during a part of the program.
+prevent garbage collection during a part of the program.  But be
+sure to get back to the normal value soon enough, to avoid system-wide
+memory pressure, and never use a too-high value for prolonged periods
+of time.
 See also `gc-cons-percentage'.  */);
 
   DEFVAR_LISP ("gc-cons-percentage", Vgc_cons_percentage,
 	       doc: /* Portion of the heap used for allocation.
 Garbage collection can happen automatically once this portion of the heap
 has been allocated since the last garbage collection.
+
+By binding this temporarily to a large number, you can effectively
+prevent garbage collection during a part of the program.  But be
+sure to get back to the normal value soon enough, to avoid system-wide
+memory pressure, and never use a too-high value for prolonged periods
+of time.
+
 If this portion is smaller than `gc-cons-threshold', this is ignored.  */);
   Vgc_cons_percentage = make_float (0.1);
 

commit fbad9c05ea1066c0ae48d40eca782bd406e4c42d
Author: Gabriel do Nascimento Ribeiro <gabriel376@hotmail.com>
Date:   Wed Nov 16 21:59:17 2022 -0300

    Handle error in bookmark-relocate when filename is nil
    
    * lisp/bookmark.el (bookmark-relocate): Handle error when
    filename is nil.  (Bug#59326)

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 15e7273f91..7f3a264f53 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1396,20 +1396,25 @@ bookmark-relocate
   (interactive (list (bookmark-completing-read "Bookmark to relocate")))
   (bookmark-maybe-historicize-string bookmark-name)
   (bookmark-maybe-load-default-file)
-  (let* ((bmrk-filename (bookmark-get-filename bookmark-name))
-         (newloc (abbreviate-file-name
-                  (expand-file-name
-                   (read-file-name
-                    (format "Relocate %s to: " bookmark-name)
-                    (file-name-directory bmrk-filename))))))
-    (bookmark-set-filename bookmark-name newloc)
-    (bookmark-update-last-modified bookmark-name)
-    (setq bookmark-alist-modification-count
-          (1+ bookmark-alist-modification-count))
-    (if (bookmark-time-to-save-p)
+  (let ((bmrk-filename (bookmark-get-filename bookmark-name)))
+    ;; FIXME: Make `bookmark-relocate' support bookmark Types
+    ;; besides files and directories.
+    (unless bmrk-filename
+      (user-error "Cannot relocate bookmark of type \"%s\""
+                  (bookmark-type-from-full-record
+                   (bookmark-get-bookmark bookmark-name))))
+    (let ((newloc (abbreviate-file-name
+                   (expand-file-name
+                    (read-file-name
+                     (format "Relocate %s to: " bookmark-name)
+                     (file-name-directory bmrk-filename))))))
+      (bookmark-set-filename bookmark-name newloc)
+      (bookmark-update-last-modified bookmark-name)
+      (setq bookmark-alist-modification-count
+            (1+ bookmark-alist-modification-count))
+      (when (bookmark-time-to-save-p)
         (bookmark-save))
-    (bookmark-bmenu-surreptitiously-rebuild-list)))
-
+      (bookmark-bmenu-surreptitiously-rebuild-list))))
 
 ;;;###autoload
 (defun bookmark-insert-location (bookmark-name &optional no-history)

commit d46d67bef14cd0b9acb4f6a542e720ac34a0f51d
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sun Nov 20 12:10:38 2022 +0200

    ; Avoid "Local Variables" popups in Emacs tree
    
    * lisp/vc/vc.el (vc-prepare-patches-separately): Add an autoloaded
    form for the 'safe-local-variable' property.  (Bug#59384)

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 990b03b4c7..fa3d58f770 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -3347,6 +3347,8 @@ vc-edit-next-command
           (lambda (&rest args)
             (apply #'vc-user-edit-command (apply old args))))))
 
+;; This is used in .dir-locals.el in the Emacs source tree.
+;;;###autoload (put 'vc-prepare-patches-separately 'safe-local-variable 'booleanp)
 (defcustom vc-prepare-patches-separately t
   "Whether `vc-prepare-patch' should generate a separate message for each patch.
 If nil, `vc-prepare-patch' creates a single email message by attaching

commit 0fcf8dca6ac736f48c57bf981e06767b52ebf38c
Author: Juanma Barranquero <lekktu@gmail.com>
Date:   Sun Nov 20 10:25:59 2022 +0100

    ; Fix typos
    
    * doc/lispref/display.texi (Size of Displayed Text):
    * lisp/net/trampver.el (tramp-inside-emacs): Fix typos in docstrings.

diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index c75107fb58..10a1a18dd1 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2273,7 +2273,7 @@ Size of Displayed Text
 happens, characters no longer map in a simple way to display columns,
 and display layout decisions with such strings, such as truncating too
 wide strings, can be a complex job.  This function helps in performing
-suvh jobs: it splits up its argument @var{string} into a list of
+such jobs: it splits up its argument @var{string} into a list of
 substrings, where each substring produces a single grapheme cluster
 that should be displayed as a unit.  Lisp programs can then use this
 list to construct visually-valid substrings of @var{string} which will
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 2b39add20d..caf6750c26 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -83,7 +83,7 @@ tramp-repository-version
   (unless (string-equal "ok" x) (error "%s" x)))
 
 (defun tramp-inside-emacs ()
-  "Version string provided by INSIDE_EMACS enmvironment variable."
+  "Version string provided by INSIDE_EMACS environment variable."
   (concat (or (getenv "INSIDE_EMACS") emacs-version)
 	  ",tramp:" tramp-version))
 

commit 657947dc7cf01a13a4fa260691a6fa0147107950
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sun Nov 20 10:30:38 2022 +0200

    ; Improve recently-modified documentation
    
    * lisp/progmodes/python.el (python-base-mode)
    (python--treesit-fontify-string):
    * lisp/textmodes/css-mode.el (css-base-mode):
    * lisp/treesit.el (treesit-ready-p, treesit-comment-end)
    (treesit-simple-indent-presets): Fix typos and wording in doc strings.
    
    * doc/lispref/parsing.texi (Tree-sitter major modes):
    * doc/lispref/modes.texi (Parser-based Indentation): Fix wording
    and add cross-references.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 5e5eb45897..543fc48dd7 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -4965,10 +4965,11 @@ Parser-based Indentation
 @end example
 
 @item comment-end
-This matcher is a function of 3 arguments: @var{node}, @var{parent},
-and @var{bol}, and returns non-@code{nil} if point is before a comment
-ending token.  Comment ending tokens are defined by regular expression
-@code{treesit-comment-end}.
+This matcher is a function that is called with 3 arguments:
+@var{node}, @var{parent}, and @var{bol}, and returns non-@code{nil} if
+point is before a comment ending token.  Comment ending tokens are
+defined by regular expression @code{treesit-comment-end}
+(@pxref{Tree-sitter major modes, treesit-comment-end}).
 
 @item first-sibling
 This anchor is a function that is called with 3 arguments: @var{node},
@@ -4999,22 +5000,23 @@ Parser-based Indentation
 charater on the previous line.
 
 @item point-min
-This anchor is a function is called with 3 arguments: @var{node},
+This anchor is a function that is called with 3 arguments: @var{node},
 @var{parent}, and @var{bol}, and returns the beginning of the buffer.
 This is useful as the beginning of the buffer is always at column 0.
 
 @item comment-start
-This anchor is a function is called with 3 arguments: @var{node},
+This anchor is a function that is called with 3 arguments: @var{node},
 @var{parent}, and @var{bol}, and returns the position right after the
-opening comment token.  Opening comment tokens are defined by regular
-expression @code{treesit-comment-start}.  This function assumes
-@var{parent} is the comment node.
+comment-start token.  Comment-start tokens are defined by regular
+expression @code{treesit-comment-start} (@pxref{Tree-sitter major
+modes, treesit-comment-start}).  This function assumes @var{parent} is
+the comment node.
 
 @item coment-start-skip
-This anchor is a function is called with 3 arguments: @var{node},
+This anchor is a function that is called with 3 arguments: @var{node},
 @var{parent}, and @var{bol}, and returns the position after the
-opening comment token, after skipping forward any whitespace
-characters.  Opening comment tokens are defined by regular expression
+comment-start token and any whitespace characters following that
+token.  Comment-start tokens are defined by regular expression
 @code{treesit-comment-start}.  This function assumes @var{parent} is
 the comment node.
 @end ftable
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index bea358f2b0..f21d94ec8b 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -1735,7 +1735,7 @@ Tree-sitter major modes
 @end defvar
 
 @defvar treesit-comment-end
-This should be a regular expression matching an closing comment token.
+This should be a regular expression matching a closing comment token.
 For example, it should match @samp{*/}, @samp{****/}, etc., in C.
 @end defvar
 
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index d16aeaf013..2f967ebab2 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1016,7 +1016,7 @@ python--treesit-fontify-string
   "Fontify string.
 NODE is the string node.  Do not fontify the initial f for
 f-strings.  OVERRIDE is the override flag described in
-`treesit-font-lock-rules'.  START and END marks the region to be
+`treesit-font-lock-rules'.  START and END mark the region to be
 fontified."
   (let* ((string-beg (treesit-node-start node))
          (string-end (treesit-node-end node))
@@ -6482,8 +6482,8 @@ prettify-symbols-alist
 (define-derived-mode python-base-mode prog-mode "Python"
   "Generic major mode for editing Python files.
 
-This is a generic major mode intended to be inherited by a
-concrete implementations.  Currently there two concrete
+This is a generic major mode intended to be inherited by
+concrete implementations.  Currently there are two concrete
 implementations: `python-mode' and `python-ts-mode'."
   (setq-local tab-width 8)
   (setq-local indent-tabs-mode nil)
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index 34380c05a0..6915e499bb 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -1751,7 +1751,7 @@ css-base-mode
   "Generic mode to edit Cascading Style Sheets (CSS).
 
 This is a generic major mode intended to be inherited by a
-concrete implementation.  Currently there two concrete
+concrete implementation.  Currently there are two concrete
 implementations: `css-mode' and `css-ts-mode'."
   (setq-local comment-start "/*")
   (setq-local comment-start-skip "/\\*+[ \t]*")
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 76cefbbaf3..674c984dfe 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -822,15 +822,15 @@ treesit--font-lock-notifier
 
 ;;; Indent
 
-;; `comment-start' and `comment-end' assumes there is only one type of
-;; comment and comment spans only one line.  So they are not
+;; `comment-start' and `comment-end' assume there is only one type of
+;; comment, and that the comment spans only one line.  So they are not
 ;; sufficient for our purpose.
 
 (defvar-local treesit-comment-start nil
   "Regular expression matching an opening comment token.")
 
 (defvar-local treesit-comment-end nil
-  "Regular expression matching an closing comment token.")
+  "Regular expression matching a closing comment token.")
 
 (define-error 'treesit-indent-error
               "Generic tree-sitter indentation error"
@@ -1069,14 +1069,14 @@ treesit-simple-indent-presets
 
 comment-start
 
-    Returns the ending position after matching `treesit-comment-start'.
-    Assuming PARENT is a comment node.
+    Returns the position after a match for `treesit-comment-start'.
+    Assumes PARENT is a comment node.
 
 comment-start-skip
 
-    Goes to the position comment-start would return, skip
-    whitespaces forward, and return the resulting position.
-    Assuming PARENT is a comment node.")
+    Goes to the position that comment-start would return, skips
+    whitespace after that, and returns the resulting position.
+    Assumes PARENT is a comment node.")
 
 (defun treesit--simple-indent-eval (exp)
   "Evaluate EXP.
@@ -1463,7 +1463,7 @@ treesit-ready-p
 It can also be a list of language symbols.
 
 If tree-sitter is not ready, emit a warning and return nil.  If
-the user has chosen to activate tree-sitter for MODE and
+the user has chosen to activate tree-sitter for LANGUAGE and
 tree-sitter is ready, return non-nil.  If QUIET is t, don't emit
 warning in either case; if quiet is `message', display a message
 instead of emitting warning."

commit 4fa13b2d838e11cbe3b713f3172721cb61d499f3
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Nov 19 18:58:12 2022 -0800

    Fix uses of treesit-ready-p
    
    * lisp/progmodes/c-ts-mode.el (c-ts-mode)
    (c++-ts-mode)
    * lisp/progmodes/java-ts-mode.el (java-ts-mode)
    * lisp/progmodes/js.el (js-ts-mode)
    * lisp/progmodes/json-ts-mode.el (json-ts-mode)
    * lisp/progmodes/python.el (python-ts-mode)
    * lisp/progmodes/sh-script.el (sh-mode)
    * lisp/progmodes/ts-mode.el (ts-mode): Remove the MODE argument.

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 43668a56d9..9fc7e6f67c 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -494,7 +494,7 @@ c-ts-mode
   "Major mode for editing C, powered by tree-sitter."
   :group 'c
 
-  (unless (treesit-ready-p nil 'c)
+  (unless (treesit-ready-p 'c)
     (error "Tree-sitter for C isn't available"))
 
   (treesit-parser-create 'c)
@@ -519,7 +519,7 @@ c++-ts-mode
   "Major mode for editing C++, powered by tree-sitter."
   :group 'c++
 
-  (unless (treesit-ready-p nil 'cpp)
+  (unless (treesit-ready-p 'cpp)
     (error "Tree-sitter for C++ isn't available"))
 
   ;; Comments.
diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index d3cae1dcca..6a800d292c 100644
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -277,7 +277,7 @@ java-ts-mode
   :group 'java
   :syntax-table java-ts-mode--syntax-table
 
-  (unless (treesit-ready-p nil 'java)
+  (unless (treesit-ready-p 'java)
     (error "Tree-sitter for Java isn't available"))
 
   (treesit-parser-create 'java)
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 97e6c4f410..4b07c0d12c 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3799,7 +3799,7 @@ js-ts-mode
 
 \\<js-ts-mode-map>"
   :group 'js
-  (when (treesit-ready-p 'js-mode 'javascript)
+  (when (treesit-ready-p 'javascript)
     ;; Borrowed from `js-mode'.
     (setq-local prettify-symbols-alist js--prettify-symbols-alist)
     (setq-local parse-sexp-ignore-comments t)
diff --git a/lisp/progmodes/json-ts-mode.el b/lisp/progmodes/json-ts-mode.el
index c1d3d283b8..7e0dd17911 100644
--- a/lisp/progmodes/json-ts-mode.el
+++ b/lisp/progmodes/json-ts-mode.el
@@ -124,7 +124,7 @@ json-ts-mode
   :group 'json
   :syntax-table json-ts-mode--syntax-table
 
-  (unless (treesit-ready-p nil 'json)
+  (unless (treesit-ready-p 'json)
     (error "Tree-sitter for JSON isn't available"))
 
   (treesit-parser-create 'json)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 456f141960..d16aeaf013 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -6591,7 +6591,7 @@ python-ts-mode
   "Major mode for editing Python files, using tree-sitter library.
 
 \\{python-mode-map}"
-  (when (treesit-ready-p 'python-mode 'python)
+  (when (treesit-ready-p 'python)
     (treesit-parser-create 'python)
     (setq-local treesit-font-lock-feature-list
                 '(( comment string definition)
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 3b66cdfab4..ed06f2263e 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1587,7 +1587,7 @@ sh-mode
 
   (cond
    ;; Tree-sitter.  If the shell is bash, we can enable tree-sitter.
-   ((treesit-ready-p 'sh-mode sh-shell)
+   ((treesit-ready-p sh-shell)
     (setq-local treesit-font-lock-feature-list
                 '((comment function string heredoc)
                   (variable keyword command declaration-command)
diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el
index a6f8e0a65e..01719a89ee 100644
--- a/lisp/progmodes/ts-mode.el
+++ b/lisp/progmodes/ts-mode.el
@@ -267,7 +267,7 @@ ts-mode
   (cond
    ;; `ts-mode' requires tree-sitter to work, so we don't check if
    ;; user enables tree-sitter for it.
-   ((treesit-ready-p nil 'tsx)
+   ((treesit-ready-p 'tsx)
     ;; Tree-sitter.
     (treesit-parser-create 'tsx)
 

commit f17ca55a0a3c9de1061285763cbf0bd3754f6718
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Nov 19 18:53:53 2022 -0800

    Remove treesit-settings
    
    Remove it since we are using separate major modes for tree-sitter and
    native variant now.
    
    * doc/lispref/parsing.texi (Tree-sitter major modes): Update manual.
    * lisp/treesit.el (treesit-settings): Remove option.
    (treesit--setting-for-mode): Remove function.
    (treesit-ready-p): Don't check for user preference in treesit-settings.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 6a23b0feb3..bea358f2b0 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -1661,6 +1661,7 @@ Tree-sitter major modes
 A major mode supporting tree-sitter features should roughly follow
 this pattern:
 
+@c FIXME: Update this part once we settle on the exact format.
 @example
 @group
 (define-derived-mode woomy-mode prog-mode "Woomy"
@@ -1679,26 +1680,19 @@ Tree-sitter major modes
 @end example
 
 First, the major mode should use @code{treesit-ready-p} to determine
-whether the user wants to activate tree-sitter features for the mode,
-and whether tree-sitter can be activated in this mode.
+whether tree-sitter can be activated in this mode.
 
 @defun treesit-ready-p mode language &optional quiet
 This function checks for conditions for activating tree-sitter.  It
-checks whether the user turned on tree-sitter for @var{mode}
-(according to @code{treesit-settings}), whether Emacs was built with
-tree-sitter, whether the buffer's size is not too large for
-tree-sitter to handle it, and whether the language definition for
-@var{language} is available on the system (@pxref{Language
-Definitions}).
-
-When the user sets @var{mode} to @var{demand} in @code{treesit-settings},
-this function emits a warning if tree-sitter cannot be activated.  If
+checks whether Emacs was built with tree-sitter, whether the buffer's
+size is not too large for tree-sitter to handle it, and whether the
+language definition for @var{language} is available on the system
+(@pxref{Language Definitions}).
+
+This function emits a warning if tree-sitter cannot be activated.  If
 @var{quiet} is @code{message}, the warning is turned into a message;
 if @var{quiet} is @code{nil}, no warning or message is displayed.
 
-If @var{mode} is nil, this function doesn't check user's preference in
-@code{treesit-settings}.
-
 If all the necessary conditions are met, this function returns
 non-@code{nil}; otherwise it returns @code{nil}.
 @end defun
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 0c98d3167d..76cefbbaf3 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -99,35 +99,6 @@ treesit-max-buffer-size
   :type 'integer
   :version "29.1")
 
-(defcustom treesit-settings '((t nil t))
-  "Tree-sitter toggle settings for major modes.
-
-A list of (MODE ACTIVATE INHERIT) where MODE is a major mode, and
-ACTIVATE can be one of the following:
-
-  `demand'  Demand the use of tree-sitter, and warn if it can't
-            be activated.
-  t         Enable tree-sitter if it is available.
-  nil       Don't enable tree-sitter.
-
-If INHERIT is t, the setting for MODE is inherited by all its
-derived modes.  For a derived mode, closer ancestor mode's
-setting takes higher precedence.
-
-A special MODE, t, is considered the ancestor of every mode, and
-its INHERIT flag is ignored."
-  :type '(repeat
-          (list :tag "Setting"
-                (symbol :tag "Mode")
-                (choice :tag "Activate"
-                        (const :tag "No" nil)
-                        (const :tag "Yes" t)
-                        (const :tag "Demand" demand))
-                (choice :tag "Inherit"
-                        (const :tag "Yes" t)
-                        (const :tag "No" nil))))
-  :version "29.1")
-
 ;;; Parser API supplement
 
 (defun treesit-parse-string (string language)
@@ -1485,89 +1456,48 @@ treesit-imenu-function
 
 ;;; Activating tree-sitter
 
-(defun treesit--setting-for-mode (mode settings)
-  "Get the setting for MODE in SETTINGS.
-MODE is a major mode symbol.  SETTINGS should be `treesit-settings'."
-  ;;    A setting for exactly this MODE.  The shape is (FLAG INHERIT).
-  (let ((self (alist-get mode settings))
-        ;; Fallback setting, shape is (FLAG INHERIT).
-        (fallback (alist-get t settings))
-        ;; Settings for ancestor modes of MODE.  Its shape is
-        ;; ((MODE . FLAG)...)
-        (applicable (cl-loop for setting in settings
-                             for m = (nth 0 setting)
-                             for flag = (nth 1 setting)
-                             for inherit = (nth 2 setting)
-                             if (and (not (eq m t))
-                                     (not (eq m mode))
-                                     inherit
-                                     (provided-mode-derived-p mode m))
-                             collect (cons m flag))))
-    (cond
-     (self (car self))
-     ((null applicable) (car fallback))
-     (t
-      ;; After sort, the most specific setting is at the top.
-      (setq applicable
-            (cl-sort applicable
-                     (lambda (a b)
-                       ;; Major mode inheritance has a total ordering
-                       ;; right?
-                       (provided-mode-derived-p (car a) (car b)))))
-      (cdar applicable)))))
-
-(defun treesit-ready-p (mode language &optional quiet)
+(defun treesit-ready-p (language &optional quiet)
   "Check whether tree-sitter is ready to be used for MODE and LANGUAGE.
 
 LANGUAGE is the language symbol to check for availability.
 It can also be a list of language symbols.
 
-This function checks the user setting in `treesit-settings'.  If the
-user has set `demand' for MODE, and tree-sitter is not ready, emit a
-warning and return nil.  If the user has chosen to activate tree-sitter
-for MODE and tree-sitter is ready, return non-nil.  If QUIET is t, don't
-emit warning in either case; if quiet is `message', display a message
-instead of emitting warning.
-
-If MODE is nil, don't check for user setting and assume the
-setting is t."
+If tree-sitter is not ready, emit a warning and return nil.  If
+the user has chosen to activate tree-sitter for MODE and
+tree-sitter is ready, return non-nil.  If QUIET is t, don't emit
+warning in either case; if quiet is `message', display a message
+instead of emitting warning."
   (let ((language-list (if (consp language)
                            language
                          (list language)))
-        (activate (if mode
-                      (treesit--setting-for-mode mode treesit-settings)
-                    t))
         msg)
     ;; Check for each condition and set MSG.
-    (if (null activate)
-        nil
-      (catch 'term
-        (when (not (treesit-available-p))
-          (setq msg "tree-sitter library is not compiled with Emacs")
-          (throw 'term nil))
-        (when (> (buffer-size) treesit-max-buffer-size)
-          (setq msg "buffer larger than `treesit-max-buffer-size'")
-          (throw 'term nil))
-        (dolist (lang language-list)
-          (pcase-let ((`(,available . ,err)
-                       (treesit-language-available-p lang t)))
-            (when (not available)
-              (setq msg (format "language definition for %s is unavailable (%s): %s"
-                                lang (nth 0 err)
-                                (string-join
-                                 (mapcar (lambda (x) (format "%s" x))
-                                         (cdr err))
-                                 " ")))
-              (throw 'term nil)))))
-      ;; Decide if all conditions met and whether emit a warning.
-      (if (not msg)
-          t
-        (when (eq activate 'demand)
-          (setq msg (concat "Cannot activate tree-sitter, because " msg))
-          (pcase quiet
-            ('nil (display-warning 'treesit msg))
-            ('message (message "%s" msg))))
-        nil))))
+    (catch 'term
+      (when (not (treesit-available-p))
+        (setq msg "tree-sitter library is not compiled with Emacs")
+        (throw 'term nil))
+      (when (> (buffer-size) treesit-max-buffer-size)
+        (setq msg "buffer larger than `treesit-max-buffer-size'")
+        (throw 'term nil))
+      (dolist (lang language-list)
+        (pcase-let ((`(,available . ,err)
+                     (treesit-language-available-p lang t)))
+          (when (not available)
+            (setq msg (format "language definition for %s is unavailable (%s): %s"
+                              lang (nth 0 err)
+                              (string-join
+                               (mapcar (lambda (x) (format "%s" x))
+                                       (cdr err))
+                               " ")))
+            (throw 'term nil)))))
+    ;; Decide if all conditions met and whether emit a warning.
+    (if (not msg)
+        t
+      (setq msg (concat "Cannot activate tree-sitter, because " msg))
+      (pcase quiet
+        ('nil (display-warning 'treesit msg))
+        ('message (message "%s" msg)))
+      nil)))
 
 (defun treesit-major-mode-setup ()
   "Activate tree-sitter to power major-mode features.

commit 4c5f1737c4815bd6d167108343a61da9a3882f32
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Nov 19 18:45:45 2022 -0800

    Remove tree-sitter setup from js-json-mode
    
    * lisp/progmodes/js.el (js-json--treesit-font-lock-settings)
    (js--json-treesit-indent-rules): Remove variables.
    (js-json-mode): Remove tree-sitter setup.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 159c32ca2a..97e6c4f410 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3841,49 +3841,12 @@ js-ts-mode
     (setq-local which-func-functions nil)
     (treesit-major-mode-setup)))
 
-(defvar js-json--treesit-font-lock-settings
-  (treesit-font-lock-rules
-   :language 'json
-   :feature 'minimal
-   :override t
-   `(
-     (pair
-      key: (_) @font-lock-string-face)
-
-     (string) @font-lock-string-face
-
-     (number) @font-lock-constant-face
-
-     [(null) (true) (false)] @font-lock-constant-face
-
-     (escape_sequence) @font-lock-constant-face
-
-     (comment) @font-lock-comment-face))
-  "Font-lock settings for JSON.")
-
-
-(defvar js--json-treesit-indent-rules
-  `((json
-     (no-node (js--treesit-backward-up-list) js-indent-level)
-     ((node-is "}") parent-bol 0)
-     ((node-is ")") parent-bol 0)
-     ((node-is "]") parent-bol 0)
-     ((parent-is "object") parent-bol js-indent-level)
-     )))
-
 ;;;###autoload
 (define-derived-mode js-json-mode js-mode "JSON"
   (setq-local js-enabled-frameworks nil)
   ;; Speed up `syntax-ppss': JSON files can be big but can't hold
   ;; regexp matchers nor #! thingies (and `js-enabled-frameworks' is nil).
-  (setq-local syntax-propertize-function #'ignore)
-
-  (cond
-   ;; Tree-sitter.
-   ((treesit-ready-p 'js-json-mode 'json)
-    (setq-local treesit-simple-indent-rules js--json-treesit-indent-rules)
-    (setq-local treesit-font-lock-settings js-json--treesit-font-lock-settings)
-    (treesit-major-mode-setup))))
+  (setq-local syntax-propertize-function #'ignore))
 
 ;; Since we made JSX support available and automatically-enabled in
 ;; the base `js-mode' (for ease of use), now `js-jsx-mode' simply

commit ac9bc819bc438f21bd38a995812d756727ed8e2a
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Nov 19 17:59:14 2022 -0800

    Fix tree-sitter comment indentation for C-like languages
    
    The goal is to indent like this:
    
    /* comment
       comment  --> This line aligns with the beginning of the first line
     */         --> This line aligns with the opening comment token
    
    * lisp/treesit.el (treesit-comment-start)
    (treesit-comment-end): New variables.
    (treesit-simple-indent-presets): New preset comment-end,
    comment-start, comment-start-skip
    
    * lisp/progmodes/c-ts-mode.el (c-ts-mode--indent-styles)
    (c-ts-mode)
    * lisp/progmodes/java-ts-mode.el (java-ts-mode--indent-rules)
    (java-ts-mode)
    * lisp/progmodes/js.el (js--treesit-indent-rules)
    (js-ts-mode)
    * lisp/progmodes/ts-mode.el (ts-mode--indent-rules)
    (ts-mode): Add identical indent rules to each mode, and set identical
    treesit-comment-start/end's.
    
    * doc/lispref/modes.texi (Parser-based Indentation)
    * doc/lispref/parsing.texi (Tree-sitter major modes): Update manual.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 8b20bc0b75..5e5eb45897 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -4964,6 +4964,12 @@ Parser-based Indentation
 (match nil "argument_list" nil nil 0 0)
 @end example
 
+@item comment-end
+This matcher is a function of 3 arguments: @var{node}, @var{parent},
+and @var{bol}, and returns non-@code{nil} if point is before a comment
+ending token.  Comment ending tokens are defined by regular expression
+@code{treesit-comment-end}.
+
 @item first-sibling
 This anchor is a function that is called with 3 arguments: @var{node},
 @var{parent}, and @var{bol}, and returns the start of the first child
@@ -4996,8 +5002,22 @@ Parser-based Indentation
 This anchor is a function is called with 3 arguments: @var{node},
 @var{parent}, and @var{bol}, and returns the beginning of the buffer.
 This is useful as the beginning of the buffer is always at column 0.
-@end ftable
 
+@item comment-start
+This anchor is a function is called with 3 arguments: @var{node},
+@var{parent}, and @var{bol}, and returns the position right after the
+opening comment token.  Opening comment tokens are defined by regular
+expression @code{treesit-comment-start}.  This function assumes
+@var{parent} is the comment node.
+
+@item coment-start-skip
+This anchor is a function is called with 3 arguments: @var{node},
+@var{parent}, and @var{bol}, and returns the position after the
+opening comment token, after skipping forward any whitespace
+characters.  Opening comment tokens are defined by regular expression
+@code{treesit-comment-start}.  This function assumes @var{parent} is
+the comment node.
+@end ftable
 @end defvar
 
 @heading Indentation utilities
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index feb92345ff..6a23b0feb3 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -1731,6 +1731,20 @@ Tree-sitter major modes
 For supporting mixing of multiple languages in a major mode,
 @pxref{Multiple Languages}.
 
+Setting the following local variables allows tree-sitter's indentation
+engine to correctly indent multi-line comments:
+
+@defvar treesit-comment-start
+This should be a regular expression matching an opening comment token.
+For example, it should match @samp{//}, @samp{////}, @samp{/*},
+@samp{/****}, etc., in C.
+@end defvar
+
+@defvar treesit-comment-end
+This should be a regular expression matching an closing comment token.
+For example, it should match @samp{*/}, @samp{****/}, etc., in C.
+@end defvar
+
 @node Tree-sitter C API
 @section Tree-sitter C API Correspondence
 
diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index f8e809bb43..43668a56d9 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -84,8 +84,8 @@ c-ts-mode--indent-styles
            ((node-is "else") parent-bol 0)
            ((node-is "case") parent-bol 0)
            ((node-is "preproc_arg") no-indent)
-           ((node-is "comment") no-indent)
-           ((parent-is "comment") no-indent)
+           ((and (parent-is "comment") comment-end) comment-start -1)
+           ((parent-is "comment") comment-start-skip 0)
            ((node-is "labeled_statement") parent-bol 0)
            ((parent-is "labeled_statement") parent-bol c-ts-mode-indent-offset)
            ((match "preproc_ifdef" "compound_statement") point-min 0)
@@ -503,6 +503,8 @@ c-ts-mode
   (setq-local comment-start "/* ")
   (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
   (setq-local comment-end " */")
+  (setq-local treesit-comment-start (rx "/" (or (+ "/") (+ "*"))))
+  (setq-local treesit-comment-end (rx (+ (or "*")) "/"))
 
   (setq-local treesit-simple-indent-rules
               (c-ts-mode--set-indent-style 'c))
diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index ee75753027..d3cae1dcca 100644
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -61,6 +61,8 @@ java-ts-mode--indent-rules
      ((node-is "}") (and parent parent-bol) 0)
      ((node-is ")") parent-bol 0)
      ((node-is "]") parent-bol 0)
+     ((and (parent-is "comment") comment-end) comment-start -1)
+     ((parent-is "comment") comment-start-skip 0)
      ((parent-is "class_body") parent-bol java-ts-mode-indent-offset)
      ((parent-is "interface_body") parent-bol java-ts-mode-indent-offset)
      ((parent-is "constructor_body") parent-bol java-ts-mode-indent-offset)
@@ -284,6 +286,8 @@ java-ts-mode
   (setq-local comment-start "// ")
   (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
   (setq-local comment-end "")
+  (setq-local treesit-comment-start (rx "/" (or (+ "/") (+ "*"))))
+  (setq-local treesit-comment-end (rx (+ (or "*")) "/"))
 
   ;; Indent.
   (setq-local treesit-simple-indent-rules java-ts-mode--indent-rules)
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index c37cef977b..159c32ca2a 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3412,6 +3412,9 @@ js--treesit-indent-rules
        ((node-is ")") parent-bol 0)
        ((node-is "]") parent-bol 0)
        ((node-is ">") parent-bol 0)
+       ((parent-is "comment") comment-start 0)
+       ((and (parent-is "comment") comment-end) comment-start -1)
+       ((parent-is "comment") comment-start-skip 0)
        ((parent-is "ternary_expression") parent-bol js-indent-level)
        ((parent-is "member_expression") parent-bol js-indent-level)
        ((node-is ,switch-case) parent-bol 0)
@@ -3807,6 +3810,8 @@ js-ts-mode
     (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
     (setq-local comment-end "")
     (setq-local comment-multi-line t)
+    (setq-local treesit-comment-start (rx "/" (or (+ "/") (+ "*"))))
+    (setq-local treesit-comment-end (rx (+ (or "*")) "/"))
     ;; Electric-indent.
     (setq-local electric-indent-chars
 	        (append "{}():;," electric-indent-chars)) ;FIXME: js2-mode adds "[]*".
diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el
index c826302c7a..a6f8e0a65e 100644
--- a/lisp/progmodes/ts-mode.el
+++ b/lisp/progmodes/ts-mode.el
@@ -61,6 +61,8 @@ ts-mode--indent-rules
      ((node-is ")") parent-bol 0)
      ((node-is "]") parent-bol 0)
      ((node-is ">") parent-bol 0)
+     ((and (parent-is "comment") comment-end) comment-start -1)
+     ((parent-is "comment") comment-start-skip 0)
      ((parent-is "ternary_expression") parent-bol ts-mode-indent-offset)
      ((parent-is "member_expression") parent-bol ts-mode-indent-offset)
      ((parent-is "named_imports") parent-bol ts-mode-indent-offset)
@@ -273,6 +275,8 @@ ts-mode
     (setq-local comment-start "// ")
     (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
     (setq-local comment-end "")
+    (setq-local treesit-comment-start (rx "/" (or (+ "/") (+ "*"))))
+    (setq-local treesit-comment-end (rx (+ (or "*")) "/"))
 
     ;; Electric
     (setq-local electric-indent-chars
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 2ee9771522..0c98d3167d 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -851,6 +851,16 @@ treesit--font-lock-notifier
 
 ;;; Indent
 
+;; `comment-start' and `comment-end' assumes there is only one type of
+;; comment and comment spans only one line.  So they are not
+;; sufficient for our purpose.
+
+(defvar-local treesit-comment-start nil
+  "Regular expression matching an opening comment token.")
+
+(defvar-local treesit-comment-end nil
+  "Regular expression matching an closing comment token.")
+
 (define-error 'treesit-indent-error
               "Generic tree-sitter indentation error"
               'treesit-error)
@@ -936,6 +946,8 @@ treesit-simple-indent-presets
                           (lambda (node &rest _)
                             (string-match-p
                              name (or (treesit-node-field-name node) "")))))
+        (cons 'comment-end (lambda (&rest _)
+                             (looking-at-p treesit-comment-end)))
         ;; TODO: Document.
         (cons 'catch-all (lambda (&rest _) t))
 
@@ -957,6 +969,19 @@ treesit-simple-indent-presets
                                 (treesit-node-child parent n named)))))
         (cons 'parent (lambda (_n parent &rest _)
                         (treesit-node-start parent)))
+        (cons 'comment-start
+              (lambda (_n parent &rest _)
+                (save-excursion
+                  (goto-char (treesit-node-start parent))
+                  (re-search-forward treesit-comment-start)
+                  (point))))
+        (cons 'comment-start-skip
+              (lambda (_n parent &rest _)
+                (save-excursion
+                  (goto-char (treesit-node-start parent))
+                  (re-search-forward treesit-comment-start)
+                  (skip-syntax-forward "-")
+                  (point))))
         ;; TODO: Document.
         (cons 'grand-parent
               (lambda (_n parent &rest _)
@@ -1036,6 +1061,10 @@ treesit-simple-indent-presets
     Queries PARENT with QUERY, and checks if NODE is
     captured (by any capture name).
 
+comment-end
+
+    Matches if text after point matches `treesit-comment-end'.
+
 ANCHOR:
 
 first-sibling
@@ -1065,7 +1094,18 @@ treesit-simple-indent-presets
 
 point-min
 
-    Returns the beginning of buffer, which is always at column 0.")
+    Returns the beginning of buffer, which is always at column 0.
+
+comment-start
+
+    Returns the ending position after matching `treesit-comment-start'.
+    Assuming PARENT is a comment node.
+
+comment-start-skip
+
+    Goes to the position comment-start would return, skip
+    whitespaces forward, and return the resulting position.
+    Assuming PARENT is a comment node.")
 
 (defun treesit--simple-indent-eval (exp)
   "Evaluate EXP.

commit 7d7e9ef46a1b310fb3f481cdf8023082f5ec1618
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Nov 19 16:56:42 2022 -0800

    Separate native and tree-sitter variant of js-mode
    
    * lisp/progmodes/js.el (js-base-mode): New mode.
    (js-mode): Return to before tree-sitter setup is added, change to
    inherit from js-base-mode.
    (js-ts-mode): New mode.  Now it doesn't use any cc-mode feature,
    meaning it looses comment filling.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index fd3737f8b6..c37cef977b 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3697,12 +3697,33 @@ js--treesit-imenu
 ;;; Main Function
 
 ;;;###autoload
-(define-derived-mode js-mode prog-mode "JavaScript"
+(define-derived-mode js-base-mode prog-mode "JavaScript"
+  "Generic major mode for editing JavaScript.
+
+This mode is intended to be inherited by concrete major modes.
+Currently there are `js-mode' and `js-ts-mode'."
+  :group 'js
+  nil)
+
+;;;###autoload
+(define-derived-mode js-mode js-base-mode "JavaScript"
   "Major mode for editing JavaScript."
   :group 'js
   ;; Ensure all CC Mode "lang variables" are set to valid values.
   (c-init-language-vars js-mode)
+  (setq-local indent-line-function #'js-indent-line)
+  (setq-local beginning-of-defun-function #'js-beginning-of-defun)
+  (setq-local end-of-defun-function #'js-end-of-defun)
   (setq-local open-paren-in-column-0-is-defun-start nil)
+  (setq-local font-lock-defaults
+              (list js--font-lock-keywords nil nil nil nil
+                    '(font-lock-syntactic-face-function
+                      . js-font-lock-syntactic-face-function)))
+  (setq-local syntax-propertize-function #'js-syntax-propertize)
+  (add-hook 'syntax-propertize-extend-region-functions
+            #'syntax-propertize-multiline 'append 'local)
+  (add-hook 'syntax-propertize-extend-region-functions
+            #'js--syntax-propertize-extend-region 'append 'local)
   (setq-local prettify-symbols-alist js--prettify-symbols-alist)
 
   (setq-local parse-sexp-ignore-comments t)
@@ -3768,10 +3789,31 @@ js-mode
   ;; FIXME: We should instead do this fontification lazily by adding
   ;; calls to syntax-propertize wherever it's really needed.
   ;;(syntax-propertize (point-max))
+  )
 
-  (cond
-   ;; Tree-sitter.
-   ((treesit-ready-p 'js-mode 'javascript)
+(define-derived-mode js-ts-mode js-base-mode "JavaScript"
+  "Major mode for editing JavaScript.
+
+\\<js-ts-mode-map>"
+  :group 'js
+  (when (treesit-ready-p 'js-mode 'javascript)
+    ;; Borrowed from `js-mode'.
+    (setq-local prettify-symbols-alist js--prettify-symbols-alist)
+    (setq-local parse-sexp-ignore-comments t)
+    ;; Which-func.
+    (setq-local which-func-imenu-joiner-function #'js--which-func-joiner)
+    ;; Comment.
+    (setq-local comment-start "// ")
+    (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
+    (setq-local comment-end "")
+    (setq-local comment-multi-line t)
+    ;; Electric-indent.
+    (setq-local electric-indent-chars
+	        (append "{}():;," electric-indent-chars)) ;FIXME: js2-mode adds "[]*".
+    (setq-local electric-layout-rules
+	        '((?\; . after) (?\{ . after) (?\} . before)))
+
+    ;; Tree-sitter setup.
     (treesit-parser-create 'javascript)
     ;; Indent.
     (setq-local treesit-simple-indent-rules js--treesit-indent-rules)
@@ -3792,23 +3834,7 @@ js-mode
                 #'js--treesit-imenu)
     ;; Which-func (use imenu).
     (setq-local which-func-functions nil)
-    (treesit-major-mode-setup))
-   ;; Elisp.
-   (t
-    ;; Ensure all CC Mode "lang variables" are set to valid values
-    ;; (continued).
-    (setq-local indent-line-function #'js-indent-line)
-    (setq-local beginning-of-defun-function #'js-beginning-of-defun)
-    (setq-local end-of-defun-function #'js-end-of-defun)
-    (setq-local font-lock-defaults
-                (list js--font-lock-keywords nil nil nil nil
-                      '(font-lock-syntactic-face-function
-                        . js-font-lock-syntactic-face-function)))
-    (setq-local syntax-propertize-function #'js-syntax-propertize)
-    (add-hook 'syntax-propertize-extend-region-functions
-              #'syntax-propertize-multiline 'append 'local)
-    (add-hook 'syntax-propertize-extend-region-functions
-              #'js--syntax-propertize-extend-region 'append 'local))))
+    (treesit-major-mode-setup)))
 
 (defvar js-json--treesit-font-lock-settings
   (treesit-font-lock-rules

commit d6362b632e3c76cb55a05248aa221e426c5adb5a
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Nov 19 16:10:46 2022 -0800

    Merge function/class-name features in python-mode
    
    To keep consistency with other tree-sitter major modes.
    
    * lisp/progmodes/python.el (python--treesit-settings)
    (python-ts-mode): Merge function-name and class-name features into
    definition.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 01a6887bb6..456f141960 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1049,14 +1049,11 @@ python--treesit-settings
    :override t
    '((interpolation (identifier) @font-lock-variable-name-face))
 
-   :feature 'function-name
+   :feature 'definition
    :language 'python
    '((function_definition
-      name: (identifier) @font-lock-function-name-face))
-
-   :feature 'class-name
-   :language 'python
-   '((class_definition
+      name: (identifier) @font-lock-function-name-face)
+     (class_definition
       name: (identifier) @font-lock-type-face))
 
    :feature 'keyword
@@ -6597,7 +6594,7 @@ python-ts-mode
   (when (treesit-ready-p 'python-mode 'python)
     (treesit-parser-create 'python)
     (setq-local treesit-font-lock-feature-list
-                '(( comment string function-name class-name)
+                '(( comment string definition)
                   ( keyword builtin constant type)
                   ( assignment decorator escape-sequence
                     string-interpolation number property

commit 00df4566af9dff0a27fd6da566ef1e53268a6d47
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Nov 19 16:09:08 2022 -0800

    Split python-mode into native and tree-sitter variant
    
    * lisp/progmodes/python.el (python-base-mode): New virtual mode that
    contains most of the setup.
    (python-mode): Change to inherit from python-base-mode.
    (python-ts-mode): New mode that sets up tree-sitter.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index b9b71a57d7..01a6887bb6 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -6482,10 +6482,12 @@ electric-indent-inhibit
 (defvar prettify-symbols-alist)
 
 ;;;###autoload
-(define-derived-mode python-mode prog-mode "Python"
-  "Major mode for editing Python files.
+(define-derived-mode python-base-mode prog-mode "Python"
+  "Generic major mode for editing Python files.
 
-\\{python-mode-map}"
+This is a generic major mode intended to be inherited by a
+concrete implementations.  Currently there two concrete
+implementations: `python-mode' and `python-ts-mode'."
   (setq-local tab-width 8)
   (setq-local indent-tabs-mode nil)
 
@@ -6569,11 +6571,30 @@ python-mode
   (when python-indent-guess-indent-offset
     (python-indent-guess-indent-offset))
 
-  (add-hook 'flymake-diagnostic-functions #'python-flymake nil t)
+  (add-hook 'flymake-diagnostic-functions #'python-flymake nil t))
+
+;;;###autoload
+(define-derived-mode python-mode python-base-mode "Python"
+  "Major mode for editing Python files.
 
-  (cond
-   ;; Tree-sitter.
-   ((treesit-ready-p 'python-mode 'python)
+\\{python-mode-map}"
+  (setq-local font-lock-defaults
+              `(,python-font-lock-keywords
+                nil nil nil nil
+                (font-lock-syntactic-face-function
+                 . python-font-lock-syntactic-face-function)))
+  (setq-local syntax-propertize-function
+              python-syntax-propertize-function)
+  (setq-local imenu-create-index-function
+              #'python-imenu-create-index)
+  (add-hook 'which-func-functions #'python-info-current-defun nil t))
+
+;;;###autoload
+(define-derived-mode python-ts-mode python-base-mode "Python"
+  "Major mode for editing Python files, using tree-sitter library.
+
+\\{python-mode-map}"
+  (when (treesit-ready-p 'python-mode 'python)
     (treesit-parser-create 'python)
     (setq-local treesit-font-lock-feature-list
                 '(( comment string function-name class-name)
@@ -6587,19 +6608,7 @@ python-mode
     (setq-local beginning-of-defun-function
                 #'python-treesit-beginning-of-defun)
     (setq-local end-of-defun-function #'python-treesit-end-of-defun)
-    (treesit-major-mode-setup))
-   ;; Elisp.
-   (t
-    (setq-local font-lock-defaults
-                `(,python-font-lock-keywords
-                  nil nil nil nil
-                  (font-lock-syntactic-face-function
-                   . python-font-lock-syntactic-face-function)))
-    (setq-local syntax-propertize-function
-                python-syntax-propertize-function)
-    (setq-local imenu-create-index-function
-                #'python-imenu-create-index)
-    (add-hook 'which-func-functions #'python-info-current-defun nil t))))
+    (treesit-major-mode-setup)))
 
 ;;; Completion predicates for M-x
 ;; Commands that only make sense when editing Python code

commit 655957087c8654577e7c59004f16be7abcc2c46c
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Nov 19 15:27:07 2022 -0800

    Expand css-ts-mode and merge it into css-mode
    
    * lisp/progmodes/css-ts-mode.el: Deleted.
    * lisp/textmodes/css-mode.el (css--treesit-indent-rules)
    (css--treesit-settings): New variables.
    (css--treesit-imenu-1)
    (css--treesit-imenu): New functions.
    * lisp/textmodes/css-mode.el (css-base-mode): New mode inherited by
    both css-mode and css-ts-mode.
    (css-ts-mode): New mode.
    (css-mode): Inherit from css-base-mode, and move some setup to
    css-base-mode.

diff --git a/lisp/progmodes/css-ts-mode.el b/lisp/progmodes/css-ts-mode.el
deleted file mode 100644
index d0f104eac3..0000000000
--- a/lisp/progmodes/css-ts-mode.el
+++ /dev/null
@@ -1,136 +0,0 @@
-;;; css-ts-mode.el --- tree-sitter support for CSS  -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2022 Free Software Foundation, Inc.
-
-;; Author     : Theodor Thornhill <theo@thornhill.no>
-;; Maintainer : Theodor Thornhill <theo@thornhill.no>
-;; Created    : November 2022
-;; Keywords   : css languages tree-sitter
-
-;; This file is part of GNU Emacs.
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-;;; Commentary:
-;;
-
-;;; Code:
-
-(require 'treesit)
-(require 'rx)
-(require 'css-mode)
-
-(defcustom css-ts-mode-indent-offset 2
-  "Number of spaces for each indentation step in `ts-mode'."
-  :version "29.1"
-  :type 'integer
-  :safe 'integerp
-  :group 'css)
-
-(defvar css-ts-mode--indent-rules
-  `((css
-     ((node-is "}") parent-bol 0)
-     ((node-is ")") parent-bol 0)
-     ((node-is "]") parent-bol 0)
-
-     ((parent-is "block") parent-bol css-ts-mode-indent-offset)
-     ((parent-is "arguments") parent-bol css-ts-mode-indent-offset)
-     ((parent-is "declaration") parent-bol css-ts-mode-indent-offset))))
-
-(defvar css-ts-mode--settings
-  (treesit-font-lock-rules
-   :language 'css
-   :feature 'basic
-   :override t
-   `((unit) @font-lock-constant-face
-     (integer_value) @font-lock-builtin-face
-     (float_value) @font-lock-builtin-face
-     (plain_value) @font-lock-variable-name-face
-     (comment) @font-lock-comment-face
-     (class_selector) @css-selector
-     (child_selector) @css-selector
-     (id_selector) @css-selector
-     (tag_name) @css-selector
-     (property_name) @css-property
-     (class_name) @css-selector
-     (function_name) @font-lock-function-name-face)))
-
-(defun css-ts-mode--imenu-1 (node)
-  "Helper for `css-ts-mode--imenu'.
-Find string representation for NODE and set marker, then recurse
-the subtrees."
-  (let* ((ts-node (car node))
-         (subtrees (mapcan #'css-ts-mode--imenu-1 (cdr node)))
-         (name (when ts-node
-                 (if (equal (treesit-node-type ts-node) "tag_name")
-                     (treesit-node-text ts-node)
-                   (treesit-node-text (treesit-node-child ts-node 1) t))))
-         (marker (when ts-node
-                   (set-marker (make-marker)
-                               (treesit-node-start ts-node)))))
-    (cond
-     ((null ts-node) subtrees)
-     (subtrees
-      `((,name ,(cons name marker) ,@subtrees)))
-     (t
-      `((,name . ,marker))))))
-
-(defun css-ts-mode--imenu ()
-  "Return Imenu alist for the current buffer."
-  (let* ((node (treesit-buffer-root-node))
-         (tree (treesit-induce-sparse-tree
-                node (rx (or "class_selector"
-                             "id_selector"
-                             "tag_name")))))
-    (css-ts-mode--imenu-1 tree)))
-
-(define-derived-mode css-ts-mode prog-mode "CSS"
-  "Major mode for editing CSS."
-  :group 'css
-  :syntax-table css-mode-syntax-table
-
-  (unless (treesit-ready-p nil 'css)
-    (error "Tree-sitter for CSS isn't available"))
-
-  (treesit-parser-create 'css)
-
-  ;; Comments
-  (setq-local comment-start "/*")
-  (setq-local comment-start-skip "/\\*+[ \t]*")
-  (setq-local comment-end "*/")
-  (setq-local comment-end-skip "[ \t]*\\*+/")
-
-  ;; Indent.
-  (setq-local treesit-simple-indent-rules css-ts-mode--indent-rules)
-
-  ;; Electric
-  (setq-local electric-indent-chars
-              (append "{}():;," electric-indent-chars))
-
-  ;; Navigation.
-  (setq-local treesit-defun-type-regexp "rule_set")
-  ;; Font-lock.
-  (setq-local treesit-font-lock-settings css-ts-mode--settings)
-  (setq treesit-font-lock-feature-list '((basic) () ()))
-
-  ;; Imenu.
-  (setq-local imenu-create-index-function #'css-ts-mode--imenu)
-  (setq-local which-func-functions nil) ;; Piggyback on imenu
-
-  (treesit-major-mode-setup))
-
-(provide 'css-ts-mode)
-
-;;; css-ts-mode.el ends here
diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el
index d2a35bd550..34380c05a0 100644
--- a/lisp/textmodes/css-mode.el
+++ b/lisp/textmodes/css-mode.el
@@ -40,7 +40,9 @@
 (require 'sgml-mode)
 (require 'smie)
 (require 'thingatpt)
-(eval-when-compile (require 'subr-x))
+(eval-when-compile (require 'subr-x)
+                   (require 'rx))
+(require 'treesit)
 
 (defgroup css nil
   "Cascading Style Sheets (CSS) editing mode."
@@ -1319,6 +1321,94 @@ css-smie-rules
      (when (smie-rule-hanging-p)
        css-indent-offset))))
 
+;;; Tree-sitter
+
+(defvar css--treesit-indent-rules
+  '((css
+     ((node-is "}") parent-bol 0)
+     ((node-is ")") parent-bol 0)
+     ((node-is "]") parent-bol 0)
+
+     ((parent-is "block") parent-bol css-indent-offset)
+     ((parent-is "arguments") parent-bol css-indent-offset)
+     ((match nil "declaration" nil 0 3) parent-bol css-indent-offset)
+     ((match nil "declaration" nil 3) (nth-sibling 2) 0)))
+  "Tree-sitter indentation rules for `css-ts-mode'.")
+
+(defvar css--treesit-settings
+  (treesit-font-lock-rules
+   :feature 'comment
+   :language 'css
+   '((comment) @font-lock-comment-face)
+
+   :feature 'string
+   :language 'css
+   '((string_value) @font-lock-string-face)
+
+   :feature 'variable
+   :language 'css
+   '((plain_value) @font-lock-variable-name-face)
+
+   :feature 'selector
+   :language 'css
+   '((class_selector) @css-selector
+     (child_selector) @css-selector
+     (id_selector) @css-selector
+     (tag_name) @css-selector
+     (class_name) @css-selector)
+
+   :feature 'property
+   :language 'css
+   `((property_name) @css-property)
+
+   :feature 'function
+   :language 'css
+   '((function_name) @font-lock-function-name-face)
+
+   :feature 'constant
+   :language 'css
+   '((integer_value) @font-lock-number-face
+     (float_value) @font-lock-number-face
+     (unit) @font-lock-constant-face)
+
+   :feature 'error
+   :language 'css
+   '((ERROR) @error))
+  "Tree-sitter font-lock settings for `css-ts-mode'.")
+
+(defun css--treesit-imenu-1 (node)
+  "Helper for `css--treesit-imenu'.
+Find string representation for NODE and set marker, then recurse
+the subtrees."
+  (let* ((ts-node (car node))
+         (subtrees (mapcan #'css--treesit-imenu-1 (cdr node)))
+         (name (when ts-node
+                 (pcase (treesit-node-type ts-node)
+                   ("rule_set" (treesit-node-text
+                                (treesit-node-child ts-node 0) t))
+                   ("media_statement"
+                    (let ((block (treesit-node-child ts-node -1)))
+                      (string-trim
+                       (buffer-substring-no-properties
+                        (treesit-node-start ts-node)
+                        (treesit-node-start block))))))))
+         (marker (when ts-node
+                   (set-marker (make-marker)
+                               (treesit-node-start ts-node)))))
+    (cond
+     ((or (null ts-node) (null name)) subtrees)
+     (subtrees
+      `((,name ,(cons name marker) ,@subtrees)))
+     (t
+      `((,name . ,marker))))))
+
+(defun css--treesit-imenu ()
+  "Return Imenu alist for the current buffer."
+  (let* ((node (treesit-buffer-root-node))
+         (tree (treesit-induce-sparse-tree
+                node (rx (or "rule_set" "media_statement")))))
+    (css--treesit-imenu-1 tree)))
+
 ;;; Completion
 
 (defun css--complete-property ()
@@ -1657,8 +1747,67 @@ css--extract-index-name
               (replace-regexp-in-string "[\n ]+" " " s)))
            res)))))))
 
+(define-derived-mode css-base-mode prog-mode "CSS"
+  "Generic mode to edit Cascading Style Sheets (CSS).
+
+This is a generic major mode intended to be inherited by a
+concrete implementation.  Currently there two concrete
+implementations: `css-mode' and `css-ts-mode'."
+  (setq-local comment-start "/*")
+  (setq-local comment-start-skip "/\\*+[ \t]*")
+  (setq-local comment-end "*/")
+  (setq-local comment-end-skip "[ \t]*\\*+/")
+  (setq-local electric-indent-chars
+              (append css-electric-keys electric-indent-chars))
+  ;; The default "." creates ambiguity with class selectors.
+  (setq-local imenu-space-replacement " "))
+
+;;;###autoload
+(define-derived-mode css-ts-mode css-base-mode "CSS"
+  "Major mode to edit Cascading Style Sheets (CSS).
+\\<css-ts-mode-map>
+
+This mode provides syntax highlighting, indentation, completion,
+and documentation lookup for CSS, based on the tree-sitter
+library.
+
+Use `\\[completion-at-point]' to complete CSS properties,
+property values, pseudo-elements, pseudo-classes, at-rules,
+bang-rules, and HTML tags, classes and IDs.  Completion
+candidates for HTML class names and IDs are found by looking
+through open HTML mode buffers.
+
+Use `\\[info-lookup-symbol]' to look up documentation of CSS
+properties, at-rules, pseudo-classes, and pseudo-elements on the
+Mozilla Developer Network (MDN).
+
+Use `\\[fill-paragraph]' to reformat CSS declaration blocks.  It
+can also be used to fill comments.
+
+\\{css-mode-map}"
+  (when (treesit-ready-p 'css-mode 'css)
+    ;; Borrowed from `css-native-mode'.
+    (add-hook 'completion-at-point-functions
+              #'css-completion-at-point nil 'local)
+    (setq-local fill-paragraph-function #'css-fill-paragraph)
+    (setq-local adaptive-fill-function #'css-adaptive-fill)
+    (setq-local add-log-current-defun-function #'css-current-defun-name)
+
+    ;; Tree-sitter specific setup.
+    (treesit-parser-create 'css)
+    (setq-local treesit-simple-indent-rules css--treesit-indent-rules)
+    (setq-local treesit-defun-type-regexp "rule_set")
+    (setq-local treesit-font-lock-settings css--treesit-settings)
+    (setq-local treesit-font-lock-feature-list
+                '((selector comment)
+                  (property constant string)
+                  (error variable function)))
+    (setq-local imenu-create-index-function #'css--treesit-imenu)
+    (setq-local which-func-functions nil)
+    (treesit-major-mode-setup)))
+
 ;;;###autoload
-(define-derived-mode css-mode prog-mode "CSS"
+(define-derived-mode css-mode css-base-mode "CSS"
   "Major mode to edit Cascading Style Sheets (CSS).
 \\<css-mode-map>
 This mode provides syntax highlighting, indentation, completion,
@@ -1679,10 +1828,6 @@ css-mode
 
 \\{css-mode-map}"
   (setq-local font-lock-defaults css-font-lock-defaults)
-  (setq-local comment-start "/*")
-  (setq-local comment-start-skip "/\\*+[ \t]*")
-  (setq-local comment-end "*/")
-  (setq-local comment-end-skip "[ \t]*\\*+/")
   (setq-local syntax-propertize-function
               css-syntax-propertize-function)
   (setq-local fill-paragraph-function #'css-fill-paragraph)
@@ -1691,13 +1836,9 @@ css-mode
   (smie-setup css-smie-grammar #'css-smie-rules
               :forward-token #'css-smie--forward-token
               :backward-token #'css-smie--backward-token)
-  (setq-local electric-indent-chars
-              (append css-electric-keys electric-indent-chars))
   (setq-local font-lock-fontify-region-function #'css--fontify-region)
   (add-hook 'completion-at-point-functions
             #'css-completion-at-point nil 'local)
-  ;; The default "." creates ambiguity with class selectors.
-  (setq-local imenu-space-replacement " ")
   (setq-local imenu-prev-index-position-function
               #'css--prev-index-position)
   (setq-local imenu-extract-index-name-function

commit e41af3971de8f71b5241698a8b29349905f1a969
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Nov 19 15:25:06 2022 -0800

    Change tree-sitter indent preset 'match' to count on all nodes
    
    I changed other presets to count all nodes a while ago, but forgot to
    change 'match' too.
    
    * lisp/treesit.el (treesit-simple-indent-presets): Change to count on
    both named and anonymous nodes.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 0bbed881b5..2ee9771522 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -902,10 +902,10 @@ treesit-simple-indent-presets
                             node-field
                             (or (treesit-node-field-name node) "")))
                        (or (null node-index-min)
-                           (>= (treesit-node-index node t)
+                           (>= (treesit-node-index node)
                                node-index-min))
                        (or (null node-index-max)
-                           (<= (treesit-node-index node t)
+                           (<= (treesit-node-index node)
                                node-index-max))))))
         ;; TODO: Document if genuinely useful.
         (cons 'n-p-gp

commit 1682bd18f50ed2095b2162207603c6b8a3f0225f
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Nov 19 21:34:07 2022 +0200

    Fix encoding and display of messages sent by server to emacsclient
    
    * lisp/server.el (server-start): Use 'locale-coding-system' to
    encode messages sent back to the client.
    
    * lib-src/emacsclient.c (main): Print '-error' messages via
    'message', not directly via 'fprintf'.  This shows the error on
    MS-Windows when the client is invoked as 'emacsclientw', since
    stderr goes to the bit bucket in that case.

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 425db8cfac..ee124ea135 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -2240,7 +2240,7 @@ main (int argc, char **argv)
               char *str = unquote_argument (p + strlen ("-error "));
               if (!skiplf)
                 printf ("\n");
-              fprintf (stderr, "*ERROR*: %s", str);
+	      message (true, "*ERROR*: %s", str);
               if (str[0])
 	        skiplf = str[strlen (str) - 1] == '\n';
               exit_status = EXIT_FAILURE;
diff --git a/lisp/server.el b/lisp/server.el
index 553890ce29..2973b783e6 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -717,7 +717,10 @@ server-start
 		       ;; Those are decoded by server-process-filter according
 		       ;; to file-name-coding-system.  Also don't get
 		       ;; confused by CRs since we don't quote them.
-		       :coding 'raw-text-unix
+                       ;; For encoding, we must use the locale's encoding,
+                       ;; since emacsclient shows that verbatim on the
+                       ;; console.
+		       :coding (cons 'raw-text-unix locale-coding-system)
 		       ;; The other args depend on the kind of socket used.
 		       (if server-use-tcp
 			   (list :family 'ipv4  ;; We're not ready for IPv6 yet

commit 2ec39734ca03e075f2515f178ed789872e52f98f
Author: Thomas Fitzsimmons <fitzsim@fitzsim.org>
Date:   Sat Nov 19 11:39:21 2022 -0500

    EUDC: Add BBDB test
    
    * test/lisp/net/eudc-tests.el (eudcb-ldap): Call skip-unless with
    slapd check.
    (eudcb-bbdb): New test.

diff --git a/test/lisp/net/eudc-resources/bbdb b/test/lisp/net/eudc-resources/bbdb
new file mode 100644
index 0000000000..b730bb51cc
--- /dev/null
+++ b/test/lisp/net/eudc-resources/bbdb
@@ -0,0 +1,3 @@
+;; -*- mode: Emacs-Lisp; coding: utf-8; -*-
+;;; file-format: 9
+["Emacs" "ERT3" nil nil nil nil nil ("emacs-ert-test-3@bbdb.gnu.org") ((notes . " ")) "c8bd3a63-3a83-48a7-a95b-be118a923e00" "2022-11-19 16:36:04 +0000" "2022-11-19 16:36:04 +0000" nil]
diff --git a/test/lisp/net/eudc-tests.el b/test/lisp/net/eudc-tests.el
index 59dce55b82..212db65cb2 100644
--- a/test/lisp/net/eudc-tests.el
+++ b/test/lisp/net/eudc-tests.el
@@ -270,24 +270,42 @@ eudcb-ecomplete
 (require 'ldap)
 (ert-deftest eudcb-ldap ()
   "Test the LDAP back-end."
-  (when (and (file-exists-p "/usr/sbin/slapd")
-             (file-exists-p "/usr/bin/ldapsearch"))
-    (cd (concat (ert-resource-directory) ".."))
-    (let ((ldap-process
-           (start-process "slapd" "*slapd*" "/usr/sbin/slapd"
-                          "-h" "ldap://127.0.0.1:3899" "-d" "0" "-4"
-                          "-f" (ert-resource-file "slapd.conf")))
-          (ldap-host-parameters-alist '(("ldap://localhost:3899"
-                                         base "dc=gnu,dc=org" auth simple)))
-          (eudc-server-hotlist '(("ldap://localhost:3899" . ldap)))
-          (eudc-ignore-options-file t))
-      (sleep-for 1) ; Wait for slapd to start.
-      (should (equal (with-temp-buffer
-                       (insert "emacs-ert-test-1")
-                       (eudc-expand-try-all)
-                       (buffer-string))
-                     "Emacs ERT1 <emacs-ert-test-1@ldap.gnu.org>"))
-      (kill-process ldap-process))))
+  (skip-unless (and (file-exists-p "/usr/sbin/slapd")
+                    (file-exists-p "/usr/bin/ldapsearch")))
+  (cd (concat (ert-resource-directory) ".."))
+  (let ((ldap-process
+         (start-process "slapd" "*slapd*" "/usr/sbin/slapd"
+                        "-h" "ldap://127.0.0.1:3899" "-d" "0" "-4"
+                        "-f" (ert-resource-file "slapd.conf")))
+        (ldap-host-parameters-alist '(("ldap://localhost:3899"
+                                       base "dc=gnu,dc=org" auth simple)))
+        (eudc-server-hotlist '(("ldap://localhost:3899" . ldap)))
+        (eudc-ignore-options-file t))
+    (sleep-for 1) ; Wait for slapd to start.
+    (should (equal (with-temp-buffer
+                     (insert "emacs-ert-test-1")
+                     (eudc-expand-try-all)
+                     (buffer-string))
+                   "Emacs ERT1 <emacs-ert-test-1@ldap.gnu.org>"))
+    (kill-process ldap-process)))
+
+(eval-and-compile
+  (push (expand-file-name "../elpa/packages/bbdb/lisp" source-directory)
+        load-path)
+  (defvar bbdb-file)
+  (require 'bbdb nil t))
+
+(ert-deftest eudcb-bbdb ()
+  "Test the BBDB back-end."
+  (skip-unless (featurep 'bbdb))
+  (let ((bbdb-file (ert-resource-file "bbdb"))
+        (eudc-server-hotlist '(("" . bbdb)))
+        (eudc-ignore-options-file t))
+    (should (equal (with-temp-buffer
+                     (insert "emacs-ert-test-3")
+                     (eudc-expand-try-all)
+                     (buffer-string))
+                   "Emacs ERT3 <emacs-ert-test-3@bbdb.gnu.org>"))))
 
 (provide 'eudc-tests)
 ;;; eudc-tests.el ends here

commit 740fe3e7575a2f9bb0288eaa7f81b97173b00f6a
Author: Gregory Heytings <gregory@heytings.org>
Date:   Sat Nov 19 15:46:46 2022 +0000

    Fix global face scaling bug due to rounding.
    
    * lisp/face-remap.el (global-text-scale-adjust): Try again if the face
    height should have changed but did not actually change.  Update the
    docstring to clarify the difference with 'text-scale-adjust'.
    (global-text-scale-adjust--increment-factor): New internal variable.
    Fixes bug#59122.
    (text-scale-adjust): Update the docstring to clarify the difference
    with 'global-text-scale-adjust'.

diff --git a/lisp/face-remap.el b/lisp/face-remap.el
index f1530285fb..a692015094 100644
--- a/lisp/face-remap.el
+++ b/lisp/face-remap.el
@@ -397,7 +397,11 @@ text-scale-adjust
 this are the `default' and `header-line' faces: they will both be
 scaled even if they have an explicit `:height' setting.
 
-See also the related command `global-text-scale-adjust'."
+See also the related command `global-text-scale-adjust'.  Unlike
+that command, which scales the font size with a increment,
+`text-scale-adjust' scales the font size with a factor,
+`text-scale-mode-step'.  With a small `text-scale-mode-step'
+factor, the two commands behave similarly."
   (interactive "p")
   (let ((ev last-command-event)
 	(echo-keystrokes nil))
@@ -462,6 +466,8 @@ global-text-scale-adjust-limits
 
 (defvar global-text-scale-adjust--default-height nil)
 
+(defvar global-text-scale-adjust--increment-factor 5)
+
 ;;;###autoload (define-key ctl-x-map [(control meta ?+)] 'global-text-scale-adjust)
 ;;;###autoload (define-key ctl-x-map [(control meta ?=)] 'global-text-scale-adjust)
 ;;;###autoload (define-key ctl-x-map [(control meta ?-)] 'global-text-scale-adjust)
@@ -492,7 +498,10 @@ global-text-scale-adjust
 whether the frames are resized to keep the same number of lines
 and characters per line when the font size is adjusted.
 
-See also the related command `text-scale-adjust'."
+See also the related command `text-scale-adjust'.  Unlike that
+command, which scales the font size with a factor,
+`global-text-scale-adjust' scales the font size with an
+increment."
   (interactive "p")
   (when (display-graphic-p)
     (unless global-text-scale-adjust--default-height
@@ -503,16 +512,24 @@ global-text-scale-adjust
            (cur (face-attribute 'default :height))
            (inc
             (pcase key
-              (?- (* (- increment) 5))
+              (?- (* (- increment)
+                     global-text-scale-adjust--increment-factor))
               (?0 (- global-text-scale-adjust--default-height cur))
-              (_ (* increment 5))))
+              (_ (* increment
+                    global-text-scale-adjust--increment-factor))))
            (new (+ cur inc)))
       (when (< (car global-text-scale-adjust-limits)
                new
                (cdr global-text-scale-adjust-limits))
         (let ((frame-inhibit-implied-resize
                (not global-text-scale-adjust-resizes-frames)))
-          (set-face-attribute 'default nil :height new)))
+          (set-face-attribute 'default nil :height new)
+          (redisplay 'force)
+          (when (and (not (and (characterp key) (= key ?0)))
+                     (= cur (face-attribute 'default :height)))
+            (setq global-text-scale-adjust--increment-factor
+                  (1+ global-text-scale-adjust--increment-factor))
+            (global-text-scale-adjust increment))))
       (when (characterp key)
         (set-transient-map
          (let ((map (make-sparse-keymap)))

commit db3ff76dc7d3184e51cb7ed17c78ef76babb9032
Author: Brent Westbrook <bwestbr2@go.olemiss.edu>
Date:   Sat Nov 19 09:23:57 2022 -0500

    EUDC: Fix a void-variable error
    
    * lisp/net/eudcb-mailabbrev.el (eudc-mailabbrev-query-internal):
    Check if symbol is bound before taking its value.  (Bug#59369)

diff --git a/lisp/net/eudcb-mailabbrev.el b/lisp/net/eudcb-mailabbrev.el
index 64b50af09b..4a2dd9ad4a 100644
--- a/lisp/net/eudcb-mailabbrev.el
+++ b/lisp/net/eudcb-mailabbrev.el
@@ -78,7 +78,10 @@ eudc-mailabbrev-query-internal
     (dolist (term query)
       (let* ((attr (car term))
              (value (cdr term))
-             (raw-matches (symbol-value (intern-soft value mail-abbrevs))))
+             (soft (intern-soft value mail-abbrevs))
+             (raw-matches (and
+                           (boundp soft)
+                           (symbol-value soft))))
         (when (and raw-matches
                    (memq attr '(email firstname name)))
           (let* ((matches (split-string raw-matches ", "))

commit 91c3a276dd5cdeb6eab40d921ff2def47500a4c4
Author: Gregory Heytings <gregory@heytings.org>
Date:   Sat Nov 19 14:00:17 2022 +0000

    ; * Makefile.in: Add option to disable advice on failure.

diff --git a/Makefile.in b/Makefile.in
index 66fa688feb..3109472a8a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -405,6 +405,7 @@ actual-all: ${SUBDIR} info $(gsettings_SCHEMAS:
 # ADVICE-ON-FAILURE-END:bootstrap
 
 advice-on-failure:
+	@[ -f .no-advice-on-failure ] && exit ${exit-status}; true
 	@echo >&2 '***'
 	@echo >&2 '*** '"\"make ${make-target}\" failed with exit status ${exit-status}."
 	@echo >&2 '***'
@@ -415,6 +416,7 @@ advice-on-failure:
 	@exit ${exit-status}
 
 sanity-check:
+	@[ -f .no-advice-on-failure ] && exit 0; true
 	@v=$$(src/emacs${EXEEXT} --batch --eval \
 	  '(progn (defun f (n) (if (= 0 n) 1 (* n (f (- n 1))))) (princ (f 10)))' \
 	  2> /dev/null); \

commit 00aebdc182015614e215885e72a06f6df03e57d2
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Sat Nov 19 12:19:37 2022 +0100

    * lisp/emacs-lisp/package.el (package-maintainers): Improve error handling

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 2f19573e3c..c1545a2870 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -4532,19 +4532,28 @@ package-browse-url
         (funcall browse-url-secondary-browser-function url)
       (browse-url url))))
 
+(declare-function ietf-drums-parse-address "ietf-drums"
+                  (string &optional decode))
+
 (defun package-maintainers (pkg-desc &optional no-error)
   "Return an email address for the maintainers of PKG-DESC.
 The email address may contain commas, if there are multiple
 maintainers.  If no maintainers are found, an error will be
 signaled.  If the optional argument NO-ERROR is non-nil no error
 will be signaled in that case."
-  (unless pkg-desc
-    (error "Invalid package description"))
-  (let* ((extras (package-desc-extras pkg-desc))
+  (unless (package-desc-p pkg-desc)
+    (error "Invalid package description: %S" pkg-desc))
+  (let* ((name (package-desc-name pkg-desc))
+         (extras (package-desc-extras pkg-desc))
          (maint (alist-get :maintainer extras)))
     (cond
      ((and (null maint) (null no-error))
-      (user-error "Package has no explicit maintainer"))
+      (user-error "Package `%s' has no explicit maintainer" name))
+     ((and (not (progn
+                  (require 'ietf-drums)
+                  (ietf-drums-parse-address maint)))
+           (null no-error))
+      (user-error "Package `%s' has no maintainer address" name))
      ((not (null maint))
       (with-temp-buffer
         (package--print-email-button maint)

commit 9ad3fce4a5c902a2c23b0ef2e7a8a5cae5cc3876
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Nov 19 14:43:51 2022 +0200

    ; Avoid byte-compiler warning in startup.el
    
    * lisp/startup.el (startup--load-user-init-file): Avoid
    byte-compiler warnings about 'comp-eln-to-el-h'.  (Bug#59334)

diff --git a/lisp/startup.el b/lisp/startup.el
index d7d8743336..5e0a47d3f8 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1076,7 +1076,10 @@ startup--load-user-init-file
                       (sit-for 1))
                     (setq user-init-file source)))
               ;; Else, perhaps the user init file was compiled
-              (when (equal (file-name-extension user-init-file) "eln")
+              (when (and (equal (file-name-extension user-init-file) "eln")
+                         ;; The next test is for builds without native
+                         ;; compilation support or builds with unexec.
+                         (boundp 'comp-eln-to-el-h))
                 (if-let (source (gethash (file-name-nondirectory user-init-file)
                                          comp-eln-to-el-h))
                     ;; source exists or the .eln file would not load

commit 46ceb2ac4bceec9c5fb55d9d02a34e2c78136cf3
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Sat Nov 19 12:51:31 2022 +0100

    ; Fix typos in bs.el
    
    * lisp/bs.el: Fix typos.
    (bs-define-sort-function, bs-cycle-next, bs-cycle-previous): Fix
    variable name typo.

diff --git a/lisp/bs.el b/lisp/bs.el
index 060bae6fdd..1fd31fb3b8 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -25,7 +25,7 @@
 
 ;;; Commentary:
 
-;; The bs-package contains a main function bs-show for popping up a
+;; The bs package contains a main function `bs-show' for popping up a
 ;; buffer in a way similar to `list-buffers' and `electric-buffer-list':
 ;; The new buffer offers a Buffer Selection Menu for manipulating
 ;; the buffer list and buffers.
@@ -42,18 +42,18 @@
 
 ;;; Quick Installation and Customization:
 
-;; To display the bs menu, do
+;; To display the bs menu, type
 ;;   M-x bs-show
-;; To customize its behavior, do
+;; To customize its behavior, type
 ;;   M-x bs-customize
 
 ;;; More Commentary:
 
-;; bs-show will generate a new buffer named *buffer-selection*, which shows
+;; `bs-show' will generate a new buffer named *buffer-selection*, which shows
 ;; all buffers or a subset of them, and has possibilities for deleting,
-;; saving and selecting buffers. For more details see docstring of
-;; function `bs-mode'. A current configuration describes which buffers appear
-;; in *buffer-selection*. See docstring of variable `bs-configurations' for
+;; saving and selecting buffers.  For more details see docstring of
+;; function `bs-mode'.  A current configuration describes which buffers appear
+;; in *buffer-selection*.  See docstring of variable `bs-configurations' for
 ;; more details.
 ;;
 ;; The package bs combines the advantages of the Emacs functions
@@ -70,7 +70,7 @@
 
 ;;; Cycling through buffers
 
-;; This package offers two functions for buffer cycling. If you want to cycle
+;; This package offers two functions for buffer cycling.  If you want to cycle
 ;; through buffer list you can use `bs-cycle-next' or `bs-cycle-previous'.
 ;; Bind these function to a key like
 ;;   (global-set-key [(f9)]   'bs-cycle-previous)
@@ -80,7 +80,7 @@
 ;; to go through internal buffers like *Messages*.
 ;;
 ;; Cycling through buffers ignores sorting because sorting destroys
-;; the logical buffer list. If buffer list is sorted by size you
+;; the logical buffer list.  If buffer list is sorted by size you
 ;; won't be able to cycle to the smallest buffer.
 
 ;;; Customization:
@@ -114,7 +114,7 @@
 ;; When cycling through buffer list the functions for cycling will use
 ;; the current configuration of bs to calculate the buffer list.
 ;; If you want to use a different configuration for cycling you have to set
-;; the variable `bs-cycle-configuration-name'. You can customize this variable.
+;; the variable `bs-cycle-configuration-name'.  You can customize this variable.
 ;;
 ;; For example: If you use the configuration called "files-and-scratch" you
 ;; can cycle through all file buffers and *scratch* although your current
@@ -390,9 +390,9 @@ bs-define-sort-function
 FACE is a face used to fontify the sorted column title.  A value of nil means
 don't highlight.
 The new sort aspect will be inserted into list `bs-sort-functions'."
-  (let ((tupel (assoc name bs-sort-functions)))
-    (if tupel
-	(setcdr tupel (list fun regexp-for-sorting face))
+  (let ((tuple (assoc name bs-sort-functions)))
+    (if tuple
+        (setcdr tuple (list fun regexp-for-sorting face))
       (setq bs-sort-functions
 	    (cons (list name fun regexp-for-sorting face)
 		  bs-sort-functions)))))
@@ -1240,13 +1240,13 @@ bs-cycle-next
     (bs-set-configuration (or bs-cycle-configuration-name bs-default-configuration))
     (let ((bs-buffer-sort-function nil)
 	  (bs--current-sort-function nil))
-      (let* ((tupel (bs-next-buffer (if (or (eq last-command
+      (let* ((tuple (bs-next-buffer (if (or (eq last-command
 						'bs-cycle-next)
 					    (eq last-command
 						'bs-cycle-previous))
 					bs--cycle-list)))
-	     (next (car tupel))
-	     (cycle-list (cdr tupel)))
+             (next (car tuple))
+             (cycle-list (cdr tuple)))
         ;; We don't want the frame iconified if the only window in the frame
         ;; happens to be dedicated.
         (bury-buffer (current-buffer))
@@ -1272,13 +1272,13 @@ bs-cycle-previous
     (bs-set-configuration (or bs-cycle-configuration-name bs-default-configuration))
     (let ((bs-buffer-sort-function nil)
 	  (bs--current-sort-function nil))
-      (let* ((tupel (bs-previous-buffer (if (or (eq last-command
+      (let* ((tuple (bs-previous-buffer (if (or (eq last-command
 						    'bs-cycle-next)
 						(eq last-command
 						    'bs-cycle-previous))
 					    bs--cycle-list)))
-	     (prev-buffer (car tupel))
-	     (cycle-list (cdr tupel)))
+             (prev-buffer (car tuple))
+             (cycle-list (cdr tuple)))
 	(switch-to-buffer prev-buffer nil t)
 	(setq bs--cycle-list (append (last cycle-list)
 				     (reverse (cdr (reverse cycle-list)))))

commit 87dd44e982048db8170095e8a76204d77297ea29
Author: Mattias Engdegård <mattiase@acm.org>
Date:   Sat Nov 19 12:29:46 2022 +0100

    * Makefile.in: Escape literal asterisks in regexps
    
    Discovered by Po Lu.

diff --git a/Makefile.in b/Makefile.in
index 45b4a59e3d..66fa688feb 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -410,7 +410,7 @@ advice-on-failure:
 	@echo >&2 '***'
 	@cat Makefile | \
 	  sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q};' | \
-	  sed 's/^# /*** /' | grep -v '^*** ADVICE-ON-FAILURE-' >&2
+	  sed 's/^# /*** /' | grep -v '^\*\*\* ADVICE-ON-FAILURE-' >&2
 	@echo >&2 '***'
 	@exit ${exit-status}
 
@@ -424,7 +424,7 @@ sanity-check:
 	echo >&2 '***'; \
 	cat Makefile | \
 	  sed -n '/^# ADVICE-ON-FAILURE-BEGIN:${make-target}/,$${p;/^# ADVICE-ON-FAILURE-END:${make-target}/q};' | \
-	  sed 's/^# /*** /' | grep -v '^*** ADVICE-ON-FAILURE-' >&2; \
+	  sed 's/^# /*** /' | grep -v '^\*\*\* ADVICE-ON-FAILURE-' >&2; \
 	echo >&2 '***'; \
 	exit 1
 

commit 07127e9c29a7d467f951f2ff939aae62ad744302
Author: Po Lu <luangruo@yahoo.com>
Date:   Sat Nov 19 18:46:07 2022 +0800

    Fix error trapping in x_set_mouse_color
    
    * src/xfns.c (x_set_mouse_color): Use
    x_uncatch_errors_after_check right after x_had_errors_p.  Then,
    trap errors around FreeCursor requests, since some of the IDs
    may not name valid cursors.

diff --git a/src/xfns.c b/src/xfns.c
index 2ff70f7985..95092ce05f 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1362,13 +1362,21 @@ x_set_mouse_color (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
       char *xmessage = alloca (1 + message_length);
       memcpy (xmessage, cursor_data.error_string, message_length);
 
-      x_uncatch_errors ();
+      x_uncatch_errors_after_check ();
+
+      /* XFreeCursor can generate BadCursor errors, because
+	 XCreateFontCursor is not a request that waits for a reply,
+	 and as such can return IDs that will not actually be used by
+	 the server.  */
+      x_ignore_errors_for_next_request (FRAME_DISPLAY_INFO (f));
 
       /* Free any successfully created cursors.  */
       for (i = 0; i < mouse_cursor_max; i++)
 	if (cursor_data.cursor[i] != 0)
 	  XFreeCursor (dpy, cursor_data.cursor[i]);
 
+      x_stop_ignoring_errors (FRAME_DISPLAY_INFO (f));
+
       /* This should only be able to fail if the server's serial
 	 number tracking is broken.  */
       if (cursor_data.error_cursor >= 0)

commit 4a2e3d19f72764c6724b5f126fd2618e99860153
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Nov 19 11:52:06 2022 +0200

    ; Improve doc strings of Ethiopic support functions and variables
    
    * lisp/language/ethio-util.el (ethio-primary-language)
    (ethio-secondary-language, ethio-use-colon-for-colon)
    (ethio-use-three-dot-question, ethio-quote-vowel-always)
    (ethio-W-sixth-always, ethio-sera-to-fidel-buffer)
    (ethio-sera-to-fidel-region, ethio-sera-to-fidel-marker)
    (ethio-fidel-to-sera-buffer, ethio-fidel-to-sera-region)
    (ethio-fidel-to-sera-marker, ethio-get-consonant)
    (ethio-fidel-to-tex-buffer, ethio-tex-to-fidel-buffer)
    (ethio-fidel-to-java-buffer, ethio-java-to-fidel-buffer)
    (ethio-find-file, ethio-write-file, ethio-gemination)
    ("ethiopic-sera"): Doc fixes.

diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index 3744b7b24f..5b4252d779 100644
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -112,6 +112,8 @@ ethiopic
 
 (defcustom ethio-primary-language 'tigrigna
   "Symbol that defines the primary language in SERA --> FIDEL conversion.
+FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation
+in ASCII) is the Latin representation of Ethiopic script.
 The value should be one of: `tigrigna', `amharic' or `english'."
   :version "28.1"
   :type '(choice (const :tag "Tigrigna" tigrigna)
@@ -120,6 +122,8 @@ ethio-primary-language
 
 (defcustom ethio-secondary-language 'english
   "Symbol that defines the secondary language in SERA --> FIDEL conversion.
+FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation
+in ASCII) is the Latin representation of Ethiopic script.
 The value should be one of: `tigrigna', `amharic' or `english'."
   :version "28.1"
   :type '(choice (const :tag "Tigrigna" tigrigna)
@@ -130,7 +134,9 @@ ethio-use-colon-for-colon
   "Non-nil means associate ASCII colon with Ethiopic colon.
 If nil, associate ASCII colon with Ethiopic word separator, i.e., two
 vertically stacked dots.  All SERA <--> FIDEL converters refer this
-variable."
+variable.
+FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation
+in ASCII) is the Latin representation of Ethiopic script."
   :version "28.1"
   :type 'boolean)
 
@@ -138,7 +144,9 @@ ethio-use-three-dot-question
   "If non-nil, associate ASCII question mark with Ethiopic question mark.
 The Ethiopic old style question mark is three vertically stacked dots.
 If nil, associate ASCII question mark with Ethiopic stylized question
-mark.  All SERA <--> FIDEL converters refer this variable."
+mark.  All SERA <--> FIDEL converters refer this variable.
+FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation
+in ASCII) is the Latin representation of Ethiopic script."
   :version "28.1"
   :type 'boolean)
 
@@ -147,13 +155,17 @@ ethio-quote-vowel-always
 This happens in FIDEL --> SERA conversions.  Isolated vowels at
 word beginning do not get an apostrophe put before them.
 If nil, put an apostrophe only between a 6th-form consonant and an
-isolated vowel."
+isolated vowel.
+FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation
+in ASCII) is the Latin representation of Ethiopic script."
   :version "28.1"
   :type 'boolean)
 
 (defcustom ethio-W-sixth-always nil
   "Non-nil means convert the Wu-form of a 12-form consonant to \"W'\".
-This is instead of \"Wu\" in FIDEL --> SERA conversion."
+This is instead of \"Wu\" in FIDEL --> SERA conversion.
+FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation
+in ASCII) is the Latin representation of Ethiopic script."
   :version "28.1"
   :type 'boolean)
 
@@ -223,6 +235,8 @@ ethio-adjust-robin
 (defun ethio-sera-to-fidel-buffer (&optional secondary force)
   "Convert the current buffer from SERA to FIDEL.
 
+FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation
+in ASCII) is the Latin representation of Ethiopic script.
 The variable `ethio-primary-language' specifies the primary
 language and `ethio-secondary-language' specifies the secondary.
 
@@ -248,6 +262,8 @@ sera-being-called-by-w3
 (defun ethio-sera-to-fidel-region (begin end &optional secondary force)
   "Convert the characters in region from SERA to FIDEL.
 
+FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation
+in ASCII) is the Latin representation of Ethiopic script.
 The variable `ethio-primary-language' specifies the primary
 language and `ethio-secondary-language' specifies the secondary.
 
@@ -503,7 +519,9 @@ ethio-process-digits
 
 ;;;###autoload
 (defun ethio-sera-to-fidel-marker (&optional force)
-  "Convert the regions surrounded by \"<sera>\" and \"</sera>\" from SERA to FIDEL.
+  "Convert regions surrounded by \"<sera>\" and \"</sera>\" from SERA to FIDEL.
+FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation
+in ASCII) is the Latin representation of Ethiopic script.
 Assume that each region begins with `ethio-primary-language'.
 The markers \"<sera>\" and \"</sera>\" themselves are not deleted."
   (interactive "P")
@@ -535,7 +553,9 @@ ethio-language-to-flag
 
 ;;;###autoload
 (defun ethio-fidel-to-sera-buffer (&optional secondary force)
-  "Replace all the FIDEL characters in the current buffer to the SERA format.
+  "Convert all the FIDEL characters in the current buffer to the SERA format.
+FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation
+in ASCII) is the Latin representation of Ethiopic script.
 The variable `ethio-primary-language' specifies the primary
 language and `ethio-secondary-language' specifies the secondary.
 
@@ -555,8 +575,10 @@ ethio-fidel-to-sera-buffer
 
 ;;;###autoload
 (defun ethio-fidel-to-sera-region (begin end &optional secondary force)
-  "Replace all the FIDEL characters in the region to the SERA format.
+  "Convert all the FIDEL characters in the region to the SERA format.
 
+FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation
+in ASCII) is the Latin representation of Ethiopic script.
 The variable `ethio-primary-language' specifies the primary
 language and `ethio-secondary-language' specifies the secondary.
 
@@ -674,6 +696,8 @@ ethio-fidel-to-sera-region
 ;;;###autoload
 (defun ethio-fidel-to-sera-marker (&optional force)
   "Convert the regions surrounded by \"<sera>\" and \"</sera>\" from FIDEL to SERA.
+FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation
+in ASCII) is the Latin representation of Ethiopic script.
 The markers \"<sera>\" and \"</sera>\" themselves are not deleted."
 
   (interactive "P")
@@ -698,7 +722,8 @@ ethio-fidel-to-sera-marker
 
 ;;;###autoload
 (defun ethio-modify-vowel nil
-  "Modify the vowel of the FIDEL that is under the cursor."
+  "Modify the vowel of the FIDEL that is under the cursor.
+FIDEL is the Amharic/Ethiopic alphabet."
   (interactive)
   (ethio-adjust-robin)
   (let ((consonant (ethio-get-consonant (following-char)))
@@ -715,7 +740,9 @@ ethio-modify-vowel
 	  (robin-convert-region (point-min) (point-max) "ethiopic-sera"))))))
 
 (defun ethio-get-consonant (ch)
-  "Return the consonant part of CH's SERA spelling in ethiopic-sera."
+  "Return the consonant part of CH's SERA spelling in ethiopic-sera.
+SERA (System for Ethiopic Representation in ASCII) is the Latin
+representation of Ethiopic script."
   (let ((sera (get-char-code-property ch 'ethiopic-sera)))
     (cond
      ((null sera) nil)
@@ -820,7 +847,8 @@ ethio-input-special-character
 
 ;;;###autoload
 (defun ethio-fidel-to-tex-buffer nil
-  "Convert each fidel characters in the current buffer into a fidel-tex command."
+  "Convert each FIDEL characters in the current buffer into a fidel-tex command.
+FIDEL is the Amharic/Ethiopic alphabet."
   (interactive)
   (let ((buffer-read-only nil)
 	comp)
@@ -867,7 +895,8 @@ ethio-fidel-to-tex-buffer
 
 ;;;###autoload
 (defun ethio-tex-to-fidel-buffer ()
-  "Convert fidel-tex commands in the current buffer into fidel chars."
+  "Convert fidel-tex commands in the current buffer into FIDEL chars.
+FIDEL is the Amharic/Ethiopic alphabet."
   (interactive)
   (let ((inhibit-read-only t)
 	;; (p) (ch)
@@ -895,7 +924,7 @@ ethio-tex-to-fidel-buffer
 
 ;;;###autoload
 (defun ethio-fidel-to-java-buffer nil
-  "Convert Ethiopic characters into the Java escape sequences.
+  "Convert Ethiopic characters in the buffer into the Java escape sequences.
 
 Each escape sequence is of the form \\uXXXX, where XXXX is the
 character's codepoint (in hex) in Unicode.
@@ -914,7 +943,7 @@ ethio-fidel-to-java-buffer
 
 ;;;###autoload
 (defun ethio-java-to-fidel-buffer nil
-  "Convert the Java escape sequences into corresponding Ethiopic characters."
+  "Convert the Java escape sequences in the buffer into Ethiopic characters."
   (let ((case-fold-search t)
 	(ucode))
     (goto-char (point-min))
@@ -929,7 +958,17 @@ ethio-java-to-fidel-buffer
 
 ;;;###autoload
 (defun ethio-find-file nil
-  "Transliterate file content into Ethiopic depending on filename suffix."
+  "Transliterate file content into Ethiopic depending on filename suffix.
+If the file-name extension is \".sera\", convert from SERA to FIDEL.
+If the file-name extension is \".html\", convert regions enclosed
+by \"<sera>..</sera>\" from SERA to FIDEL.
+If the file-name extension is \".tex\", convert fidel-tex commands
+to FIDEL characters.
+If the file-name extension is \".java\", convert Java escape sequences
+to FIDEL characters.
+
+FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation
+in ASCII) is the Latin representation of Ethiopic script."
   (cond
 
    ((string-match "\\.sera$" (buffer-file-name))
@@ -963,7 +1002,17 @@ ethio-find-file
 
 ;;;###autoload
 (defun ethio-write-file nil
-  "Transliterate Ethiopic characters in ASCII depending on the file extension."
+  "Transliterate Ethiopic characters to ASCII depending on the file extension.
+If the file-name extension is \".sera\", convert from FIDEL to SERA.
+If the file-name extension is \".html\", convert FIDEL characters to
+SERA regions enclosed by \"<sera>..</sera>\".
+If the file-name extension is \".tex\", convert FIDEL characters
+to fidel-tex commands.
+If the file-name extension is \".java\", convert FIDEL characters to
+Java escape sequences.
+
+FIDEL is the Amharic alphabet; SERA (System for Ethiopic Representation
+in ASCII) is the Latin representation of Ethiopic script."
   (cond
 
    ((string-match "\\.sera$" (buffer-file-name))
@@ -1069,7 +1118,7 @@ ethio-composition-function
 
 ;; This function is not used any more.
 (defun ethio-gemination nil
-  "Compose the character before the point with the Ethiopic gemination mark.
+  "Compose the character before point with the Ethiopic gemination mark.
 If the character is already composed, decompose it and remove the gemination
 mark."
   (interactive "*")
@@ -1088,7 +1137,9 @@ ethio-gemination
 ;;;
 
 (robin-define-package "ethiopic-sera"
- "SERA transliteration system for Ethiopic."
+ "SERA transliteration system for Ethiopic.
+SERA (System for Ethiopic Representation in ASCII) is the Latin
+representation of Ethiopic script."
 
  ("he" ?ሀ)
  ("hu" ?ሁ)

commit 59eaa30b07e9a79a9b2bb6ade0be9aac846384e2
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Nov 19 01:33:36 2022 -0800

    Use keyword-face for declaration commands in tree-sitter sh-mode
    
    * lisp/progmodes/sh-script.el: Change builtin to keyword.

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 7483b31a37..3b66cdfab4 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -3297,7 +3297,7 @@ sh-mode--treesit-settings
 
    :feature 'declaration-command
    :language 'bash
-   `([,@sh-mode--treesit-declaration-commands] @font-lock-builtin-face)
+   `([,@sh-mode--treesit-declaration-commands] @font-lock-keyword-face)
 
    :feature 'constant
    :language 'bash

commit ea721f2d0b15978315f18f985364e22912a50dfb
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Nov 19 11:25:25 2022 +0200

    ; Explain why some files are encoded in utf-8-emacs
    
    * lisp/international/titdic-cnv.el:
    * lisp/language/ethio-util.el:
    * lisp/language/ethiopic.el:
    * lisp/language/ind-util.el:
    * lisp/language/tibetan.el:
    * lisp/language/tibet-util.el:
    * lisp/leim/quail/ethiopic.el:
    * lisp/leim/quail/tibetan.el: Add commentary explaining why these
    files are encoded in utf-8-emacs.  (Bug#59341)

diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index d2a6ee1e9d..b942f5fabc 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -59,6 +59,13 @@
 ;; Near the end of this file, we also have a few other tools to convert
 ;; miscellaneous dictionaries.
 
+;; Note: This file includes several codepoints outside of the Unicode
+;; 0..#x10FFFF range, which are characters that were not unified into
+;; Unicode.  Therefore, this file is encoded in utf-8-emacs, because
+;; UTF-8 cannot encode such codepoints.  We include these codepoints
+;; literally in the file to have them displayed by suitable fonts,
+;; which makes maintenance easier.
+
 ;;; Code:
 
 (require 'quail)
diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index 2f76acfe7c..3744b7b24f 100644
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -30,6 +30,13 @@
 
 ;;; Commentary:
 
+;; Note: This file includes several codepoints outside of the Unicode
+;; 0..#x10FFFF range, which are characters that were not unified into
+;; Unicode.  Therefore, this file is encoded in utf-8-emacs, because
+;; UTF-8 cannot encode such codepoints.  We include these codepoints
+;; literally in the file to have them displayed by suitable fonts,
+;; which makes maintenance easier.
+
 ;;; Code:
 
 (require 'robin)
diff --git a/lisp/language/ethiopic.el b/lisp/language/ethiopic.el
index 1faba424ba..fb1e272843 100644
--- a/lisp/language/ethiopic.el
+++ b/lisp/language/ethiopic.el
@@ -27,6 +27,13 @@
 
 ;;; Commentary:
 
+;; Note: This file includes several codepoints outside of the Unicode
+;; 0..#x10FFFF range, which are characters that were not unified into
+;; Unicode.  Therefore, this file is encoded in utf-8-emacs, because
+;; UTF-8 cannot encode such codepoints.  We include these codepoints
+;; literally in the file to have them displayed by suitable fonts,
+;; which makes maintenance easier.
+
 ;;; Code:
 
 (define-ccl-program ccl-encode-ethio-font
diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el
index e2a21820f4..447ca0c20c 100644
--- a/lisp/language/ind-util.el
+++ b/lisp/language/ind-util.el
@@ -27,6 +27,13 @@
 ;; Finally, this program provides the compatibility support with
 ;; old implementation of Devanagari script.
 
+;; Note: This file includes several codepoints outside of the Unicode
+;; 0..#x10FFFF range, which are characters that were not unified into
+;; Unicode.  Therefore, this file is encoded in utf-8-emacs, because
+;; UTF-8 cannot encode such codepoints.  We include these codepoints
+;; literally in the file to have them displayed by suitable fonts,
+;; which makes maintenance easier.
+
 ;;; Code:
 
 ;;; Transliteration
diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el
index e7cb289b65..0f09c48d6d 100644
--- a/lisp/language/tibet-util.el
+++ b/lisp/language/tibet-util.el
@@ -32,6 +32,13 @@
 
 ;;; Commentary:
 
+;; Note: This file includes several codepoints outside of the Unicode
+;; 0..#x10FFFF range, which are characters that were not unified into
+;; Unicode.  Therefore, this file is encoded in utf-8-emacs, because
+;; UTF-8 cannot encode such codepoints.  We include these codepoints
+;; literally in the file to have them displayed by suitable fonts,
+;; which makes maintenance easier.
+
 ;;; Code:
 
 (defconst tibetan-obsolete-glyphs
diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el
index 0262798bb2..8121045789 100644
--- a/lisp/language/tibetan.el
+++ b/lisp/language/tibetan.el
@@ -34,6 +34,13 @@
 
 ;;; Commentary:
 
+;; Note: This file includes several codepoints outside of the Unicode
+;; 0..#x10FFFF range, which are characters that were not unified into
+;; Unicode.  Therefore, this file is encoded in utf-8-emacs, because
+;; UTF-8 cannot encode such codepoints.  We include these codepoints
+;; literally in the file to have them displayed by suitable fonts,
+;; which makes maintenance easier.
+
 ;;; Code:
 
 ;;; Tibetan Character set.
diff --git a/lisp/leim/quail/ethiopic.el b/lisp/leim/quail/ethiopic.el
index c8753effe0..df4bf596cb 100644
--- a/lisp/leim/quail/ethiopic.el
+++ b/lisp/leim/quail/ethiopic.el
@@ -26,6 +26,13 @@
 
 ;;; Commentary:
 
+;; Note: This file includes several codepoints outside of the Unicode
+;; 0..#x10FFFF range, which are characters that were not unified into
+;; Unicode.  Therefore, this file is encoded in utf-8-emacs, because
+;; UTF-8 cannot encode such codepoints.  We include these codepoints
+;; literally in the file to have them displayed by suitable fonts,
+;; which makes maintenance easier.
+
 ;;; Code:
 
 (require 'quail)
diff --git a/lisp/leim/quail/tibetan.el b/lisp/leim/quail/tibetan.el
index ca44f7022d..7f0848d04b 100644
--- a/lisp/leim/quail/tibetan.el
+++ b/lisp/leim/quail/tibetan.el
@@ -33,6 +33,13 @@
 
 ;;; Commentary:
 
+;; Note: This file includes several codepoints outside of the Unicode
+;; 0..#x10FFFF range, which are characters that were not unified into
+;; Unicode.  Therefore, this file is encoded in utf-8-emacs, because
+;; UTF-8 cannot encode such codepoints.  We include these codepoints
+;; literally in the file to have them displayed by suitable fonts,
+;; which makes maintenance easier.
+
 ;;; Code:
 
 (require 'quail)

commit 5d77eb4b7c00d0652b190166c393efa16d0775a9
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Nov 19 00:41:19 2022 -0800

    ; * lisp/treesit.el (treesit--font-lock-notifier): Add messaging.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 6a41c1a411..0bbed881b5 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -844,6 +844,9 @@ treesit--font-lock-notifier
 parser notifying of the change."
   (with-current-buffer (treesit-parser-buffer parser)
     (dolist (range ranges)
+      (when treesit--font-lock-verbose
+        (message "Notifier recieved range: %s-%s"
+                 (car range) (cdr range)))
       (put-text-property (car range) (cdr range) 'fontified nil))))
 
 ;;; Indent

commit c6384e9bfbc765229ea9676ba1044b9db28fec2d
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Nov 19 00:25:57 2022 -0800

    Fix python-mode tree-sitter fontification
    
    Forgot to update python-mode's code when I added the tree-sitter
    notifier facility.  Now it doesn't need any special treatment anymore.
    Leaving it as is causes some incorrect fontification.
    
    * lisp/progmodes/python.el (python--treesit-fontify-string): Accept
    the string node rather than the quote node.
    (python--treesit-settings): Capture string node.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 22485a025e..b9b71a57d7 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1014,16 +1014,15 @@ python--treesit-exceptions
 
 (defun python--treesit-fontify-string (node override start end &rest _)
   "Fontify string.
-NODE is the leading quote in the string.  Do not fontify the
-initial f for f-strings.  OVERRIDE is the override flag described
-in `treesit-font-lock-rules'.  START and END marks the region to
-be fontified."
-  (let* ((string (treesit-node-parent node))
-         (string-beg (treesit-node-start string))
-         (string-end (treesit-node-end string))
+NODE is the string node.  Do not fontify the initial f for
+f-strings.  OVERRIDE is the override flag described in
+`treesit-font-lock-rules'.  START and END marks the region to be
+fontified."
+  (let* ((string-beg (treesit-node-start node))
+         (string-end (treesit-node-end node))
          (maybe-defun (treesit-node-parent
                        (treesit-node-parent
-                        (treesit-node-parent string))))
+                        (treesit-node-parent node))))
          (face (if (member (treesit-node-type maybe-defun)
                            '("function_definition"
                              "class_definition"))
@@ -1043,8 +1042,7 @@ python--treesit-settings
    :feature 'string
    :language 'python
    :override t
-   ;; TODO Document on why we do this.
-   '((string :anchor "\"" @python--treesit-fontify-string))
+   '((string) @python--treesit-fontify-string)
 
    :feature 'string-interpolation
    :language 'python

commit 12e1e9c797aaa3311427a9b423c4e05621c3247c
Author: Po Lu <luangruo@yahoo.com>
Date:   Sat Nov 19 15:24:25 2022 +0800

    Fixes to fast mouse position reporting
    
    * src/xterm.c (x_fast_mouse_position): New function.  Factor out
    most of the fast mouse position code here.  Correctly port some
    Haiku code to take into account multiple displays.  Report
    scroll bar coordinates correctly.
    (XTmouse_position): Call it.

diff --git a/src/xterm.c b/src/xterm.c
index 20bccc165f..500d80cad7 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -14235,6 +14235,136 @@ x_get_window_below (Display *dpy, Window window,
   return value;
 }
 
+/* Like XTmouse_position, but much faster.  */
+
+static void
+x_fast_mouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
+		       enum scroll_bar_part *part, Lisp_Object *x, Lisp_Object *y,
+		       Time *timestamp)
+{
+  int root_x, root_y, win_x, win_y;
+  unsigned int mask;
+  Window dummy;
+  struct scroll_bar *bar;
+  struct x_display_info *dpyinfo;
+  Lisp_Object tail, frame;
+  struct frame *f1;
+
+  dpyinfo = FRAME_DISPLAY_INFO (*fp);
+
+  if (dpyinfo->last_mouse_scroll_bar && !insist)
+    {
+      bar = dpyinfo->last_mouse_scroll_bar;
+
+      if (bar->horizontal)
+	x_horizontal_scroll_bar_report_motion (fp, bar_window, part,
+					       x, y, timestamp);
+      else
+	x_scroll_bar_report_motion (fp, bar_window, part,
+				    x, y, timestamp);
+
+      return;
+    }
+
+  if (!EQ (Vx_use_fast_mouse_position, Qreally_fast))
+    {
+      /* This means that Emacs should select a frame and report the
+	 mouse position relative to it.  The approach used here avoids
+	 making multiple roundtrips to the X server querying for the
+	 window beneath the pointer, and was borrowed from
+	 haiku_mouse_position in haikuterm.c.  */
+
+      FOR_EACH_FRAME (tail, frame)
+	{
+	  if (FRAME_X_P (XFRAME (frame))
+	      && (FRAME_DISPLAY_INFO (XFRAME (frame))
+		  == dpyinfo))
+	    XFRAME (frame)->mouse_moved = false;
+	}
+
+      if (gui_mouse_grabbed (dpyinfo)
+	  && !EQ (track_mouse, Qdropping)
+	  && !EQ (track_mouse, Qdrag_source))
+	/* Pick the last mouse frame if dropping.  */
+	f1 = dpyinfo->last_mouse_frame;
+      else
+	/* Otherwise, pick the last mouse motion frame.  */
+	f1 = dpyinfo->last_mouse_motion_frame;
+
+      if (!f1 && (FRAME_X_P (SELECTED_FRAME ())
+		  && (FRAME_DISPLAY_INFO (SELECTED_FRAME ())
+		      == dpyinfo)))
+	f1 = SELECTED_FRAME ();
+
+      if (!f1 || (!FRAME_X_P (f1) && (insist > 0)))
+	FOR_EACH_FRAME (tail, frame)
+	  if (FRAME_X_P (XFRAME (frame))
+	      && (FRAME_DISPLAY_INFO (XFRAME (frame))
+		  == dpyinfo)
+	      && !FRAME_TOOLTIP_P (XFRAME (frame)))
+	    f1 = XFRAME (frame);
+
+      if (f1 && FRAME_TOOLTIP_P (f1))
+	f1 = NULL;
+
+      if (f1 && FRAME_X_P (f1) && FRAME_X_WINDOW (f1))
+	{
+	  if (!x_query_pointer (dpyinfo->display, FRAME_X_WINDOW (f1),
+				&dummy, &dummy, &root_x, &root_y,
+				&win_x, &win_y, &mask))
+	    /* The pointer is out of the screen.  */
+	    return;
+
+	  remember_mouse_glyph (f1, win_x, win_y,
+				&dpyinfo->last_mouse_glyph);
+	  dpyinfo->last_mouse_glyph_frame = f1;
+
+	  *bar_window = Qnil;
+	  *part = scroll_bar_nowhere;
+
+	  /* If track-mouse is `drag-source' and the mouse pointer is
+	     certain to not be actually under the chosen frame, return
+	     NULL in FP.  */
+	  if (EQ (track_mouse, Qdrag_source)
+	      && (win_x < 0 || win_y < 0
+		  || win_x >= FRAME_PIXEL_WIDTH (f1)
+		  || win_y >= FRAME_PIXEL_HEIGHT (f1)))
+	    *fp = NULL;
+	  else
+	    *fp = f1;
+
+	  *timestamp = dpyinfo->last_mouse_movement_time;
+	  XSETINT (*x, win_x);
+	  XSETINT (*y, win_y);
+	}
+    }
+  else
+    {
+      /* This means Emacs should only report the coordinates of the
+	 last mouse motion.  */
+
+      if (dpyinfo->last_mouse_motion_frame)
+	{
+	  *fp = dpyinfo->last_mouse_motion_frame;
+	  *timestamp = dpyinfo->last_mouse_movement_time;
+	  *x = make_fixnum (dpyinfo->last_mouse_motion_x);
+	  *y = make_fixnum (dpyinfo->last_mouse_motion_y);
+	  *bar_window = Qnil;
+	  *part = scroll_bar_nowhere;
+
+	  FOR_EACH_FRAME (tail, frame)
+	    {
+	      if (FRAME_X_P (XFRAME (frame))
+		  && (FRAME_DISPLAY_INFO (XFRAME (frame))
+		      == dpyinfo))
+		XFRAME (frame)->mouse_moved = false;
+	    }
+
+	  dpyinfo->last_mouse_motion_frame->mouse_moved = false;
+	}
+    }
+}
+
 /* Return the current position of the mouse.
    *FP should be a frame which indicates which display to ask about.
 
@@ -14263,7 +14393,6 @@ XTmouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
   struct frame *f1, *maybe_tooltip;
   struct x_display_info *dpyinfo;
   bool unrelated_tooltip;
-  Lisp_Object tail, frame;
 
   dpyinfo = FRAME_DISPLAY_INFO (*fp);
 
@@ -14272,100 +14401,14 @@ XTmouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
       /* The user says that Emacs is running over the network, and a
 	 fast approximation of `mouse-position' should be used.
 
-         Depending on what the value of `x-use-fast-mouse-position'
-         is, do one of two things: only perform the XQueryPointer to
-         obtain the coordinates from the last mouse frame, or only
-         return the last mouse motion frame and the
-         last_mouse_motion_x and Y.  */
-
-      if (!EQ (Vx_use_fast_mouse_position, Qreally_fast))
-	{
-	  int root_x, root_y, win_x, win_y;
-	  unsigned int mask;
-	  Window dummy;
-
-	  /* This means that Emacs should select a frame and report
-	     the mouse position relative to it.  The approach used
-	     here avoids making multiple roundtrips to the X server
-	     querying for the window beneath the pointer, and was
-	     borrowed from haiku_mouse_position in haikuterm.c.  */
-
-	  FOR_EACH_FRAME (tail, frame)
-	    {
-	      if (FRAME_X_P (XFRAME (frame)))
-		XFRAME (frame)->mouse_moved = false;
-	    }
-
-	  if (gui_mouse_grabbed (dpyinfo)
-	      && !EQ (track_mouse, Qdropping)
-	      && !EQ (track_mouse, Qdrag_source))
-	    /* Pick the last mouse frame if dropping.  */
-	    f1 = x_display_list->last_mouse_frame;
-	  else
-	    /* Otherwise, pick the last mouse motion frame.  */
-	    f1 = x_display_list->last_mouse_motion_frame;
-
-	  if (!f1 && FRAME_X_P (SELECTED_FRAME ()))
-	    f1 = SELECTED_FRAME ();
-
-	  if (!f1 || (!FRAME_X_P (f1) && (insist > 0)))
-	    FOR_EACH_FRAME (tail, frame)
-	      if (FRAME_X_P (XFRAME (frame)) &&
-		  !FRAME_X_P (XFRAME (frame)))
-		f1 = XFRAME (frame);
-
-	  if (f1 && FRAME_TOOLTIP_P (f1))
-	    f1 = NULL;
-
-	  if (f1 && FRAME_X_P (f1) && FRAME_X_WINDOW (f1))
-	    {
-	      if (!x_query_pointer (dpyinfo->display, FRAME_X_WINDOW (f1),
-				    &dummy, &dummy, &root_x, &root_y,
-				    &win_x, &win_y, &mask))
-		/* The pointer is out of the screen.  */
-		return;
-
-	      remember_mouse_glyph (f1, win_x, win_y,
-				    &dpyinfo->last_mouse_glyph);
-	      x_display_list->last_mouse_glyph_frame = f1;
-
-	      *bar_window = Qnil;
-	      *part = scroll_bar_nowhere;
-
-	      /* If track-mouse is `drag-source' and the mouse pointer is
-		 certain to not be actually under the chosen frame, return
-		 NULL in FP.  */
-	      if (EQ (track_mouse, Qdrag_source)
-		  && (win_x < 0 || win_y < 0
-		      || win_x >= FRAME_PIXEL_WIDTH (f1)
-		      || win_y >= FRAME_PIXEL_HEIGHT (f1)))
-		*fp = NULL;
-	      else
-		*fp = f1;
-
-	      *timestamp = dpyinfo->last_mouse_movement_time;
-	      XSETINT (*x, win_x);
-	      XSETINT (*y, win_y);
-	    }
-	}
-      else
-	{
-	  /* This means Emacs should only report the coordinates of
-	     the last mouse motion.  */
-
-	  if (dpyinfo->last_mouse_motion_frame)
-	    {
-	      *fp = dpyinfo->last_mouse_motion_frame;
-	      *timestamp = dpyinfo->last_mouse_movement_time;
-	      *x = make_fixnum (dpyinfo->last_mouse_motion_x);
-	      *y = make_fixnum (dpyinfo->last_mouse_motion_y);
-	      *bar_window = Qnil;
-	      *part = scroll_bar_nowhere;
-
-	      dpyinfo->last_mouse_motion_frame->mouse_moved = false;
-	    }
-	}
+	 Depending on what the value of `x-use-fast-mouse-position'
+	 is, do one of two things: only perform the XQueryPointer to
+	 obtain the coordinates from the last mouse frame, or only
+	 return the last mouse motion frame and the
+	 last_mouse_motion_x and Y.  */
 
+      x_fast_mouse_position (fp, insist, bar_window, part, x,
+			     y, timestamp);
       return;
     }
 

commit a6ae13af42ede6618c326855ea4c95e0298fb75b
Author: Thomas Fitzsimmons <fitzsim@fitzsim.org>
Date:   Sat Nov 19 02:05:36 2022 -0500

    EUDC: Add LDAP tests
    
    * test/lisp/net/eudc-resources/slapd.conf: New file.
    * test/lisp/net/eudc-resources/dc=gnu,dc=org.ldif: Likewise.
    * test/lisp/net/eudc-resources/dc=gnu,dc=org: New files.
    * test/lisp/net/eudc-tests.el (eudcb-ldap): New test.

diff --git a/test/lisp/net/eudc-resources/dc=gnu,dc=org.ldif b/test/lisp/net/eudc-resources/dc=gnu,dc=org.ldif
new file mode 100644
index 0000000000..9db4be2028
--- /dev/null
+++ b/test/lisp/net/eudc-resources/dc=gnu,dc=org.ldif
@@ -0,0 +1,15 @@
+# AUTO-GENERATED FILE - DO NOT EDIT!! Use ldapmodify.
+# CRC32 12f0e8c3
+dn: dc=gnu
+objectClass: dcObject
+objectClass: organization
+dc: gnu
+o: The ldap.gnu.org organization
+description: An organization for the following person
+structuralObjectClass: organization
+entryUUID: 43dd74ec-fc0d-103c-8d5c-7dbac5615d14
+creatorsName:
+createTimestamp: 20221119042038Z
+entryCSN: 20221119042038.100000Z#000000#000#000000
+modifiersName:
+modifyTimestamp: 20221119042038Z
diff --git a/test/lisp/net/eudc-resources/dc=gnu,dc=org/cn=emacs-ert-test-1.ldif b/test/lisp/net/eudc-resources/dc=gnu,dc=org/cn=emacs-ert-test-1.ldif
new file mode 100644
index 0000000000..7828f179df
--- /dev/null
+++ b/test/lisp/net/eudc-resources/dc=gnu,dc=org/cn=emacs-ert-test-1.ldif
@@ -0,0 +1,17 @@
+# AUTO-GENERATED FILE - DO NOT EDIT!! Use ldapmodify.
+# CRC32 a33c0168
+dn: cn=emacs-ert-test-1
+objectClass: OpenLDAPperson
+cn: emacs-ert-test-1
+description:: RW1hY3Mg
+uid: 1
+sn: ERT1
+givenName: Emacs
+mail: emacs-ert-test-1@ldap.gnu.org
+structuralObjectClass: OpenLDAPperson
+entryUUID: 43dd805e-fc0d-103c-8d5d-7dbac5615d14
+creatorsName:
+createTimestamp: 20221119042038Z
+entryCSN: 20221119042038.100350Z#000000#000#000000
+modifiersName:
+modifyTimestamp: 20221119042038Z
diff --git a/test/lisp/net/eudc-resources/dc=gnu,dc=org/cn=emacs-ert-test-2.ldif b/test/lisp/net/eudc-resources/dc=gnu,dc=org/cn=emacs-ert-test-2.ldif
new file mode 100644
index 0000000000..d3de3d81c7
--- /dev/null
+++ b/test/lisp/net/eudc-resources/dc=gnu,dc=org/cn=emacs-ert-test-2.ldif
@@ -0,0 +1,17 @@
+# AUTO-GENERATED FILE - DO NOT EDIT!! Use ldapmodify.
+# CRC32 56119237
+dn: cn=emacs-ert-test-2
+objectClass: OpenLDAPperson
+cn: emacs-ert-test-2
+description:: RW1hY3Mg
+uid: 2
+sn: ERT2
+givenName: Emacs
+mail: emacs-ert-test-2@ldap.gnu.org
+structuralObjectClass: OpenLDAPperson
+entryUUID: 43dd92b0-fc0d-103c-8d5e-7dbac5615d14
+creatorsName:
+createTimestamp: 20221119042038Z
+entryCSN: 20221119042038.100819Z#000000#000#000000
+modifiersName:
+modifyTimestamp: 20221119042038Z
diff --git a/test/lisp/net/eudc-resources/slapd.conf b/test/lisp/net/eudc-resources/slapd.conf
new file mode 100644
index 0000000000..9afafe7676
--- /dev/null
+++ b/test/lisp/net/eudc-resources/slapd.conf
@@ -0,0 +1,7 @@
+include /etc/ldap/schema/core.schema
+include /etc/ldap/schema/cosine.schema
+include /etc/ldap/schema/inetorgperson.schema
+include /etc/ldap/schema/openldap.schema
+database ldif
+directory eudc-resources
+suffix "dc=gnu,dc=org"
diff --git a/test/lisp/net/eudc-tests.el b/test/lisp/net/eudc-tests.el
index c326dcc793..59dce55b82 100644
--- a/test/lisp/net/eudc-tests.el
+++ b/test/lisp/net/eudc-tests.el
@@ -267,5 +267,27 @@ eudcb-ecomplete
                      '(((email . "Lars Ingebrigtsen <larsi@mail-abbrev.com>, \
 Karl Fogel <kfogel@mail-abbrev.com")))))))))
 
+(require 'ldap)
+(ert-deftest eudcb-ldap ()
+  "Test the LDAP back-end."
+  (when (and (file-exists-p "/usr/sbin/slapd")
+             (file-exists-p "/usr/bin/ldapsearch"))
+    (cd (concat (ert-resource-directory) ".."))
+    (let ((ldap-process
+           (start-process "slapd" "*slapd*" "/usr/sbin/slapd"
+                          "-h" "ldap://127.0.0.1:3899" "-d" "0" "-4"
+                          "-f" (ert-resource-file "slapd.conf")))
+          (ldap-host-parameters-alist '(("ldap://localhost:3899"
+                                         base "dc=gnu,dc=org" auth simple)))
+          (eudc-server-hotlist '(("ldap://localhost:3899" . ldap)))
+          (eudc-ignore-options-file t))
+      (sleep-for 1) ; Wait for slapd to start.
+      (should (equal (with-temp-buffer
+                       (insert "emacs-ert-test-1")
+                       (eudc-expand-try-all)
+                       (buffer-string))
+                     "Emacs ERT1 <emacs-ert-test-1@ldap.gnu.org>"))
+      (kill-process ldap-process))))
+
 (provide 'eudc-tests)
 ;;; eudc-tests.el ends here

commit b18d4dbe0d64bd1277731f9a7faedbb4dd3cd197
Author: Po Lu <luangruo@yahoo.com>
Date:   Sat Nov 19 13:59:53 2022 +0800

    Fix automatic DPI adjustment and add workarounds for some systems
    
    * lisp/faces.el (x-create-frame-with-faces): New field
    `delayed-font'.  Set the `font-parameter' property to `font' in
    the given parameter list after face-set-after-frame-default is
    called.
    * src/fontset.c (Fset_fontset_font): Avoid changing
    `font-parameter' with the call to Fmodify_frame_parameters.
    * src/frame.c (gui_set_frame_parameters_1): New function.
    Factor out gui_set_frame_parameters here, and add an argument
    DEFAULT_PARAMETER.  If the `font' parameter is set, and
    `default_parameter' is not, then set the `font-parameter' frame
    parameter to the `font' parameter as well, to keep track of
    which user-specified `font' frame parameter set the default
    face's font on the frame.
    (gui_set_frame_parameters): Call gui_set_frame_parameters_1 with
    new arg set to false.
    (gui_set_font): Remove broken implementation of
    `font-parameter'.
    (gui_default_parameter): If the default value was used, then
    call gui_set_frame_parameters_1 with the new argument set to
    false.  This is because no font was specified as a frame
    parameter by the user, so Freconsider_frame_fonts is free to do
    anything it wants.
    (Freconsider_frame_fonts): If `font-parameter' is set, then use
    it.
    (syms_of_frame): New defsym Qfont_parameter.
    
    * src/frame.h: Update prototypes.
    
    * src/haikuterm.c (haiku_default_font_parameter):
    * src/pgtkfns.c (pgtk_default_font_parameter):
    * src/w32fns.c (w32_default_font_parameter): Stop setting
    `font-parameter' here.  This code resulted in decades of
    automatic font rescaling not working correctly.
    
    * src/xfaces.c (set_font_frame_param): Clear the
    `font-parameter' frame parameter.
    (Finternal_merge_in_global_face):
    * src/xfns.c (x_default_font_parameter): Avoid changing
    `font-parameter' in response to changes to face attributes.
    * src/xsettings.c (apply_xft_settings): Add workaround for
    Cairo.  (bug#59371, bug#59347, bug#59283, bug#59271, bug#59285,
    bug#59306.)

diff --git a/lisp/faces.el b/lisp/faces.el
index 5ae1c65a4d..c69339e2fd 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2200,8 +2200,13 @@ x-create-frame-with-faces
 			   border-color cursor-color mouse-color
 			   visibility scroll-bar-foreground
 			   scroll-bar-background))
+         (delayed-font nil)
 	 frame success)
     (dolist (param delayed-params)
+      ;; Save the font used here.  Once the frame is created, set the
+      ;; `font-parameter' frame parameter.
+      (when (and (eq param 'font) (assq 'font parameters))
+        (setq delayed-font (cdr (assq 'font parameters))))
       (setq params (assq-delete-all param params)))
     (setq frame (x-create-frame `((visibility . nil) . ,params)))
     (unwind-protect
@@ -2212,6 +2217,11 @@ x-create-frame-with-faces
 	  (x-handle-reverse-video frame parameters)
 	  (frame-set-background-mode frame t)
 	  (face-set-after-frame-default frame parameters)
+          ;; The code above will not set the `font-parameter' frame
+          ;; property, which is used by dynamic-setting.el to respect
+          ;; fonts specified by the user via frame parameters (as
+          ;; opposed to face attributes).  Set the parameter manually.
+          (set-frame-parameter frame 'font-parameter delayed-font)
           ;; Mark frame as 'was-invisible' when it was created as
           ;; invisible or iconified and PARAMETERS contains either a
           ;; width or height specification.  This should be sufficient
diff --git a/src/fontset.c b/src/fontset.c
index 4b91eff2ef..b82737d005 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1663,7 +1663,17 @@ DEFUN ("set-fontset-font", Fset_fontset_font, Sset_fontset_font, 3, 5, 0,
 	    {
 	      update_auto_fontset_alist (font_object, fontset_obj);
 	      AUTO_FRAME_ARG (arg, Qfont, Fcons (fontset, font_object));
-	      Fmodify_frame_parameters (fr, arg);
+
+#ifdef HAVE_WINDOW_SYSTEM
+	      if (FRAME_WINDOW_P (f))
+		/* This is a window-system frame.  Prevent changes of
+		   the `font' parameter here from messing with the
+		   `font-parameter' frame property, as the frame
+		   parameter is not being changed by the user.  */
+	        gui_set_frame_parameters_1 (f, arg, true);
+	      else
+#endif
+		Fmodify_frame_parameters (fr, arg);
 	    }
 	}
     }
diff --git a/src/frame.c b/src/frame.c
index 151a402995..b57b296be5 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -4119,10 +4119,17 @@ frame_float (struct frame *f, Lisp_Object val, enum frame_float_type what,
    If a parameter is not specially recognized, do nothing special;
    otherwise call the `gui_set_...' function for that parameter.
    Except for certain geometry properties, always call store_frame_param
-   to store the new value in the parameter alist.  */
+   to store the new value in the parameter alist.
+
+   DEFAULT_PARAMETER should be set if the alist was not specified by
+   the user, or by the face code to set the `font' parameter.  In that
+   case, the `font-parameter' frame parameter should not be changed,
+   so dynamic-setting.el can restore the user's selected font
+   correctly.  */
 
 void
-gui_set_frame_parameters (struct frame *f, Lisp_Object alist)
+gui_set_frame_parameters_1 (struct frame *f, Lisp_Object alist,
+			    bool default_parameter)
 {
   Lisp_Object tail, frame;
 
@@ -4249,7 +4256,7 @@ gui_set_frame_parameters (struct frame *f, Lisp_Object alist)
 	}
       else
 	{
-	  register Lisp_Object param_index, old_value;
+	  Lisp_Object param_index, old_value;
 
 	  old_value = get_frame_param (f, prop);
 
@@ -4260,6 +4267,12 @@ gui_set_frame_parameters (struct frame *f, Lisp_Object alist)
 	      && XFIXNAT (param_index) < ARRAYELTS (frame_parms)
 	      && FRAME_RIF (f)->frame_parm_handlers[XFIXNUM (param_index)])
 	    (*(FRAME_RIF (f)->frame_parm_handlers[XFIXNUM (param_index)])) (f, val, old_value);
+
+	  if (!default_parameter && EQ (prop, Qfont))
+	    /* The user manually specified the `font' frame parameter.
+	       Save that parameter for future use by the
+	       dynamic-setting code.  */
+	    store_frame_param (f, Qfont_parameter, val);
 	}
     }
 
@@ -4410,6 +4423,11 @@ gui_set_frame_parameters (struct frame *f, Lisp_Object alist)
   SAFE_FREE ();
 }
 
+void
+gui_set_frame_parameters (struct frame *f, Lisp_Object alist)
+{
+  gui_set_frame_parameters_1 (f, alist, false);
+}
 
 /* Insert a description of internally-recorded parameters of frame F
    into the parameter alist *ALISTPTR that is to be given to the user.
@@ -4586,9 +4604,6 @@ gui_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
 {
   Lisp_Object font_object;
   int fontset = -1;
-#ifdef HAVE_X_WINDOWS
-  Lisp_Object font_param = arg;
-#endif
 
   /* Set the frame parameter back to the old value because we may
      fail to use ARG as the new parameter value.  */
@@ -4627,16 +4642,10 @@ gui_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
 	error ("Unknown fontset: %s", SDATA (XCAR (arg)));
       font_object = XCDR (arg);
       arg = AREF (font_object, FONT_NAME_INDEX);
-#ifdef HAVE_X_WINDOWS
-      font_param = Ffont_get (font_object, QCname);
-#endif
     }
   else if (FONT_OBJECT_P (arg))
     {
       font_object = arg;
-#ifdef HAVE_X_WINDOWS
-      font_param = Ffont_get (font_object, QCname);
-#endif
       /* This is to store the XLFD font name in the frame parameter for
 	 backward compatibility.  We should store the font-object
 	 itself in the future.  */
@@ -4667,9 +4676,7 @@ gui_set_font (struct frame *f, Lisp_Object arg, Lisp_Object oldval)
   if (FRAME_TERMINAL (f)->set_new_font_hook)
     FRAME_TERMINAL (f)->set_new_font_hook (f, font_object, fontset);
   store_frame_param (f, Qfont, arg);
-#ifdef HAVE_X_WINDOWS
-  store_frame_param (f, Qfont_parameter, font_param);
-#endif
+
   /* Recalculate tabbar height.  */
   f->n_tab_bar_rows = 0;
   /* Recalculate toolbar height.  */
@@ -5451,12 +5458,20 @@ gui_default_parameter (struct frame *f, Lisp_Object alist, Lisp_Object prop,
                        enum resource_types type)
 {
   Lisp_Object tem;
+  bool was_unbound;
 
   tem = gui_frame_get_arg (f, alist, prop, xprop, xclass, type);
+
   if (BASE_EQ (tem, Qunbound))
-    tem = deflt;
+    {
+      tem = deflt;
+      was_unbound = true;
+    }
+  else
+    was_unbound = false;
+
   AUTO_FRAME_ARG (arg, prop, tem);
-  gui_set_frame_parameters (f, arg);
+  gui_set_frame_parameters_1 (f, arg, was_unbound);
   return tem;
 }
 
@@ -5959,16 +5974,26 @@ parameters (such as pixel density) used by the system to open fonts
   (Lisp_Object frame)
 {
   struct frame *f;
-  Lisp_Object params;
+  Lisp_Object params, font_parameter;
 
   f = decode_window_system_frame (frame);
 
   /* Kludge: if a `font' parameter was already specified,
-     create an alist containing just that parameter.  (bug#59371) */
+     create an alist containing just that parameter.  (bug#59371)
+
+     This sounds so simple, right?  Well, read on below: */
   params = Qnil;
 
-  if (!NILP (get_frame_param (f, Qfont)))
-    params = list1 (Fcons (Qfont, get_frame_param (f, Qfont)));
+  /* The difference between Qfont and Qfont_parameter is that the
+     latter is not set automatically by the likes of x_new_font, and
+     implicitly as the default face is realized.  It is only set when
+     the user specifically specifies a `font' frame parameter, and is
+     cleared the moment the frame's font becomes defined by a face
+     attribute, instead of through the `font' frame parameter.  */
+  font_parameter = get_frame_param (f, Qfont_parameter);
+
+  if (!NILP (font_parameter))
+    params = list1 (Fcons (Qfont, font_parameter));
 
   /* First, call this to reinitialize any font backend specific
      stuff.  */
@@ -5976,10 +6001,22 @@ parameters (such as pixel density) used by the system to open fonts
   if (FRAME_RIF (f)->default_font_parameter)
     FRAME_RIF (f)->default_font_parameter (f, params);
 
+  /* For a mysterious reason, x_default_font_parameter sets Qfont to
+     nil in the alist!  */
+
+  if (!NILP (font_parameter))
+    params = list1 (Fcons (Qfont, font_parameter));
+
   /* Now call this to apply the existing value(s) of the `default'
      face.  */
   call2 (Qface_set_after_frame_default, frame, params);
 
+  /* Restore the value of the `font-parameter' parameter, as
+     `face-set-after-frame-default' will have changed it through its
+     calls to `set-face-attribute'.  */
+  if (!NILP (font_parameter))
+    store_frame_param (f, Qfont_parameter, font_parameter);
+
   return Qnil;
 }
 
@@ -6240,6 +6277,7 @@ syms_of_frame (void)
   DEFSYM (Qiconify_top_level, "iconify-top-level");
   DEFSYM (Qmake_invisible, "make-invisible");
   DEFSYM (Quse_frame_synchronization, "use-frame-synchronization");
+  DEFSYM (Qfont_parameter, "font-parameter");
 
   {
     int i;
diff --git a/src/frame.h b/src/frame.h
index 458b6257e4..d6fd62b2ac 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1670,6 +1670,7 @@ #define FRAME_SMALLEST_FONT_HEIGHT(f)		\
 /* The class of this X application.  */
 #define EMACS_CLASS "Emacs"
 
+extern void gui_set_frame_parameters_1 (struct frame *, Lisp_Object, bool);
 extern void gui_set_frame_parameters (struct frame *, Lisp_Object);
 extern void gui_set_fullscreen (struct frame *, Lisp_Object, Lisp_Object);
 extern void gui_set_line_spacing (struct frame *, Lisp_Object, Lisp_Object);
diff --git a/src/haikuterm.c b/src/haikuterm.c
index 4e32b74716..496480cbc0 100644
--- a/src/haikuterm.c
+++ b/src/haikuterm.c
@@ -3007,9 +3007,11 @@ haiku_default_font_parameter (struct frame *f, Lisp_Object parms)
     font = font_open_by_spec (f, Ffont_get_system_font ());
 
   if (NILP (font))
-      font = !NILP (font_param) ? font_param
-      : gui_display_get_arg (dpyinfo, parms, Qfont, "font", "Font",
-                             RES_TYPE_STRING);
+    font = (!NILP (font_param)
+	    ? font_param
+	    : gui_display_get_arg (dpyinfo, parms, Qfont,
+				   "font", "Font",
+				   RES_TYPE_STRING));
 
   if (! FONTP (font) && ! STRINGP (font))
     {
@@ -3029,13 +3031,6 @@ haiku_default_font_parameter (struct frame *f, Lisp_Object parms)
       if (NILP (font))
         error ("No suitable font was found");
     }
-  else if (!NILP (font_param))
-    {
-      /* Remember the explicit font parameter, so we can re-apply it
-         after we've applied the `default' face settings.  */
-      AUTO_FRAME_ARG (arg, Qfont_parameter, font_param);
-      gui_set_frame_parameters (f, arg);
-    }
 
   gui_default_parameter (f, parms, Qfont, font, "font", "Font",
                          RES_TYPE_STRING);
diff --git a/src/pgtkfns.c b/src/pgtkfns.c
index f370f03978..a32067af81 100644
--- a/src/pgtkfns.c
+++ b/src/pgtkfns.c
@@ -1121,13 +1121,6 @@ pgtk_default_font_parameter (struct frame *f, Lisp_Object parms)
       if (NILP (font))
 	error ("No suitable font was found");
     }
-  else if (!NILP (font_param))
-    {
-      /* Remember the explicit font parameter, so we can re-apply it after
-         we've applied the `default' face settings.  */
-      AUTO_FRAME_ARG (arg, Qfont_parameter, font_param);
-      gui_set_frame_parameters (f, arg);
-    }
 
   /* This call will make X resources override any system font setting.  */
   gui_default_parameter (f, parms, Qfont, font, "font", "Font",
diff --git a/src/w32fns.c b/src/w32fns.c
index e441665804..887e5a1f7b 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -5794,13 +5794,7 @@ w32_default_font_parameter (struct frame *f, Lisp_Object parms)
       if (NILP (font))
 	error ("No suitable font was found");
     }
-  else if (!NILP (font_param))
-    {
-      /* Remember the explicit font parameter, so we can re-apply it after
-	 we've applied the `default' face settings.  */
-      gui_set_frame_parameters (f, Fcons (Fcons (Qfont_parameter, font_param),
-                                          Qnil));
-    }
+
   gui_default_parameter (f, parms, Qfont, font, "font", "Font", RES_TYPE_STRING);
 }
 
diff --git a/src/xfaces.c b/src/xfaces.c
index ed76db9adb..df078227c8 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3809,8 +3809,12 @@ set_font_frame_param (Lisp_Object frame, Lisp_Object lface)
 	  ASET (lface, LFACE_FONT_INDEX, font);
 	}
       f->default_face_done_p = false;
-      AUTO_FRAME_ARG (arg, Qfont, font);
-      Fmodify_frame_parameters (frame, arg);
+      AUTO_LIST2 (arg, AUTO_CONS_EXPR (Qfont, font),
+		  /* Clear the `font-parameter' frame property, as the
+		     font is now being specified by a face, not a
+		     frame property.  */
+		  AUTO_CONS_EXPR (Qfont_parameter, Qnil));
+      gui_set_frame_parameters_1 (f, arg, true);
     }
 }
 
@@ -4208,7 +4212,17 @@ DEFUN ("internal-merge-in-global-face", Finternal_merge_in_global_face,
 	    {
 	      Lisp_Object name = newface->font->props[FONT_NAME_INDEX];
 	      AUTO_FRAME_ARG (arg, Qfont, name);
-	      Fmodify_frame_parameters (frame, arg);
+
+#ifdef HAVE_WINDOW_SYSTEM
+	      if (FRAME_WINDOW_P (f))
+		/* This is a window-system frame.  Prevent changes of
+		   the `font' parameter here from messing with the
+		   `font-parameter' frame property, as the frame
+		   parameter is not being changed by the user.  */
+	        gui_set_frame_parameters_1 (f, arg, true);
+	      else
+#endif
+		Fmodify_frame_parameters (frame, arg);
 	    }
 
 	  if (STRINGP (gvec[LFACE_FOREGROUND_INDEX]))
diff --git a/src/xfns.c b/src/xfns.c
index 8ee26d713a..2ff70f7985 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -4551,13 +4551,6 @@ x_default_font_parameter (struct frame *f, Lisp_Object parms)
       if (NILP (font))
 	error ("No suitable font was found");
     }
-  else if (!NILP (font_param))
-    {
-      /* Remember the explicit font parameter, so we can re-apply it after
-	 we've applied the `default' face settings.  */
-      AUTO_FRAME_ARG (arg, Qfont_parameter, font_param);
-      gui_set_frame_parameters (f, arg);
-    }
 
   /* This call will make X resources override any system font setting.  */
   gui_default_parameter (f, parms, Qfont, font, "font", "Font", RES_TYPE_STRING);
diff --git a/src/xsettings.c b/src/xsettings.c
index 1a9f1a8d5a..f1ee84a1a0 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -886,6 +886,14 @@ apply_xft_settings (Display_Info *dpyinfo,
     }
 #endif
 
+#ifdef USE_CAIRO
+  /* When Cairo is being used, set oldsettings.dpi to dpyinfo->resx.
+     This is a gross hack, but seeing as Cairo fails to report
+     anything reasonable, just use it to avoid config-changed events
+     being sent at startup.  */
+  oldsettings.dpi = dpyinfo->resx;
+#endif
+
   if ((settings->seen & SEEN_DPI) != 0
       && settings->dpi > 0
       /* The following conjunct avoids setting `changed' to true when

commit 10701635cfefde5e416215d72f4dababe0ce8d7f
Author: Po Lu <luangruo@yahoo.com>
Date:   Sat Nov 19 11:19:41 2022 +0800

    Fix bug#59371
    
    * src/frame.c (Freconsider_frame_fonts): If a font parameter was
    set, create a params alist with it.  Then, pass it to both
    default_font_parameter and face-set-after-frame-default.
    (bug#59371)

diff --git a/src/frame.c b/src/frame.c
index f63a19e7dc..151a402995 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -5959,18 +5959,26 @@ parameters (such as pixel density) used by the system to open fonts
   (Lisp_Object frame)
 {
   struct frame *f;
+  Lisp_Object params;
 
   f = decode_window_system_frame (frame);
 
+  /* Kludge: if a `font' parameter was already specified,
+     create an alist containing just that parameter.  (bug#59371) */
+  params = Qnil;
+
+  if (!NILP (get_frame_param (f, Qfont)))
+    params = list1 (Fcons (Qfont, get_frame_param (f, Qfont)));
+
   /* First, call this to reinitialize any font backend specific
      stuff.  */
 
   if (FRAME_RIF (f)->default_font_parameter)
-    FRAME_RIF (f)->default_font_parameter (f, Qnil);
+    FRAME_RIF (f)->default_font_parameter (f, params);
 
   /* Now call this to apply the existing value(s) of the `default'
      face.  */
-  call1 (Qface_set_after_frame_default, frame);
+  call2 (Qface_set_after_frame_default, frame, params);
 
   return Qnil;
 }

commit b23a4a15055af504324c3a60e5c6cbd93becf9b0
Author: Po Lu <luangruo@yahoo.com>
Date:   Sat Nov 19 11:13:15 2022 +0800

    Fix earlier changes to keyboard.c
    
    * src/keyboard.c (coords_in_menu_bar_window): New function.
    (make_lispy_event): Do not process menu bar events on window
    system frames if there is no menu bar window or the click lies
    outside.

diff --git a/src/keyboard.c b/src/keyboard.c
index c0642ab53a..811998823c 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -5720,6 +5720,29 @@ make_scroll_bar_position (struct input_event *ev, Lisp_Object type)
 		builtin_lisp_symbol (scroll_bar_parts[ev->part]));
 }
 
+#if defined HAVE_WINDOW_SYSTEM && !defined HAVE_EXT_MENU_BAR
+
+/* Return whether or not the coordinates X and Y are inside the
+   box of the menu-bar window of frame F.  */
+
+static bool
+coords_in_menu_bar_window (struct frame *f, int x, int y)
+{
+  struct window *window;
+
+  if (!WINDOWP (f->menu_bar_window))
+    return false;
+
+  window = XWINDOW (f->menu_bar_window);
+
+  return (y >= WINDOW_TOP_EDGE_Y (window)
+	  && x >= WINDOW_LEFT_EDGE_X (window)
+	  && y <= WINDOW_BOTTOM_EDGE_Y (window)
+	  && x <= WINDOW_RIGHT_EDGE_X (window));
+}
+
+#endif
+
 /* Given a struct input_event, build the lisp event which represents
    it.  If EVENT is 0, build a mouse movement event from the mouse
    movement buffer, which should have a movement event in it.
@@ -5972,7 +5995,15 @@ make_lispy_event (struct input_event *event)
 	       and ROW are set to frame relative glyph coordinates
 	       which are then used to determine whether this click is
 	       in a menu (non-toolkit version).  */
-	    if (!toolkit_menubar_in_use (f))
+	    if (!toolkit_menubar_in_use (f)
+#if defined HAVE_WINDOW_SYSTEM && !defined HAVE_EXT_MENU_BAR
+		/* Don't process events for menu bars if they are not
+		   in the menu bar window.  */
+		&& (!FRAME_WINDOW_P (f)
+		    || coords_in_menu_bar_window (f, XFIXNUM (event->x),
+						  XFIXNUM (event->y)))
+#endif
+		)
 	      {
 #if defined HAVE_WINDOW_SYSTEM && !defined HAVE_EXT_MENU_BAR
 		if (FRAME_WINDOW_P (f))
@@ -5999,7 +6030,7 @@ make_lispy_event (struct input_event *event)
 		   menu bar and Emacs doesn't know about it until
 		   after the user makes a selection.)  */
 		if (row >= 0 && row < FRAME_MENU_BAR_LINES (f)
-		  && (event->modifiers & down_modifier))
+		    && (event->modifiers & down_modifier))
 		  {
 		    Lisp_Object items, item;
 

commit 4921bd7bac4a9609c00e6b3337a4962b46135ff3
Author: Po Lu <luangruo@yahoo.com>
Date:   Sat Nov 19 08:42:56 2022 +0800

    Fix build with ext menu bar
    
    * src/keyboard.c (make_lispy_event): Don't access
    menu_bar_window when !HAVE_EXT_MENU_BAR.

diff --git a/src/keyboard.c b/src/keyboard.c
index 6ce6ce17f2..c0642ab53a 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -5974,7 +5974,7 @@ make_lispy_event (struct input_event *event)
 	       in a menu (non-toolkit version).  */
 	    if (!toolkit_menubar_in_use (f))
 	      {
-#if defined HAVE_WINDOW_SYSTEM
+#if defined HAVE_WINDOW_SYSTEM && !defined HAVE_EXT_MENU_BAR
 		if (FRAME_WINDOW_P (f))
 		  {
 		    struct window *menu_w = XWINDOW (f->menu_bar_window);

commit 409f0430b6a0c138836e5067141bf6b2a7beb6b3
Author: Manuel Giraud <manuel@ledu-giraud.fr>
Date:   Fri Nov 18 09:24:55 2022 +0100

    Fix click position to menu bar entry with no-toolkit
    
    * src/keyboard.c (make_lispy_event): Use x_y_to_hpos_vpos to
    compute correct menu bar position should the menu face change.
    * src/xdisp.c (x_y_to_hpos_vpos): Not static anymore.
    * src/dispextern.h: Export x_y_to_hpos_vpos.

diff --git a/src/dispextern.h b/src/dispextern.h
index 2f5f4335fe..2afbdeabaa 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -3495,7 +3495,8 @@ #define TTY_CAP_STRIKE_THROUGH	0x20
 extern void tty_draw_row_with_mouse_face (struct window *, struct glyph_row *,
 					  int, int, enum draw_glyphs_face);
 extern void display_tty_menu_item (const char *, int, int, int, int, bool);
-
+extern struct glyph *x_y_to_hpos_vpos (struct window *, int, int, int *, int *,
+				       int *, int *, int *);
 /* Flags passed to try_window.  */
 #define TRY_WINDOW_CHECK_MARGINS	(1 << 0)
 #define TRY_WINDOW_IGNORE_FONTS_CHANGE	(1 << 1)
diff --git a/src/keyboard.c b/src/keyboard.c
index 069cf0627b..6ce6ce17f2 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -5974,8 +5974,22 @@ make_lispy_event (struct input_event *event)
 	       in a menu (non-toolkit version).  */
 	    if (!toolkit_menubar_in_use (f))
 	      {
-		pixel_to_glyph_coords (f, XFIXNUM (event->x), XFIXNUM (event->y),
-				       &column, &row, NULL, 1);
+#if defined HAVE_WINDOW_SYSTEM
+		if (FRAME_WINDOW_P (f))
+		  {
+		    struct window *menu_w = XWINDOW (f->menu_bar_window);
+		    int x, y, dummy;
+
+		    x = FRAME_TO_WINDOW_PIXEL_X (menu_w, XFIXNUM (event->x));
+		    y = FRAME_TO_WINDOW_PIXEL_Y (menu_w, XFIXNUM (event->y));
+
+		    x_y_to_hpos_vpos (XWINDOW (f->menu_bar_window), x, y, &column, &row,
+				      NULL, NULL, &dummy);
+		  }
+		else
+#endif
+		  pixel_to_glyph_coords (f, XFIXNUM (event->x), XFIXNUM (event->y),
+					 &column, &row, NULL, 1);
 
 		/* In the non-toolkit version, clicks on the menu bar
 		   are ordinary button events in the event buffer.
diff --git a/src/xdisp.c b/src/xdisp.c
index f8fc0f5787..b5f013ea6a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2330,7 +2330,7 @@ pixel_to_glyph_coords (struct frame *f, int pix_x, int pix_y, int *x, int *y,
    text, or we can't tell because W's current matrix is not up to
    date.  */
 
-static struct glyph *
+struct glyph *
 x_y_to_hpos_vpos (struct window *w, int x, int y, int *hpos, int *vpos,
 		  int *dx, int *dy, int *area)
 {

commit 87fce324c6bd135532958b1ad1496a3da67b7936
Author: Mattias Engdegård <mattiase@acm.org>
Date:   Fri Nov 18 19:50:33 2022 +0100

    ; gnus-icalendar-tests: revert erroneous 'typo fix'

diff --git a/test/lisp/gnus/gnus-icalendar-tests.el b/test/lisp/gnus/gnus-icalendar-tests.el
index 1b69267bee..348ddf9f05 100644
--- a/test/lisp/gnus/gnus-icalendar-tests.el
+++ b/test/lisp/gnus/gnus-icalendar-tests.el
@@ -75,7 +75,7 @@ gnus-icalendar-parse
 X-MICROSOFT-CDO-OWNERAPPTID:-362490173
 RECURRENCE-ID;TZID=America/New_York:20201208T091500
 CREATED:20200309T134939Z
-DESCRIPTION:In this meeting\\, we will cover topics from product and engine
+DESCRIPTION:In this meeting\\, we will cover topics from product and enginee
  ring presentations and demos to new hire announcements to watching the late
 LAST-MODIFIED:20200728T182852Z
 LOCATION:New York-22-Town Hall Space (250) [Chrome Box]

commit 5976cce892636f2d7809731a90defd2277f6cf0e
Author: Thomas Fitzsimmons <fitzsim@fitzsim.org>
Date:   Thu Nov 17 09:22:08 2022 -0500

    EUDC: Revert eudc-server-hotlist default change
    
    * etc/NEWS: Remove eudc-server-hotlist default change.
    * lisp/net/eudc-vars.el (eudc-server-hotlist): Set to nil.
    (Bug#59314)

diff --git a/etc/NEWS b/etc/NEWS
index 2717f00612..8a34afe8d2 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2057,13 +2057,6 @@ A new back-end for mailabbrev allows information from that database to
 be queried by EUDC, too.  The attributes email, name, and firstname
 are supported only.
 
-+++
-*** New default for 'eudc-server-hotlist' includes built-in backends
-The 'eudc-server-hotlist' user option now defaults to including
-entries for the new built-in ecomplete and mailabbrev EUDC backends.
-As a result, 'C-u M-x eudc-expand-try-all' will query both of these
-backends for email address completions, by default.
-
 ** EWW/SHR
 
 +++
diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el
index b44989d906..450943a3f0 100644
--- a/lisp/net/eudc-vars.el
+++ b/lisp/net/eudc-vars.el
@@ -53,8 +53,7 @@ eudc-server
 ;; Not to be mistaken with `eudc-supported-protocols'
 (defvar eudc-known-protocols '(bbdb ldap ecomplete mailabbrev))
 
-(defcustom eudc-server-hotlist '(("localhost" . ecomplete)
-                                 ("localhost" . mailabbrev))
+(defcustom eudc-server-hotlist nil
   "Directory servers to query.
 This is an alist of the form (SERVER . PROTOCOL).  SERVER is the
 host name or URI of the server, PROTOCOL is a symbol representing

commit 5525bd39322a66cf4133a2593d6349e4d75d8b6a
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Fri Nov 18 11:11:46 2022 -0500

    itree: Make sure a deleted overlay has NULL pointer fields
    
    * src/buffer.c (delete_all_overlays): Use POST_ORDER to set the node's
    pointers to NULL, as god intended.
    
    * src/itree.c (itree_insert_node): Uncomment the assertion accordingly.

diff --git a/src/buffer.c b/src/buffer.c
index 4da5b451d0..d948aaa266 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -937,19 +937,16 @@ delete_all_overlays (struct buffer *b)
   if (! b->overlays)
     return;
 
-  /* FIXME: This loop sets the overlays' `buffer` field to NULL but
-     doesn't set the itree_nodes' `parent`, `left` and `right`
-     fields accordingly.  I believe it's harmless, but a bit untidy since
-     other parts of the code are careful to set those fields to NULL when
-     the overlay is deleted.
-     Of course, we can't set them to NULL from within the iteration
-     because the iterator may need them (tho we could if we added
-     an ITREE_POST_ORDER iteration order).  */
-  ITREE_FOREACH (node, b->overlays, PTRDIFF_MIN, PTRDIFF_MAX, ASCENDING)
+  /* The general rule is that the tree cannot be modified from within
+     ITREE_FOREACH, but here we bend this rule a little because we know
+     that the POST_ORDER iterator will not need to look at `node` again.  */
+  ITREE_FOREACH (node, b->overlays, PTRDIFF_MIN, PTRDIFF_MAX, POST_ORDER)
     {
       modify_overlay (b, node->begin, node->end);
-      /* Where are the nodes freed ? --ap */
       XOVERLAY (node->data)->buffer = NULL;
+      node->parent = NULL;
+      node->left = NULL;
+      node->right = NULL;
     }
   itree_clear (b->overlays);
 }
diff --git a/src/itree.c b/src/itree.c
index 7bf3b9507b..abd060d6fb 100644
--- a/src/itree.c
+++ b/src/itree.c
@@ -676,10 +676,8 @@ itree_insert_fix (struct itree_tree *tree,
 itree_insert_node (struct itree_tree *tree, struct itree_node *node)
 {
   eassert (node && node->begin <= node->end);
-  /* FIXME: The assertion below fails because `delete_all_overlays`
-     doesn't set left/right/parent to NULL.  */
-  /* eassert (node->left == NULL && node->right == NULL
-	     && node->parent == NULL) */;
+  eassert (node->left == NULL && node->right == NULL
+	   && node->parent == NULL);
   eassert (check_tree (tree, true)); /* FIXME: Too expensive.  */
 
   struct itree_node *parent = NULL;
@@ -1224,6 +1222,11 @@ itree_node_intersects (const struct itree_node *node,
 itree_iter_next_in_subtree (struct itree_node *node,
                             struct itree_iterator *iter)
 {
+  /* FIXME: Like in the previous version of the iterator, we
+     prune based on `limit` only when moving to a left child,
+     but `limit` can also get smaller when moving to a right child
+     It's actually fairly common, so maybe it would be worthwhile
+     to prune a bit more aggressively here.  */
   struct itree_node *next;
   switch (iter->order)
     {
@@ -1386,6 +1389,12 @@ itree_iterator_start (struct itree_iterator *iter,
   iter->end = end;
   iter->otick = tree->otick;
   iter->order = order;
+  /* Beware: the `node` field alwyas holds "the next" node to consider.
+     so it's always "one node ahead" of what the iterator loop sees.
+     In most respects this makes no difference, but we depend on this
+     detail in `delete_all_overlays` where this allows us to modify
+     the current node knowing that the iterator will not need it to
+     find the next.  */
   iter->node = itree_iterator_first_node (tree, iter);
   return iter;
 }

commit 985ec6b26ebd724ff0e7d1045d2c315df3d3c05c
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Fri Nov 18 10:45:29 2022 -0500

    * lisp/emacs-lisp/bytecomp.el (byte-compile-dynamic-variable-bind): Typo

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index c81c42e042..f176e769bf 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -3637,7 +3637,7 @@ byte-compile-dynamic-variable-op
     (byte-compile-out base-op tmp)))
 
 (defun byte-compile-dynamic-variable-bind (var)
-  "Generate code to bind the lexical variable VAR to the top-of-stack value."
+  "Generate code to bind the dynamic variable VAR to the top-of-stack value."
   (byte-compile-check-variable var 'let-bind)
   (push var byte-compile-bound-variables)
   (byte-compile-dynamic-variable-op 'byte-varbind var))

commit 4506b005ab15e2d27996dac87e0f91dd0d4f91cb
Author: Robert Pluim <rpluim@gmail.com>
Date:   Fri Nov 18 16:05:05 2022 +0100

    Improve 'defvar-keymap' docstring
    
    * etc/NEWS: Improve ':repeat' entry for 'defvar-keymap'.
    * lisp/keymap.el (defvar-keymap): Improve description of ':repeat'
    keyword.

diff --git a/etc/NEWS b/etc/NEWS
index 4c7af3c276..2717f00612 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -4082,9 +4082,11 @@ This function allows defining a number of keystrokes with one form.
 ** New macro 'defvar-keymap'.
 This macro allows defining keymap variables more conveniently.
 
-** 'repeat-map' can be defined in the macro 'defvar-keymap'.
-This is possible either by using ':repeat t' or more advanced
-':repeat (:enter (commands ...) :exit (commands ...))'.
+** 'defvar-keymap' can specify 'repeat-mode' behavior for the keymap.
+Use ':repeat t' to have all bindings be repeatable or for more
+advanced usage:
+
+    ':repeat (:enter (commands ...) :exit (commands ...))'
 
 ---
 ** 'kbd' can now be used in built-in, preloaded libraries.
diff --git a/lisp/keymap.el b/lisp/keymap.el
index 0285c0571f..eaeba96644 100644
--- a/lisp/keymap.el
+++ b/lisp/keymap.el
@@ -559,18 +559,26 @@ defvar-keymap
 macro also accepts a `:doc' keyword, which (if present) is used
 as the variable documentation string.
 
-When a `:repeat' keyword is non-nil, put `repeat-map' symbol
-properties on commands in this map for `repeat-mode'.  The value
-could also be a property list with properties `:enter' and `:exit',
-for example, :repeat (:enter (commands ...) :exit (commands ...)).
-`:enter' is a list of additional commands that only enter `repeat-mode'.
-When the list is empty then by default all commands in the map enter
-`repeat-mode'.  This is applicable when a command has the `repeat-map'
-symbol property on its symbol, but doesn't exist in the map.  `:exit'
-is a list of commands that exit `repeat-mode'.  When the list is
-empty, no commands in the map exit `repeat-mode'.  This is applicable
-when a command exists in the map, but doesn't have the `repeat-map'
-symbol property on its symbol.
+The `:repeat' keyword can also be specified; it controls the
+`repeat-mode' behavior of the bindings in the keymap.  When it is
+non-nil, all commands in the map will have the `repeat-map'
+symbol property.
+
+More control is available over which commands are repeatable; the
+value can also be a property list with properties `:enter' and
+`:exit', for example:
+
+     :repeat (:enter (commands ...) :exit (commands ...))
+
+`:enter' specifies the list of additional commands that only
+enter `repeat-mode'.  When the list is empty, then by default all
+commands in the map enter `repeat-mode'.  This is useful when
+there is a command that has the `repeat-map' symbol property, but
+doesn't exist in this specific map.  `:exit' is a list of
+commands that exit `repeat-mode'.  When the list is empty, no
+commands in the map exit `repeat-mode'.  This is useful when a
+command exists in this specific map, but it doesn't have the
+`repeat-map' symbol property on its symbol.
 
 \(fn VARIABLE-NAME &key DOC FULL PARENT SUPPRESS NAME PREFIX KEYMAP REPEAT &rest [KEY DEFINITION]...)"
   (declare (indent 1))

commit 3ce629634a2c5e11690abbc5d1a9fc4811e459c3
Author: Robert Pluim <rpluim@gmail.com>
Date:   Fri Nov 18 16:02:32 2022 +0100

    Silence rmailsum byte compiler warnings
    
    * lisp/mail/rmailsum.el (rmail-summary-by-thread): Prefix unused
    lambda args with '_'.

diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 08c544bc99..b30c32aaff 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -437,10 +437,11 @@ rmail-summary-by-thread
 			 (list 'rmail-summary-by-thread msgnum)
 			 (if (and rmail-summary-progressively-narrow
 				  (rmail-summary--exists-1))
-			     (lambda (msg msgnum)
+			     (lambda (msg _msgnum)
 			       (and (aref rmail-summary-currently-displayed-msgs msg)
 				    (aref enc-msgs msg)))
-			   (lambda (msg msgnum) (aref enc-msgs msg)))
+			   (lambda (msg _msgnum)
+                             (aref enc-msgs msg)))
 			 msgnum))))
 
 ;;;###autoload

commit 592d5d7759c7ec9873ba2b54602b646b06bd9b0f
Author: Robert Pluim <rpluim@gmail.com>
Date:   Thu Nov 17 16:45:36 2022 +0100

    Use boolean values directly in rmailsum
    
    * lisp/mail/rmailsum.el (rmail-summary-invert):
    (rmail-summary-direct-descendants):
    (rmail-summary--walk-thread-message-recursively):
    (rmail-summary-by-thread):
    (rmail-summary-by-labels):
    (rmail-summary-by-recipients):
    (rmail-summary-by-regexp):
    (rmail-summary-by-topic):
    (rmail-summary-by-senders): Use the boolean values in
    'rmail-summary-currently-displayed-msgs' and similar directly instead
    of comparing them to t and nil.

diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index f161664d96..08c544bc99 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -371,8 +371,7 @@ rmail-summary-invert
 		     '(rmail-summary-by-regexp ".*")
 		     (lambda (msg)
 		       (if
-			   (eq (aref rmail-summary-currently-displayed-msgs msg)
-			       nil)
+			   (not (aref rmail-summary-currently-displayed-msgs msg))
 			   (aset rmail-summary-currently-displayed-msgs msg t)
 			 (aset rmail-summary-currently-displayed-msgs msg nil)))))
 
@@ -396,7 +395,7 @@ rmail-summary-direct-descendants
 	(msg 1))
     (while (<= msg rmail-total-messages)
       (when (and
-	     (eq nil (aref encountered-msgs msg))
+	     (not (aref encountered-msgs msg))
 	     (memq msgnum (aref rmail-summary-message-parents-vector msg)))
 	(setq desc (cons msg desc)))
       (setq msg (1+ msg)))
@@ -404,7 +403,7 @@ rmail-summary-direct-descendants
 
 (defun rmail-summary--walk-thread-message-recursively (msgnum encountered-msgs)
   "Add parents and descendants of message MSGNUM to ENCOUNTERED-MSGS, recursively."
-  (unless (eq (aref encountered-msgs msgnum) t)
+  (unless (aref encountered-msgs msgnum)
     (aset encountered-msgs msgnum t)
     (let ((walk-thread-msg
            (lambda (msg)
@@ -439,10 +438,9 @@ rmail-summary-by-thread
 			 (if (and rmail-summary-progressively-narrow
 				  (rmail-summary--exists-1))
 			     (lambda (msg msgnum)
-			       (and (eq (aref rmail-summary-currently-displayed-msgs msg)
-					t)
-				    (eq (aref enc-msgs msg) t)))
-			   (lambda (msg msgnum) (eq (aref enc-msgs msg) t)))
+			       (and (aref rmail-summary-currently-displayed-msgs msg)
+				    (aref enc-msgs msg)))
+			   (lambda (msg msgnum) (aref enc-msgs msg)))
 			 msgnum))))
 
 ;;;###autoload
@@ -462,8 +460,7 @@ rmail-summary-by-labels
 		     (if (and rmail-summary-progressively-narrow
 			      (rmail-summary--exists-1))
 			 (lambda (msg l)
-			   (and (eq (aref rmail-summary-currently-displayed-msgs msg)
-				    t)
+			   (and (aref rmail-summary-currently-displayed-msgs msg)
 				(rmail-message-labels-p msg l)))
 		       'rmail-message-labels-p)
 		     (concat " \\("
@@ -487,8 +484,7 @@ rmail-summary-by-recipients
    (if (and rmail-summary-progressively-narrow
 	    (rmail-summary--exists-1))
        (lambda (msg r &optional po)
-	 (and (eq (aref rmail-summary-currently-displayed-msgs msg)
-		  t)
+	 (and (aref rmail-summary-currently-displayed-msgs msg)
 	      (rmail-message-recipients-p msg r po)))
      'rmail-message-recipients-p)
    recipients primary-only))
@@ -527,8 +523,7 @@ rmail-summary-by-regexp
 		     (if (and rmail-summary-progressively-narrow
 			      (rmail-summary--exists-1))
 			 (lambda (msg r)
-			   (and (eq (aref rmail-summary-currently-displayed-msgs msg)
-				    t)
+			   (and (aref rmail-summary-currently-displayed-msgs msg)
 				(rmail-message-regexp-p msg r)))
 		       'rmail-message-regexp-p)
                      regexp))
@@ -585,8 +580,7 @@ rmail-summary-by-topic
    (if (and rmail-summary-progressively-narrow
 	    (rmail-summary--exists-1))
        (lambda (msg s &optional wm)
-	 (and (eq (aref rmail-summary-currently-displayed-msgs msg)
-		  t)
+	 (and (aref rmail-summary-currently-displayed-msgs msg)
 	      (rmail-message-subject-p msg s wm)))
      'rmail-message-subject-p)
    subject whole-message))
@@ -621,8 +615,7 @@ rmail-summary-by-senders
    (if (and rmail-summary-progressively-narrow
 	    (rmail-summary--exists-1))
        (lambda (msg s)
-	 (and (eq (aref rmail-summary-currently-displayed-msgs msg)
-		  t)
+	 (and (aref rmail-summary-currently-displayed-msgs msg)
 	      (rmail-message-senders-p msg s)))
      'rmail-message-senders-p)
    senders))

commit ba485eb949ddec53b1d7b5d78f3fcfbe2be60d7d
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Fri Nov 18 15:48:22 2022 +0100

    ; Fix typos

diff --git a/ChangeLog.2 b/ChangeLog.2
index fc038033ec..483dec2542 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -9317,7 +9317,7 @@
 	optional.
 
 	* src/buffer.c (Fbarf_if_buffer_read_only): Rename argument POS
-	to POSITION to keep consisteny with doc-string.
+	to POSITION to keep consistent with doc-string.
 
 2016-02-01  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -34464,7 +34464,7 @@
 
 	* lisp/emacs-lisp/package.el: Make archive and status pseudo-keywords
 	(package--has-keyword-p): Understand "arc:xxxx" and "status:xxxx"
-	as special keywords which match agains package archive and status
+	as special keywords which match against package archive and status
 	respectively.
 	* etc/NEWS: Document it.
 
diff --git a/ChangeLog.3 b/ChangeLog.3
index a78f53f377..3ebe74e76b 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -20026,7 +20026,7 @@
 
 	Add query command removed in 4ff1f66b12
 
-	* lisp/net/rcirc.el (query): Readd accidentally removed command
+	* lisp/net/rcirc.el (query): Re-add accidentally removed command.
 
 2021-07-06  Philip Kaludercic  <philipk@posteo.net>
 
@@ -21772,7 +21772,7 @@
 
 	EIEIO: Promote the CLOS behavior over the EIEIO-specific behavior
 
-	Change docs to advertize `slot-value` rather than `oref`.
+	Change docs to advertise `slot-value` rather than `oref`.
 	Change the implementation of `:initform` to better match the CLOS semantics,
 	while preserving the EIEIO semantics, but warn when encountering cases
 	where the two diverge.
@@ -21790,8 +21790,8 @@
 
 	* lisp/emacs-lisp/eieio.el (defclass): Warn about inapplicable
 	`:initarg` and about uses of init forms that are ambiguous.
-	(oref): Don't advertize the deprecated use of initargs as slot names.
-	(oref-default): Don't advertize the deprecated case where it returns the
+	(oref): Don't advertise the deprecated use of initargs as slot names.
+	(oref-default): Don't advertise the deprecated case where it returns the
 	initform's value.
 	(initialize-instance): Use `macroexp-const-p`.
 	* lisp/emacs-lisp/eieio-core.el (eieio--unbound): Rename from
@@ -36674,7 +36674,7 @@
 
 2021-02-24  Andrea Corallo  <akrl@sdf.org>
 
-	Fix async compilation and paramenter naming
+	Fix async compilation and parameter naming
 
 	* lisp/emacs-lisp/comp.el (native--compile-async)
 	(native-compile-async): Fix broken parameter renaming.
@@ -40177,7 +40177,7 @@
 
 	* lisp/simple.el (recenter-current-error): New command.
 	* lisp/progmodes/grep.el (grep-mode-map):
-	Delete bidings for n and p.
+	Delete bindings for n and p.
 
 	* lisp/progmodes/compile.el (compilation-minor-mode-map):
 	Move here the n and p bindings.
@@ -41694,7 +41694,7 @@
 	in a global minor mode.  This commit fixes bug #45792.
 
 	* lisp/international/quail.el (quail-show-guidance): Test the major mode is
-	not minibuffer-inactive-mode before proceding with the function.
+	not minibuffer-inactive-mode before proceeding with the function.
 
 2021-01-31  Lars Ingebrigtsen  <larsi@gnus.org>
 
@@ -48572,7 +48572,7 @@
 	c-laomib-loop.  Insert code which calls c-laomib-loop minimally, with the help
 	of the new cache.
 
-	* lisp/progmodes/cc-mode.el (c-basic-common-init): Initialize the new cach
+	* lisp/progmodes/cc-mode.el (c-basic-common-init): Initialize the new cache
 	(at mode start).
 	(c-before-change): Invalidate the new cache.
 	(c-fl-decl-start): Add an extra check (> (point) bod-lim) to prevent looping.
@@ -50078,7 +50078,7 @@
 	Optimize c-parse-state for large buffers with few (if any) braces.
 
 	* lisp/progmodes/cc-engine.el (c-get-fallback-scan-pos): Search a maximum of
-	50,000 characters back for the two BODs.  Return nil if we dont' find them.
+	50,000 characters back for the two BODs.  Return nil if we don't find them.
 	(c-parse-state-get-strategy): For strategy `forward', always use the position
 	`good-pos' for `start-point', even when there's a change of current macro.
 	Deal with a possible return value of nil from c-get-fallback-scan-pos (as
@@ -55996,7 +55996,7 @@
 
 2020-11-12  Andrea Corallo  <akrl@sdf.org>
 
-	Unline some functions to optimize bootstrap time
+	Uninline some functions to optimize bootstrap time
 
 	* lisp/emacs-lisp/comp.el (comp-mvar-value-vld-p)
 	(comp-mvar-value, comp-mvar-fixnum-p, comp-set-op-p)
@@ -56612,7 +56612,7 @@
 
 2020-11-07  Andrea Corallo  <akrl@sdf.org>
 
-	Allow for manually bumbing new native compiler ABI versions
+	Allow for manually bumping new native compiler ABI versions
 
 	* src/comp.c (ABI_VERSION): Define macro.
 	(hash_native_abi): Include ABI_VERSION in the hashing.
@@ -61229,7 +61229,7 @@
 
 2020-10-14  Andrea Corallo  <akrl@sdf.org>
 
-	Have `native-elisp-load' return the last registerd function
+	Have `native-elisp-load' return the last registered function
 
 	* lisp/emacs-lisp/comp.el (comp-emit-for-top-level): Synthesize
 	'top_level_run' so it returns the last value returned by
@@ -65831,7 +65831,7 @@
 
 	Better error handling after calling 'gcc_jit_context_compile_to_file'
 
-	Typically errors are catched in 'compile_function' but in case
+	Typically errors are caught in 'compile_function' but in case
 	libgccjit throw an error only afterwards while compiling the whole
 	compilation unit we have to report it correctly.
 
@@ -76328,7 +76328,7 @@
 
 	Add a simple pass to infer pure functions not explicitly declared as
 	such.  Use this information only during compilation (speed 3) to
-	optimize out function calls whe possible.
+	optimize out function calls when possible.
 
 2020-07-09  Andrea Corallo  <akrl@sdf.org>
 
@@ -78249,7 +78249,7 @@
 	(comp-latch-make-fill): New function.
 	(comp-emit-uncond-jump, comp-emit-cond-jump): Update to emit
 	latches.
-	(comp-new-block-sym): Add a postfix paramenter.
+	(comp-new-block-sym): Add a postfix parameter.
 
 2020-06-13  Andrea Corallo  <akrl@sdf.org>
 
@@ -78602,7 +78602,7 @@
 	Fix comp-call-optim-form-call for null `callee'
 
 	* lisp/emacs-lisp/comp.el (comp-call-optim-form-call): Guard
-	agains null `calle'.
+	against null `calle'.
 
 2020-06-07  Glenn Morris  <rgm@gnu.org>
 
@@ -81264,7 +81264,7 @@
 	Fix bug #40992 whilst still allowing breakpoint highlights in edebug
 
 	Strategy: when an instrumented function gets re-evaluated, save the former
-	value of its symbol's `edebug' property in the new propery `ghost-edebug'.  If
+	value of its symbol's `edebug' property in the new property `ghost-edebug'.  If
 	this function is still being edebugged, edebug will then access its info from
 	this new property.
 
@@ -83843,7 +83843,7 @@
 
 	Implement position independent dump.
 
-	Set the filename for every compilation unit as realtive to obtain a
+	Set the filename for every compilation unit as relative to obtain a
 	position independent dump.
 
 	* lisp/loadup.el: Modify filename for every compilation unit as
@@ -84397,7 +84397,7 @@
 
 	* lisp/arc-mode.el: Rewrite displaying the summaries
 
-	Completely rewrite the code that displayes the summaries, so all
+	Completely rewrite the code that displays the summaries, so all
 	backends share the same code.
 
 	(archive--summarize-descs): New function.
@@ -86075,7 +86075,7 @@
 
 	Merge remote-tracking branch 'savannah/master' into HEAD
 
-2020-03-10  AndreaCorallo  <akrl@sdf.org>
+2020-03-10  Andrea Corallo  <akrl@sdf.org>
 
 	* Improve load_comp_unit
 
@@ -86084,7 +86084,7 @@
 
 	Guard also data_ephemeral_vec against compiler optimizations.
 
-2020-03-10  AndreaCorallo  <akrl@sdf.org>
+2020-03-10  Andrea Corallo  <akrl@sdf.org>
 
 	* Fix store_function_docstring for native functions
 
@@ -86098,7 +86098,7 @@
 	native_intspec and native_doc fields has to be reached by the subr
 	cause are not anymore in the CU.
 
-2020-03-10  AndreaCorallo  <akrl@sdf.org>
+2020-03-10  Andrea Corallo  <akrl@sdf.org>
 
 	* Set relocation class as ephemeral in `comp-limplify-top-level'
 
@@ -86547,17 +86547,17 @@
 
 	* lisp/replace.el (occur-1): Update default-directory in occur buffer.
 
-2020-03-04  AndreaCorallo  <akrl@sdf.org>
+2020-03-04  Andrea Corallo  <akrl@sdf.org>
 
 	* Do not crash if the output directory is created in the meanwhile
 
-2020-03-03  AndreaCorallo  <akrl@sdf.org>
+2020-03-03  Andrea Corallo  <akrl@sdf.org>
 
 	Hash eln ABI once and add it to the output compilation path
 
 	Fix org for eln new compilation folder layout
 
-2020-03-03  AndreaCorallo  <akrl@sdf.org>
+2020-03-03  Andrea Corallo  <akrl@sdf.org>
 
 	Rework `find-lisp-object-file-name'
 
@@ -86668,7 +86668,7 @@
 	and 'fill-column' values.  (Bug#36837)
 	(whitespace-lines-regexp): New function.
 
-2020-03-01  AndreaCorallo  <akrl@sdf.org>
+2020-03-01  Andrea Corallo  <akrl@sdf.org>
 
 	* ; Clean-up out of date comment
 
@@ -86718,11 +86718,11 @@
 	* src/pdumper.c (dump_object): Fix hash for Lisp_Type after commit
 	202c3319a28c029d6971dccea92f92425c5e8067.
 
-2020-02-29  AndreaCorallo  <akrl@sdf.org>
+2020-02-29  Andrea Corallo  <akrl@sdf.org>
 
 	Introduce 'effective_load_path'
 
-2020-02-29  AndreaCorallo  <akrl@sdf.org>
+2020-02-29  Andrea Corallo  <akrl@sdf.org>
 
 	* Keep comp-subr-list into pure space
 
@@ -87689,7 +87689,7 @@
 
 	(lispref/modes.texi): Explain avoiding lambdas on hooks.
 
-2020-02-06  AndreaCorallo  <akrl@sdf.org>
+2020-02-06  Andrea Corallo  <akrl@sdf.org>
 
 	Add system-configuration in the compilation output path
 
@@ -87713,7 +87713,7 @@
 	Add function ssa-status as `comp-func' slot and have `comp-clean-ssa'
 	to run when necessary.
 
-2020-03-01  AndreaCorallo  <akrl@sdf.org>
+2020-03-01  Andrea Corallo  <akrl@sdf.org>
 
 	Remove relocation index form LIMPLE setimm
 
@@ -87739,21 +87739,21 @@
 
 	Merge remote-tracking branch 'savannah/master' into HEAD
 
-2020-02-26  AndreaCorallo  <akrl@sdf.org>
+2020-02-26  Andrea Corallo  <akrl@sdf.org>
 
 	* ; Add a TODO for a future optimization
 
-2020-02-26  AndreaCorallo  <akrl@sdf.org>
+2020-02-26  Andrea Corallo  <akrl@sdf.org>
 
 	Store optimize qualities into .eln files
 
 	For now just comp-speed and comp-debug are stored.
 
-2020-02-26  AndreaCorallo  <akrl@sdf.org>
+2020-02-26  Andrea Corallo  <akrl@sdf.org>
 
-	Rename d-base allocation classe into d-default
+	Rename d-base allocation class into d-default
 
-2020-02-26  AndreaCorallo  <akrl@sdf.org>
+2020-02-26  Andrea Corallo  <akrl@sdf.org>
 
 	Add ephemeral relocation data class
 
@@ -87793,7 +87793,7 @@
 
 	Test 'comp-eq' should not assume any string hashing policy
 
-2020-02-21  AndreaCorallo  <akrl@sdf.org>
+2020-02-21  Andrea Corallo  <akrl@sdf.org>
 
 	Emit 'top_level_run' objects as impure
 
@@ -87801,7 +87801,7 @@
 
 	Verify '--with-nativecomp' has also '--with-dumping=pdumper'
 
-2020-02-21  AndreaCorallo  <akrl@sdf.org>
+2020-02-21  Andrea Corallo  <akrl@sdf.org>
 
 	Reorder m-var slots
 
@@ -87819,7 +87819,7 @@
 
 	Use `sxhash-eq' to generate mvar SSA ids
 
-2020-02-15  AndreaCorallo  <akrl@sdf.org>
+2020-02-15  Andrea Corallo  <akrl@sdf.org>
 
 	Speed 2 goes default
 
@@ -87832,7 +87832,7 @@
 	Every function call by reference gets use one unique array of
 	arguments.
 
-2020-02-14  AndreaCorallo  <akrl@sdf.org>
+2020-02-14  Andrea Corallo  <akrl@sdf.org>
 
 	Clean-up old gc disable refuse in comp-tests-non-locals
 
@@ -88071,7 +88071,7 @@
 
 	Always define subr-native-elisp-p also without native compiler
 
-2020-02-03  AndreaCorallo  <akrl@sdf.com>
+2020-02-03  Andrea Corallo  <akrl@sdf.com>
 
 	Fix load_comp_unit for non zero speeds
 
@@ -91228,7 +91228,7 @@
 
 	optimize primitive native call
 
-	propagate contant types and optimize self calls
+	propagate constant types and optimize self calls
 
 	introduce stack_el_t
 
@@ -93578,7 +93578,7 @@
 
 2021-02-03  Michael Albinus  <michael.albinus@gmx.de>
 
-	Fix an error in tramp-sh-handle-make-process.  Dont' merge with master
+	Fix an error in tramp-sh-handle-make-process.  Don't merge with master
 
 	* lisp/net/tramp-sh.el (tramp-sh-handle-make-process): Don't use heredoc
 	script whent the argument contains a string.
@@ -101413,7 +101413,7 @@
 	vc-hg: prompt for branch to merge
 
 	* lisp/vc/vc-hg.el (vc-hg-merge-branch): Prompt for revision to merge.
-	(vc-hg-revision-table): Use branches, tags and bookmarks as competion
+	(vc-hg-revision-table): Use branches, tags and bookmarks as completion
 	candidates.
 
 	* etc/NEWS: Mention changes of vc-hg.el
@@ -103042,7 +103042,7 @@
 	open-paren-in-column-0-is-defun-start to nil) fixes bug #37910.  It may also
 	have fixed bug #5490 and bug #18072.
 
-	* lisp/progmodes/cc-engine.el (c-state-cache-non-literal-place): Remove thi
+	* lisp/progmodes/cc-engine.el (c-state-cache-non-literal-place): Remove this
 	non-sensical function, replacing it with ....
 	(c-state-cache-lower-good-pos): New function.
 	(c-renarrow-state-cache, c-append-lower-brace-pair-to-state-cache)
@@ -110631,7 +110631,7 @@
 	Fix reversed check in mm-possibly-verify-or-decrypt
 
 	* lisp/gnus/mm-decode.el (mm-possibly-verify-or-decrypt): Fix
-	reverse check thinko that made unverified singed messages not
+	reverse check thinko that made unverified signed messages not
 	display correctly.
 
 2019-09-27  Wilson Snyder  <wsnyder@wsnyder.org>
@@ -117900,7 +117900,7 @@
 	(readbyte_from_file): Assert that `infile` is set.
 	(close_infile_unwind): Reset `infile` to its previous value rather than
 	to NULL.
-	(Fload): Remember the previous value of `infile` before chaning it.
+	(Fload): Remember the previous value of `infile` before changing it.
 	(readevalloop): Don't set `infile` any more.
 
 2019-07-31  Paul Eggert  <eggert@cs.ucla.edu>
@@ -130261,7 +130261,7 @@
 	8192 bytes is a reasonable number nowadays given typical file
 	system design.
 	* test/lisp/image-tests.el (image-tests--emacs-images-directory):
-	New contant.
+	New constant.
 	(image-type-from-file-header-test): New test.
 
 2019-05-18  Michael Albinus  <michael.albinus@gmx.de>
@@ -136480,7 +136480,7 @@
 	Check gnus-newsgroup-dependencies is hash table in gnus-id-to-thread
 
 	* lisp/gnus/gnus-sum.el (gnus-id-to-thread): If dependencies haven't
-	  been initialized yet, don't blow up. Mimicks previous (non hasht
+	  been initialized yet, don't blow up. Mimics previous (non hash
 	  table) behavior.
 
 2019-03-31  Mattias Engdegård  <mattiase@acm.org>
@@ -184352,7 +184352,7 @@
 
 	* src/lisp.h (COMMON_MULTIPLE): Move here from alloc.c.
 	* src/thread.c (THREAD_ALIGNMENT): New macro.
-	(main_thread): Use THREAD_ALIGNMENT to align propertly.  (Bug#29040)
+	(main_thread): Use THREAD_ALIGNMENT to align properly.  (Bug#29040)
 
 2017-10-28  Eli Zaretskii  <eliz@gnu.org>
 
@@ -185648,7 +185648,7 @@
 	Add mode map to Flymake diagnostic button
 
 	* lisp/progmodes/flymake.el (flymake--diagnostics-buffer-entries): Add
-	keymap propery.
+	keymap property.
 
 2017-10-10  João Távora  <joaotavora@gmail.com>
 
@@ -192051,7 +192051,7 @@
 
 2017-08-09  Tino Calancha  <tino.calancha@gmail.com>
 
-	Ask files for deletion in buffer order: top first, botton later
+	Ask files for deletion in buffer order: top first, bottom later
 
 	* lisp/dired.el (dired-do-flagged-delete, dired-do-delete):
 	Call `nreverse' t invert the output of `dired-map-over-marks'.
@@ -208945,7 +208945,7 @@
 
 	Revamp quitting and fix infloops
 
-	This fixes some infinite loops that cannot be quitted out of,
+	This fixes some infinite loops that cannot be quit out of,
 	e.g., (defun foo () (nth most-positive-fixnum '#1=(1 . #1#)))
 	when byte-compiled and when run under X.  See:
 	https://lists.gnu.org/r/emacs-devel/2017-01/msg00577.html
@@ -218796,7 +218796,7 @@
 	* lib/stdint.in.h, m4/extensions.m4, m4/stdint.m4, m4/stdio_h.m4:
 	* m4/sys_types_h.m4: Copy from gnulib.
 	* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
-	* lib/limits.in.h, m4/limits-h.m4: New files, copie from gnulib.
+	* lib/limits.in.h, m4/limits-h.m4: New files, copied from gnulib.
 	* nt/gnulib.mk: Merge changes from lib/gnulib.mk.
 
 2016-09-15  Michael Albinus  <michael.albinus@gmx.de>
@@ -219462,7 +219462,7 @@
 
 2016-09-02  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-	Check actual contents before promting about changed file
+	Check actual contents before prompting about changed file
 
 	* lisp/userlock.el (userlock--check-content-unchanged)
 	(userlock--ask-user-about-supersession-threat): New functions.
@@ -220696,7 +220696,7 @@
 
 	* lisp/progmodes/cc-mode.el (c-after-change): When we detect a missing
 	invocation of c-before-change-functions, we assume the changed region is the
-	entire buffer, and call c-before-change explicitly before proceding.
+	entire buffer, and call c-before-change explicitly before proceeding.
 
 2016-08-09  Alan Mackenzie  <acm@muc.de>
 
@@ -223962,10 +223962,10 @@
 
 2016-06-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
-	Advertize set-keymap-parent as replacement for copy-keymap
+	Advertise set-keymap-parent as replacement for copy-keymap
 
 	* doc/lispref/keymaps.texi (Creating Keymaps):
-	* src/keymap.c (Fcopy_keymap): Advertize set-keymap-parent as replacement.
+	* src/keymap.c (Fcopy_keymap): Advertise set-keymap-parent as replacement.
 
 2016-06-15  Ted Zlatanov  <tzz@lifelogs.com>
 
@@ -226537,7 +226537,7 @@
 	Fix Bug#10085
 
 	* lisp/net/tramp.el (tramp-find-foreign-file-name-handler):
-	Add optional arguments OPERATION and COMPETION.  Handle
+	Add optional arguments OPERATION and COMPLETION.  Handle
 	`file-name-as-directory', `file-name-directory' and
 	`file-name-nondirectory' also in completion mode.
 	(tramp-file-name-handler): Use it.  (Bug#10085)
@@ -227546,7 +227546,7 @@
 	of the data end marker from here... (bug#23020).
 	(smtpmail-send-data): ... to here, so that we don't get a
 	"Sending done" before we've sent the final "." (which can make
-	the SMPT server reject the email.
+	the SMTP server reject the email.
 
 2016-04-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
diff --git a/doc/emacs/ChangeLog.1 b/doc/emacs/ChangeLog.1
index 5647538a24..6669e28e6b 100644
--- a/doc/emacs/ChangeLog.1
+++ b/doc/emacs/ChangeLog.1
@@ -1356,7 +1356,7 @@
 
 	* dired.texi (Dired Deletion, Marks vs Flags): Document Emacs 24.3
 	changes to the mark and unmark commands.
-	(Comparison in Dired): Document chages to dired-diff.  Remove M-=,
+	(Comparison in Dired): Document changes to dired-diff.  Remove M-=,
 	which is no longer bound to dired-backup-diff.
 
 2012-10-23  Bastien Guerry  <bzg@gnu.org>
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index a9b4ff783d..7a382c0566 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -807,7 +807,7 @@ Operating on Files
 
 The option @code{dired-create-destination-dirs-on-trailing-dirsep},
 when set in addition to @code{dired-create-destination-dirs}, controls
-wether a trailing directory separator at the destination is treated
+whether a trailing directory separator at the destination is treated
 specially.  In that case, when renaming a directory @samp{old} to
 @samp{new/} and no directory @samp{new} exists already, it will be
 created and @samp{old} is moved into the newly created directory.
diff --git a/doc/misc/ChangeLog.1 b/doc/misc/ChangeLog.1
index c54fc42036..1c5e7c1e2f 100644
--- a/doc/misc/ChangeLog.1
+++ b/doc/misc/ChangeLog.1
@@ -3525,7 +3525,7 @@
 
 2012-01-03  Carsten Dominik  <carsten.dominik@gmail.com>
 
-	* org.texi (The clock table): Mention that ACHIVED trees
+	* org.texi (The clock table): Mention that ARCHIVED trees
 	contribute to the clock table.
 
 2012-01-03  Carsten Dominik  <carsten.dominik@gmail.com>  (tiny change)
@@ -4420,12 +4420,7 @@
 
 2011-02-05  Era Eriksson  <era+tramp@iki.fi>  (tiny change)
 
-	* tramp.texi:
-	Replace "delimet" with "delimit" globally.
-	Replace "explicite" with "explicit" globally.
-	Replace "instead of" with "instead" where there was nothing after "of".
-	Audit use of comma before interrogative pronoun, "that", or "which".
-	Minor word order, spelling, wording changes.
+	* tramp.texi: Minor word order, spelling, wording changes.
 
 2011-02-04  Teodor Zlatanov  <tzz@lifelogs.com>
 
@@ -5868,7 +5863,7 @@
 2009-09-02  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.texi (Effort estimates): Document new effort setting commands.
-	(Agenda commands): Document the new keys fro agenda time motion.
+	(Agenda commands): Document the new keys for agenda time motion.
 	Document entry text mode.  Improve documentation of the keys to include
 	inactive time stamps into the agenda view.
 	(Feedback): Document the new bug report command.
diff --git a/doc/misc/reftex.texi b/doc/misc/reftex.texi
index e85f096f99..9c543a4c0f 100644
--- a/doc/misc/reftex.texi
+++ b/doc/misc/reftex.texi
@@ -5292,7 +5292,7 @@ Changes
 @itemize @bullet
 @item
 Fixed bug with @samp{%F} in a label prefix.  Added new escapes
-@samp{%m} and @samp{%M} for mater file name and master directory.
+@samp{%m} and @samp{%M} for master file name and master directory.
 @end itemize
 
 @noindent @b{Version 4.24}
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index df65d70cb1..8e192d7e40 100644
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -1203,11 +1203,11 @@ Motion Commands
 @var{ch} could not be found (@code{vip-find-char-backward}).
 @item t @var{ch}
 @kindex 164 t @r{(}@code{vip-goto-char-forward}@r{)}
-Move point forward upto the character @var{ch} on the line.  Signal error if
+Move point forward up to the character @var{ch} on the line.  Signal error if
 @var{ch} could not be found (@code{vip-goto-char-forward}).
 @item T @var{ch}
 @kindex 124 T @r{(}@code{vip-goto-char-backward}@r{)}
-Move point backward upto the character @var{ch} on the line.  Signal error if
+Move point backward up to the character @var{ch} on the line.  Signal error if
 @var{ch} could not be found (@code{vip-goto-char-backward}).
 @item ;
 @kindex 073 ; @r{(}@code{vip-repeat-find}@r{)}
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 9df9a4b652..3b6ab2e2ad 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -2847,7 +2847,7 @@ can pass the converted path to the =sqlcmd= tool.
 
 **** Improved support of header arguments for postgresql
 
-The postgresql engine in a sql code block supports now ~:dbport~ nd
+The postgresql engine in a sql code block now supports ~:dbport~ and
 ~:dbpassword~ as header arguments.
 
 **** Support for additional plantuml output formats
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index 6053ffa65a..de73fe7f0a 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -1737,7 +1737,7 @@
 	(bibtex-find-crossref, bibtex-find-entry): New funs.
 	(bibtex-find-entry-location): Rename to bibtex-prepare-new-entry, use
 	bibtex-lessp, Simplify.
-	(bibtex-validate): Simplify.  Fixe bug of internal variable
+	(bibtex-validate): Simplify.  Fix bug of internal variable
 	questionable-month.
 	(bibtex-remove-OPT-or-ALT): Use when.
 	(bibtex-remove-delimiters, bibtex-kill-field, bibtex-kill-entry)
@@ -9449,7 +9449,7 @@
 	Use shy group.
 	(outline-level) <var>: Update calling convention.
 	(outline-level) <fun>: Take advantage of it.
-	(outline-demote): Don't assume the match-data is still uptodate.
+	(outline-demote): Don't assume the match-data is still up-to-date.
 	(outline-up-heading): Simplify and make sure the match data is
 	properly set at the end.
 
diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12
index a89e515510..db27bd225d 100644
--- a/lisp/ChangeLog.12
+++ b/lisp/ChangeLog.12
@@ -1556,7 +1556,7 @@
 	(org-search-not-self): Rename from `org-search-not-link'.
 	(org-open-link-marker): New variable.
 	(org-open-at-point): Set `org-open-link-marker'.
-	(org-print-icalendar-entries): Fixe bug with excluding DONE
+	(org-print-icalendar-entries): Fix bug with excluding DONE
 	entries from the exported list.
 	(org-edit-formula-lisp-indent): New command.
 	(orgtbl-to-texinfo, orgtbl-to-html): New functions.
@@ -5243,7 +5243,7 @@
 
 2006-10-11  Ilya Zakharevich  <ilyaz@cpan.org>
 
-	* progmodes/cperl-mode.el: Merge from upstream, upto version 5.22.
+	* progmodes/cperl-mode.el: Merge from upstream, up to version 5.22.
 	After 5.0:
 	(cperl-add-tags-recurse-noxs-fullpath): New function (for -batch mode).
 
@@ -11874,7 +11874,7 @@
 
 	* files.el (hack-local-variables-confirm): Don't prompt for ! if
 	enable-local-variables is set to always query, or there is no
-	savable variable.
+	saveable variable.
 
 2006-03-10  Bill Wohler  <wohler@newt.com>
 
diff --git a/lisp/ChangeLog.13 b/lisp/ChangeLog.13
index 369aec81ef..326003d9d9 100644
--- a/lisp/ChangeLog.13
+++ b/lisp/ChangeLog.13
@@ -1070,7 +1070,7 @@
 	* international/mule-cmds.el (char-code-property-alist): New variable.
 	(define-char-code-property): New function.
 	(get-char-code-property, put-char-code-property): Handle a
-	char-table registerd in char-code-property-alist.
+	char-table registered in char-code-property-alist.
 	(set-language-environment): Check :ascii-compatible-p property of
 	nonascii charset instead of its dimension.
 
@@ -13901,7 +13901,7 @@
 2007-07-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* ses.el (ses-cleanup): Prevent Emacs from spuriously checking if the
-	underlying file is uptodate.
+	underlying file is up-to-date.
 
 2007-07-23  Christopher J. Madsen  <cjm@cjmweb.net>
 
@@ -15245,7 +15245,7 @@
 2007-06-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/autoload.el (autoload-modified-buffers): New var.
-	(autoload-find-destination): Keep it uptodate.
+	(autoload-find-destination): Keep it up-to-date.
 	(autoload-save-buffers): New fun.
 	(update-file-autoloads): Use it.  Re-add the "up to date" message.
 
diff --git a/lisp/ChangeLog.14 b/lisp/ChangeLog.14
index 686746abe0..8d8c611778 100644
--- a/lisp/ChangeLog.14
+++ b/lisp/ChangeLog.14
@@ -6103,7 +6103,7 @@
 	* international/quail.el (quail-show-guidance): Don't create
 	a guidance-frame if current buffer is not a minibuffer, since even if
 	selected-window is mini-p, the buffer will never be displayed in it, so
-	it wil be usable for guidance.
+	it will be usable for guidance.
 
 2008-10-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16
index 5b2244dec0..85f8cdd7b0 100644
--- a/lisp/ChangeLog.16
+++ b/lisp/ChangeLog.16
@@ -15340,7 +15340,7 @@
 	* subr.el (with-selected-frame): Mention that the selected frame
 	is restored (bug#9980).
 
-	* ibuffer.el (ibuffer-mode): List the bindings in the corrent map
+	* ibuffer.el (ibuffer-mode): List the bindings in the correct map
 	(bug#9759).
 
 	* mail/smtpmail.el (password-cache-add): Remove unused declaration.
diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3
index 7f5ceb4b85..e23226b844 100644
--- a/lisp/ChangeLog.3
+++ b/lisp/ChangeLog.3
@@ -7326,8 +7326,7 @@
 1991-07-13  Jim Blandy  (jimb@churchy.gnu.ai.mit.edu)
 
 	* info.el (Info-find-node): Call buffer-flush-undo with one arg,
-	instead of none.  Change call to get-buffer-c>reate to
-	get-buffer-create.
+	instead of none.  Fix typo in call to get-buffer-create.
 
 	* startup.el (command-line): Remove the arguments from
 	command-line-args as we process them.
diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4
index e965dbb5ef..ea0502975e 100644
--- a/lisp/ChangeLog.4
+++ b/lisp/ChangeLog.4
@@ -6858,7 +6858,7 @@
 1993-07-26  Richard Stallman  (rms@mole.gnu.ai.mit.edu)
 
 	* frame.el (frame-notice-user-settings): Don't reapply a parm
-	whose value is ot changed (as far as we know) since frame-initialize.
+	whose value is not changed (as far as we know) since frame-initialize.
 
 	* simple.el (kill-ring-save): Delete spurious `message' call.
 	(set-mark): If POS is nil, call deactivate-mark.
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index e2128b94c0..27d522aaf2 100644
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -7392,7 +7392,7 @@
 	(ada-format-paramlist): Simplified a regexp.
 	(ada-indent-current): On first line of the buffer, indent to column 0.
 	Don't reindent if new position is the same as the old one.  Thus, a
-	correctly indended line is not modified.
+	correctly indented line is not modified.
 	(ada-get-indent-subprog): Simplified a regexp.
 	(ada-goto-matching-decl-start): Distinguish between normal type
 	declaration and protected types, which are more like procedures.
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index c81968e6ee..3220832454 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -20821,7 +20821,7 @@
 	function word-help-find-help-file.
 	(word-help-guess-all): New subroutine.
 	(word-help-guess): Use word-help-guess-all.
-	May optionally copy only upto the cursor,
+	May optionally copy only up to the cursor,
 	instead of the entire keyword.
 
 1997-01-01  Richard Stallman  <rms@ethanol.gnu.ai.mit.edu>
diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8
index 78fc7e2056..a14d682192 100644
--- a/lisp/ChangeLog.8
+++ b/lisp/ChangeLog.8
@@ -4356,7 +4356,7 @@
 1999-07-21  Gerd Moellmann  <gerd@gnu.org>
 
 	* scroll-bar.el (scroll-bar-toolkit-scroll): New.
-	(global): Use different key bindings if using tookit scroll bars.
+	(global): Use different key bindings if using toolkit scroll bars.
 
 1999-07-21  Gerd Moellmann  <gerd@gnu.org>
 
@@ -9712,7 +9712,7 @@
 	(ps-mule-font-info-database-ps-bdf): New variable.
 	(ccl-encode-ethio-unicode): Bug of CCL code fixed.
 	(ps-mule-generate-font): Give CHARSET arg to FONT-FUNC function
-	registerd in FONT-SPEC.
+	registered in FONT-SPEC.
 	(ps-mule-bitmap-prologue): Fix PostScript code to realize correct
 	character width of bitmap fonts.
 	(ps-mule-generate-bitmap-font): Give COLUMNS arg to PostScript
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index a8ebe81e7d..4cb10d2d55 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -789,7 +789,7 @@
 	(command-line-1): If inhibit-startup-buffer-menu is set, don't
 	display the buffer menu.  From Simon Josefsson <jas@extundo.com>.
 
-	This allows upto 99999 messages in the summary without screwing up
+	This allows up to 99999 messages in the summary without screwing up
 	the summary sorting.  Previously 9999 was the maximum.  Added to NEWS.
 
 	* mail/rmailsum.el (rmail-make-summary-line)
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 0ebfc4bb8d..9a2baf1e43 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -1769,7 +1769,7 @@ diary-list-sexp-entries
 `diary-islamic-date', `diary-julian-date', `diary-mayan-date',
 `diary-persian-date'
 
-Theses functions only produce output on certain dates:
+These functions only produce output on certain dates:
 
 `diary-lunar-phases'           - phases of moon (on the appropriate days)
 `diary-hebrew-omer'            - Omer count, within 50 days after Passover
diff --git a/lisp/cedet/ChangeLog.1 b/lisp/cedet/ChangeLog.1
index 5fe2e0e6de..7803fc7f0c 100644
--- a/lisp/cedet/ChangeLog.1
+++ b/lisp/cedet/ChangeLog.1
@@ -459,7 +459,7 @@
 	* semantic/scope.el (semantic-analyze-scoped-types-default): If we
 	cannot find a type in the typecache, also look into the types
 	we already found.  This is necessary since in C++, a 'using
-	namespace' can be dependend on a previous one.
+	namespace' can be dependent on a previous one.
 	(semantic-completable-tags-from-type): When creating the list of
 	completable types, pull in types which are referenced through
 	'using' statements, and also preserve their filenames.
diff --git a/lisp/cedet/ede/proj.el b/lisp/cedet/ede/proj.el
index 7a486754a0..64f2651622 100644
--- a/lisp/cedet/ede/proj.el
+++ b/lisp/cedet/ede/proj.el
@@ -543,7 +543,7 @@ ede-proj-compilers
   (when (slot-exists-p obj 'compiler)
     (let ((comp (oref obj compiler)))
       (if comp
-	  ;; Now that we have a pre-set compilers to use, convert tye symbols
+          ;; Now that we have a pre-set compilers to use, convert type symbols
 	  ;; into objects for ease of use
 	  (setq comp (if (listp comp)
 	                 (mapcar #'symbol-value comp)
diff --git a/lisp/cedet/semantic/analyze/fcn.el b/lisp/cedet/semantic/analyze/fcn.el
index 7f60162115..af7da9cc63 100644
--- a/lisp/cedet/semantic/analyze/fcn.el
+++ b/lisp/cedet/semantic/analyze/fcn.el
@@ -72,7 +72,7 @@ semantic-analyze-select-best-tag
 Optional TAGCLASS indicates to restrict the return to only
 tags of TAGCLASS."
 
-  ;; If there is a srew up and we get just one tag.. massage over it.
+  ;; If there is a screw up and we get just one tag.. massage over it.
   (when (semantic-tag-p sequence)
     (setq sequence (list sequence)))
 
diff --git a/lisp/cedet/semantic/scope.el b/lisp/cedet/semantic/scope.el
index 83e7ed66c1..50d7c8adf1 100644
--- a/lisp/cedet/semantic/scope.el
+++ b/lisp/cedet/semantic/scope.el
@@ -822,7 +822,7 @@ semantic-scope-find
 	  ans)
       ;; Not a real scope.  Our scope calculation analyze parts of
       ;; what it finds, and needs to pass lists through to do it's work.
-      ;; Tread that list as a singly entry.
+      ;; Treat that list as a singly entry.
       (if class
 	  (semantic-find-tags-by-class class scope)
 	scope)
diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el
index eacbb6f1f8..013864f81c 100644
--- a/lisp/cedet/semantic/symref/list.el
+++ b/lisp/cedet/semantic/symref/list.el
@@ -378,7 +378,8 @@ semantic-symref-list-contract-all
 
 (defun semantic-symref-list-on-hit-p ()
   "Return the line number if the cursor is on a buffer line with a hit.
-Hits are the line of code from the buffer, not the tag summar or file lines."
+Hits are the line of code from the buffer, not the tag summary or
+file lines."
   (save-excursion
     (end-of-line)
     (let* ((ol (car (overlays-at (1- (point)))))) ;; trust this for now
diff --git a/lisp/dired.el b/lisp/dired.el
index 8995c48df7..81e62f88cf 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1541,7 +1541,7 @@ dired-align-file
 	    (when (< alt-col other-col)
 	      (setq other-col alt-col)
 	      (setq other (point)))))
-	;; Keep positions uptodate when we insert stuff.
+	;; Keep positions up-to-date when we insert stuff.
 	(if (> other file) (setq other (copy-marker other)))
 	(setq file (copy-marker file))
 	;; Main loop.
diff --git a/lisp/dnd.el b/lisp/dnd.el
index b2e93a63de..7708695346 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -325,7 +325,7 @@ dnd-remove-last-dragged-remote-file
 
 (defun dnd-begin-text-drag (text &optional frame action allow-same-frame)
   "Begin dragging TEXT from FRAME.
-Initate a drag-and-drop operation allowing the user to drag text
+Initiate a drag-and-drop operation allowing the user to drag text
 from Emacs to another program (the drop target), then block until
 the drop is completed or is canceled.
 
@@ -381,7 +381,7 @@ dnd-begin-text-drag
 
 (defun dnd-begin-file-drag (file &optional frame action allow-same-frame)
   "Begin dragging FILE from FRAME.
-Initate a drag-and-drop operation allowing the user to drag a file
+Initiate a drag-and-drop operation allowing the user to drag a file
 from Emacs to another program (the drop target), then block until
 the drop happens or is canceled.
 
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 113718fba3..0ee094c34d 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -2823,7 +2823,7 @@ comp-compute-dominator-tree
             (first-processed (l)
               (if-let ((p (cl-find-if (lambda (p) (comp-block-idom p)) l)))
                   p
-                (signal 'native-ice "cant't find first preprocessed"))))
+                (signal 'native-ice "can't find first preprocessed"))))
 
     (when-let ((blocks (comp-func-blocks comp-func))
                (entry (gethash 'entry blocks))
diff --git a/lisp/emacs-lisp/hierarchy.el b/lisp/emacs-lisp/hierarchy.el
index fb5d518b22..d955019a9d 100644
--- a/lisp/emacs-lisp/hierarchy.el
+++ b/lisp/emacs-lisp/hierarchy.el
@@ -191,7 +191,7 @@ hierarchy-add-trees
 (defun hierarchy-add-list (hierarchy list &optional wrap childrenfn)
   "Add to HIERARCHY the sub-lists in LIST.
 
-If WRAP is non-nil, allow duplicate items in LIST by wraping each
+If WRAP is non-nil, allow duplicate items in LIST by wrapping each
 item in a cons (id . item).  The root's id is 1.
 
 CHILDRENFN is a function (defaults to `cdr') taking LIST as a
diff --git a/lisp/emacs-lisp/rmc.el b/lisp/emacs-lisp/rmc.el
index dae6590b9b..1083a6868b 100644
--- a/lisp/emacs-lisp/rmc.el
+++ b/lisp/emacs-lisp/rmc.el
@@ -125,7 +125,7 @@ rmc--show-help
 ;;;###autoload
 (defun read-multiple-choice (prompt choices &optional help-string show-help
                                     long-form)
-  "Ask user to select an entry from CHOICES, promting with PROMPT.
+  "Ask user to select an entry from CHOICES, prompting with PROMPT.
 This function allows to ask the user a multiple-choice question.
 
 CHOICES should be a list of the form (KEY NAME [DESCRIPTION]).
diff --git a/lisp/emacs-lisp/tcover-ses.el b/lisp/emacs-lisp/tcover-ses.el
index 2b1672ffd6..645b1a328f 100644
--- a/lisp/emacs-lisp/tcover-ses.el
+++ b/lisp/emacs-lisp/tcover-ses.el
@@ -569,7 +569,7 @@ ses-exercise-signals
 	  (signal 'singularity-error nil)) ;Shouldn't get here
       (singularity-error (error "No error from %s?" x))
       (error nil)))
-  ;;Test quit-handling in ses-update-cells.  Cant' use `eval' here.
+  ;; Test quit-handling in ses-update-cells.  Can't use `eval' here.
   (let ((inhibit-quit t))
     (setq quit-flag t)
     (condition-case nil
diff --git a/lisp/files.el b/lisp/files.el
index a282532258..b947451369 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -7294,7 +7294,7 @@ wildcard-to-regexp
 			      (setq i (1+ i))
 			      "[]"))
 			   (t "["))
-			  (prog1	; copy everything upto next `]'.
+			  (prog1	; copy everything up to next `]'.
 			      (substring wildcard
 					 i
 					 (setq j (string-search
diff --git a/lisp/gnus/ChangeLog.3 b/lisp/gnus/ChangeLog.3
index 8087021a7c..c55d6225e3 100644
--- a/lisp/gnus/ChangeLog.3
+++ b/lisp/gnus/ChangeLog.3
@@ -4243,7 +4243,7 @@
 	* gnus-msg.el (gnus-inews-do-gcc):
 	* message.el (message-send-mail):
 	* mml.el (mml-generate-mime): Share the value of the buffer-local
-	`message-options' variable between a draft buffer and temprary working
+	`message-options' variable between a draft buffer and temporary working
 	buffers.
 
 2011-11-30  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -10876,7 +10876,7 @@
 2010-09-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* gnus-group.el (gnus-group-line-format-alist): Have the ?U (unseen)
-	spec inser "*" if the group isn't active instead of 0.
+	spec insert "*" if the group isn't active instead of 0.
 
 	* nnimap.el (nnimap-request-group): Don't select the imap buffer before
 	opening the server.
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 4963fd083f..a4962f9d5f 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -173,7 +173,7 @@ gnus-level-unsubscribed
 
 Groups with levels less than `gnus-level-subscribed', which
 should be less than this variable, are subscribed.  Groups with
-levels from `gnus-level-subscribed' (exclusive) upto this
+levels from `gnus-level-subscribed' (exclusive) up to this
 variable (inclusive) are unsubscribed.  See also
 `gnus-level-zombie', `gnus-level-killed' and the Info node `(gnus)Group
 Levels' for details.")
diff --git a/lisp/htmlfontify.el b/lisp/htmlfontify.el
index 34092b1417..df4c6ab079 100644
--- a/lisp/htmlfontify.el
+++ b/lisp/htmlfontify.el
@@ -1937,7 +1937,7 @@ hfy-href-stub
 We are not yet concerned with the file extensions/tag line number and so on at
 this point.
 
-If `hfy-split-index' is set, and the href wil be to an index file rather than
+If `hfy-split-index' is set, and the href will be to an index file rather than
 a source file, append a .X to `hfy-index-file', where X is the uppercased
 first character of TAG.
 
diff --git a/lisp/info.el b/lisp/info.el
index 02dde50dd6..8860a664bd 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -2666,7 +2666,7 @@ Info-follow-reference
 (defconst Info-menu-entry-name-re "\\(?:[^:]\\|:[^:,.;() \t\n]\\)*"
   ;; We allow newline because this is also used in Info-follow-reference,
   ;; where the xref name might be wrapped over two lines.
-  "Regexp that matches a menu entry name upto but not including the colon.
+  "Regexp that matches a menu entry name up to but not including the colon.
 Because of ambiguities, this should be concatenated with something like
 `:' and `Info-following-node-name-re'.")
 
diff --git a/lisp/man.el b/lisp/man.el
index 6c50f017e3..9dd247cc31 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -1077,13 +1077,13 @@ Man-start-calling
     ;; unless COLUMNS or MANWIDTH is set.  This isn't a problem on
     ;; a tty.  man(1) says:
     ;;        MANWIDTH
-    ;;               If $MANWIDTH is set, its value is used as the  line
-    ;;               length  for which manual pages should be formatted.
-    ;;               If it is not set, manual pages  will  be  formatted
-    ;;               with  a line length appropriate to the current ter-
-    ;;               minal (using an ioctl(2) if available, the value of
-    ;;               $COLUMNS,  or falling back to 80 characters if nei-
-    ;;               ther is available).
+    ;;               If $MANWIDTH is set, its value is used as the line
+    ;;               length for which manual pages should be formatted.
+    ;;               If it is not set, manual pages will be formatted
+    ;;               with a line length appropriate to the current
+    ;;               terminal (using an ioctl(2) if available, the value
+    ;;               of $COLUMNS, or falling back to 80 characters if
+    ;;               neither is available).
     (when (or window-system
 	      (not (or (getenv "MANWIDTH") (getenv "COLUMNS"))))
       ;; Since the page buffer is displayed beforehand,
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index c7f5586140..d6893fb9ec 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -2944,7 +2944,7 @@
 	change fixes that.
 
 	* mh-utils.el (mh-show-mode): Setup mh-show-mode to display
-	elipsis for truncated header fields and to skip over them quickly.
+	ellipsis for truncated header fields and to skip over them quickly.
 	(mh-clean-msg-header): Make another pass over the message header
 	fields truncating long headers.
 
diff --git a/lisp/mpc.el b/lisp/mpc.el
index 1775e7d5e7..f878c6ca29 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -447,7 +447,7 @@ mpc-proc-buffer
 ;;; Support for regularly updated current status information ;;;;;;;;;;;;;;;
 
 ;; Exported elements:
-;; `mpc-status' holds the uptodate data.
+;; `mpc-status' holds the up-to-date data.
 ;; `mpc-status-callbacks' holds the registered callback functions.
 ;; `mpc-status-refresh' forces a refresh of the data.
 ;; `mpc-status-stop' stops the automatic updating.
diff --git a/lisp/net/tramp-crypt.el b/lisp/net/tramp-crypt.el
index 16c4049a68..0973258157 100644
--- a/lisp/net/tramp-crypt.el
+++ b/lisp/net/tramp-crypt.el
@@ -455,7 +455,7 @@ tramp-crypt-decrypt-file-name
 (defun tramp-crypt-do-encrypt-or-decrypt-file (op root infile outfile)
   "Encrypt / decrypt file INFILE to OUTFILE according to encrypted directory ROOT.
 Both files must be local files.  OP must be `encrypt' or `decrypt'.
-If OP ist `decrypt', the basename of INFILE must be an encrypted file name.
+If OP is `decrypt', the basename of INFILE must be an encrypted file name.
 Raise an error if this fails."
   (when-let ((tramp-crypt-enabled t)
 	     (dir (tramp-crypt-file-name-p root))
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 9cbab29504..fb8d5322c0 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -195,7 +195,7 @@ nxml-cdata-section-content
 (defface nxml-char-ref-number
   '((t (:inherit nxml-ref)))
   "Face used for the number in character references.
-This includes ths `x' in hex references."
+This includes the `x' in hex references."
   :group 'nxml-faces)
 
 (defface nxml-char-ref-delimiter
diff --git a/lisp/obsolete/vi.el b/lisp/obsolete/vi.el
index 91baa4d28e..afc6284b34 100644
--- a/lisp/obsolete/vi.el
+++ b/lisp/obsolete/vi.el
@@ -927,13 +927,13 @@ vi-forward-find-char
   (vi-repeat-last-find-char count))
 
 (defun vi-backward-upto-char (count char)
-  "Find upto the COUNT'th CHAR backward on current line."
+  "Find up to the COUNT'th CHAR backward on current line."
   (interactive "p\nc")
   (setq vi-last-find-char (cons -1 (cons char t)))
   (vi-repeat-last-find-char count))
 
 (defun vi-forward-upto-char (count char)
-  "Find upto the COUNT'th CHAR forward on current line."
+  "Find up to the COUNT'th CHAR forward on current line."
   (interactive "p\nc")
   (setq vi-last-find-char (cons 1 (cons char t)))
   (vi-repeat-last-find-char count))
diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1
index bcc109583c..6cc76db8df 100644
--- a/lisp/org/ChangeLog.1
+++ b/lisp/org/ChangeLog.1
@@ -13798,7 +13798,7 @@
 2012-01-03  Dave Abrahams  <dave@boostpro.com>
 
 	* org-agenda.el (org-agenda-follow-indirect): New option.
-	(org-agenda-follow-mode): Call `org-agenda-do-context-action' fro
+	(org-agenda-follow-mode): Call `org-agenda-do-context-action' from
 	follow mode.
 	(org-agenda-do-context-action): Also do indirect follow mode
 	action.
@@ -17948,7 +17948,7 @@
 
 	* org.el (org-narrow-to-subtree): Ensure `org-back-to-heading'
 	will move point to a real heading and not an inline task by
-	wraping function into a `org-with-limited-levels' macro.
+	wrapping function into a `org-with-limited-levels' macro.
 
 2011-07-28  Bastien Guerry  <bzg@gnu.org>
 
@@ -28477,7 +28477,7 @@
 	(outline-end-of-subtree): Make `outline-end-of-subtree' use the
 	org-version of this function in Org-mode.  We use advice to
 	implement this change, so that future changes to this function in
-	outline.el wil be handled properly.
+	outline.el will be handled properly.
 	(org-forward-same-level, org-backward-same-level): New commands.
 
 2009-08-06  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -28769,7 +28769,7 @@
 	attachments.
 
 	* org-latex.el (org-export-latex-quotation-marks): Fix export of
-	quotation makrs in parenthesis.
+	quotation marks in parenthesis.
 	(org-remove-initial-hash): New function.
 	(org-export-latex-preprocess): Fix bug with infinite loop if
 	environment is not properly closed.
@@ -30559,7 +30559,7 @@
 2009-01-25  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-archive.el (org-extract-archive-heading): Allow %s for file
-	name also in achive location heading.
+	name also in archive location heading.
 
 2009-01-25  Carsten Dominik  <carsten.dominik@gmail.com>
 
diff --git a/lisp/org/ob-tangle.el b/lisp/org/ob-tangle.el
index 525d27bc07..d9814a7aa6 100644
--- a/lisp/org/ob-tangle.el
+++ b/lisp/org/ob-tangle.el
@@ -433,7 +433,7 @@ org-babel-tangle-single-block
                       ;; The created link is transient.  Using ID is
                       ;; not necessary, but could have side-effects if
                       ;; used.  An ID property may be added to
-                      ;; existing entries thus creatin unexpected file
+                      ;; existing entries thus creating unexpected file
                       ;; modifications.
                       (org-id-link-to-org-use-id nil)
                       (l (org-no-properties (org-store-link nil))))
@@ -525,7 +525,7 @@ org-babel-tangle-comment-links
 			("link" . ,(let (;; The created link is transient.  Using ID is
                                          ;; not necessary, but could have side-effects if
                                          ;; used.  An ID property may be added to
-                                         ;; existing entries thus creatin unexpected file
+                                         ;; existing entries thus creating unexpected file
                                          ;; modifications.
                                          (org-id-link-to-org-use-id nil))
                                      (org-no-properties (org-store-link nil))))
diff --git a/lisp/outline.el b/lisp/outline.el
index a646f71db8..92135f8b48 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -454,7 +454,7 @@ outline-minor-mode-cycle
 
 (defcustom outline-minor-mode-highlight nil
   "Whether to highlight headings in `outline-minor-mode' using font-lock keywords.
-This option controles whether `outline-minor-mode' will use its font-lock
+This option controls whether `outline-minor-mode' will use its font-lock
 keywords to highlight headings, which could potentially conflict with
 font-lock faces defined by the major mode.  Thus, a non-nil value will
 work well only when there's no such conflict.
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 38e9d6011d..7bfd6bdbd9 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -1456,7 +1456,7 @@ c-electric-continued-statement
 
 (defun c-align-cpp-indent-to-body ()
   "Align a \"#pragma\" line under the previous line.
-This function is intented for use as a member of `c-special-indent-hook'."
+This function is intended for use as a member of `c-special-indent-hook'."
   (when (assq 'cpp-macro c-syntactic-context)
     (when
 	(save-excursion
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 94c84a6a70..561aa0f7e5 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -2713,7 +2713,7 @@ c-decl-hangon-kwds
 Mentioning them here is necessary only if they can occur in other
 places, or if they are followed by a construct that must be skipped
 over (like the parens in the \"__attribute__\" and \"__declspec\"
-examples above).  In the last case, they alse need to be present on
+examples above).  In the last case, they also need to be present on
 one of `c-type-list-kwds', `c-ref-list-kwds',
 `c-colon-type-list-kwds', `c-paren-nontype-kwds', `c-paren-type-kwds',
 `c-<>-type-kwds', or `c-<>-arglist-kwds'."
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index fb5ef69413..5a610253e0 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1235,7 +1235,7 @@ c-pps-to-string-delim
 
 (defun c-multiline-string-check-final-quote ()
   ;; Check that the final quote in the buffer is correctly marked or not with
-  ;; a string-fence syntax-table text propery.  The return value has no
+  ;; a string-fence syntax-table text property.  The return value has no
   ;; significance.
   (let (pos-ll pos-lt)
     (save-excursion
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index 1894826fe4..36849492be 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -4282,7 +4282,7 @@ ebnf-eps-footer
   (ebnf-eps-header-footer ebnf-eps-footer))
 
 
-;; hacked fom `ps-output-string-prim' (ps-print.el)
+;; hacked from `ps-output-string-prim' (ps-print.el)
 (defun ebnf-eps-string (string)
   (let* ((str   string)
 	 (len   (length str))
@@ -4403,9 +4403,9 @@ ebnf-total
 (defvar ebnf-nprod 0)
 
 
-(defsubst ebnf-message-info (messag)
+(defsubst ebnf-message-info (msg)
   (message "%s...%3d%%"
-	   messag
+           msg
 	   (round (/ (* (setq ebnf-nprod (1+ ebnf-nprod)) 100.0) ebnf-total))))
 
 
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 6bdaa7a37a..44c8ca7cb9 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -1699,7 +1699,7 @@ eval-defun
 
 If point isn't in a top-level form, evaluate the first top-level
 form after point.  If there is no top-level form after point,
-evaluate the first preceeding top-level form.
+evaluate the first preceding top-level form.
 
 If the current defun is actually a call to `defvar' or `defcustom',
 evaluating it this way resets the variable using its initial value
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 558b62b20a..4deb06bde4 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -522,7 +522,7 @@ sh-assignment-regexp
     (rc . "\\<\\([[:alnum:]_*]+\\)[ \t]*=")
     (sh . "\\<\\([[:alnum:]_]+\\)="))
   "Regexp for the variable name and what may follow in an assignment.
-First grouping matches the variable name.  This is upto and including the `='
+First grouping matches the variable name.  This is up to and including the `='
 sign.  See `sh-feature'."
   :type '(repeat (cons (symbol :tag "Shell")
 		       (choice regexp
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index a1c0aa76de..e585799dc6 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -781,7 +781,7 @@ sql-auth-source-search-wallet
       ;; Perform search
       (dolist (s (auth-source-search :max 1000))
         (when (and
-               ;; Is PRODUCT specified, in the enty, and they are equal
+               ;; Is PRODUCT specified, in the entry, and they are equal
                (if product
                    (if (plist-member s :product)
                        (equal (plist-get s :product) product)
diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index 5786a21e88..dbe2b6241f 100644
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -390,7 +390,7 @@ scroll-bar-scroll-up
 	(setq point-before-scroll before-scroll)))))
 
 
-;;; Tookit scroll bars.
+;;; Toolkit scroll bars.
 
 (defun scroll-bar-toolkit-scroll (event)
   "Handle event EVENT on vertical scroll bar."
diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el
index f3f95627af..41a5b52f99 100644
--- a/lisp/textmodes/reftex-cite.el
+++ b/lisp/textmodes/reftex-cite.el
@@ -96,7 +96,7 @@ reftex-get-bibfile-list
   "Return list of bibfiles for current document.
 When using the chapterbib or bibunits package you should either
 use the same database files everywhere, or separate parts using
-different databases into different files (included into the mater file).
+different databases into different files (included into the master file).
 Then this function will return the applicable database files."
 
   ;; Ensure access to scanning info
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index 075ad666b3..38d6ebe7e6 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -1807,7 +1807,7 @@ reftex-index-simplify-phrase
 (defun reftex-index-phrases-find-dup-re (phrase &optional sub)
   "Return a regexp which matches variations of PHRASE (with additional space).
 When SUB ins non-nil, the regexp will also match when PHRASE is a subphrase
-of another phrase.  The regexp works lonly in the phrase buffer."
+of another phrase.  The regexp works only in the phrase buffer."
   (concat (if sub "^\\S-?\t\\([^\t\n]*" "^\\S-?\t")
           (mapconcat #'regexp-quote (split-string phrase) " +")
           (if sub "[^\t\n]*\\)\\([\t\n]\\|$\\)" " *\\([\t\n]\\|$\\)")))
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index ca0312d8fb..a1914a8cc8 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -2238,7 +2238,7 @@ tex-summarize-command
 	       "&")))
 
 (defun tex-uptodate-p (file)
-  "Return non-nil if FILE is not uptodate w.r.t the document source files.
+  "Return non-nil if FILE is not up-to-date w.r.t the document source files.
 FILE is typically the output DVI or PDF file."
   ;; We should check all the files included !!!
   (and
@@ -2375,7 +2375,7 @@ tex-compile-default
 	  (push cmd tmp)))
       ;; Only remove if there's something left.
       (if tmp (setq cmds (nreverse tmp))))
-    ;; Remove commands whose input is not uptodate either.
+    ;; Remove commands whose input is not up-to-date either.
     (let ((outs (delq nil (mapcar (lambda (x) (nth 2 x)) cmds)))
 	  (tmp nil))
       (dolist (cmd cmds)
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el
index e3c0e2ca06..a1d6152ee2 100644
--- a/lisp/vc/add-log.el
+++ b/lisp/vc/add-log.el
@@ -1188,7 +1188,7 @@ change-log-next-buffer
      ((and wrap (null file))
       (current-buffer))
      ;; When there is no next file, file-exists-p raises the error to be
-     ;; catched by the search function that displays the error message.
+     ;; caught by the search function that displays the error message.
      ((file-exists-p file)
       (find-file-noselect file))
      (t
diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el
index 0d96a195ad..f406883221 100644
--- a/lisp/vc/ediff-util.el
+++ b/lisp/vc/ediff-util.el
@@ -1748,7 +1748,7 @@ ediff-previous-difference
 		     regexp-skip
 		     ;; skip clashes, if necessary
 		     non-clash-skip
-		     ;; skipp changed regions
+                     ;; skip changed regions
 		     skip-changed
 		     ;; skip difference regions that differ in white space
 		     (and ediff-ignore-similar-regions
diff --git a/lisp/vc/vc-dav.el b/lisp/vc/vc-dav.el
index 94621599e4..1cd91c9f54 100644
--- a/lisp/vc/vc-dav.el
+++ b/lisp/vc/vc-dav.el
@@ -93,7 +93,7 @@ vc-dav-checkout
 locking is used for URL, a lock should also be set.
 
 If REV is non-nil, that is the revision to check out.  If REV is the
-empty string, that means to check ou tht ehead of the trunk.
+empty string, that means to check out the head of the trunk.
 
 If optional arg DESTFILE is given, it is an alternate filename to
 write the contents to."
diff --git a/lisp/window.el b/lisp/window.el
index d466f2975d..dd23ab1d39 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -9172,7 +9172,7 @@ fit-frame-to-buffer-sizes
 This list specifies the total maximum and minimum numbers of
 lines and the maximum and minimum numbers of columns of the body
 of the root window of any frame that shall be fit to its buffer.
-Any value specified by ths variable will be overridden by the
+Any value specified by this variable will be overridden by the
 corresponding argument of `fit-frame-to-buffer', if non-nil.
 
 On window systems where the menubar can wrap, fitting a frame to
diff --git a/msdos/autogen/config.in b/msdos/autogen/config.in
index 14782ab4bf..4b1cfb96e8 100644
--- a/msdos/autogen/config.in
+++ b/msdos/autogen/config.in
@@ -217,7 +217,7 @@ along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
    whether the gnulib module scanf shall be considered present. */
 #undef GNULIB_SCANF
 
-/* Define if ths system is compatible with GNU/Linux. */
+/* Define if this system is compatible with GNU/Linux. */
 #undef GNU_LINUX
 
 /* Define to 1 if you want to use the GNU memory allocator. */
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 15ab227171..1ec09d0a81 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -7503,7 +7503,7 @@
 2010-05-28  Kenichi Handa  <handa@m17n.org>
 
 	* font.c (font_delete_unmatched): Check Vface_ignored_fonts.
-	Don't sheck SPEC if it is nil.
+	Don't check SPEC if it is nil.
 	(font_list_entities): Call font_delete_unmatched if
 	Vface_ignored_fonts is non-nil.  (Bug#6287)
 
@@ -8639,7 +8639,7 @@
 
 	* keyboard.c: QClabel is new.
 	(parse_tool_bar_item): Take out QClabel from tool bar items.
-	Try to construct a label if ther is no QClabel.
+	Try to construct a label if there is no QClabel.
 	(syms_of_keyboard): Intern :label as QClabel.
 
 	* dispextern.h (tool_bar_item_idx): TOOL_BAR_ITEM_LABEL is new.
diff --git a/src/ChangeLog.12 b/src/ChangeLog.12
index 18618bbfb2..cb373803a0 100644
--- a/src/ChangeLog.12
+++ b/src/ChangeLog.12
@@ -73,7 +73,7 @@
 
 	* lisp.h (adjust_after_replace): Extern it.
 
-	* coding.c (detect_coding): Cound the heading ASCII bytes in the
+	* coding.c (detect_coding): Count the heading ASCII bytes in the
 	case of detection for coding_category_utf_8_auto.
 	(decode_coding_gap) [not CODING_DISABLE_ASCII_OPTIMIZATION]:
 	Skip decoding if all bytes are ASCII.
@@ -1809,7 +1809,7 @@
 
 	* nsfns.m (Fns_do_applescript): Run event loop until script has
 	been executed (Bug#12969).
-	(ns_run_ascript): Chech as_script for nil, set to nil after
+	(ns_run_ascript): Check as_script for nil, set to nil after
 	executing script.
 
 2012-12-22  Martin Rudalics  <rudalics@gmx.at>
@@ -19967,7 +19967,7 @@
 2011-05-05  Eli Zaretskii  <eliz@gnu.org>
 
 	* w32heap.c (allocate_heap) [USE_LISP_UNION_TYPE || USE_LSB_TAG]:
-	New version that can reserve upto 2GB of heap space.
+	New version that can reserve up to 2GB of heap space.
 
 2011-05-05  Chong Yidong  <cyd@stupidchicken.com>
 
diff --git a/src/ChangeLog.13 b/src/ChangeLog.13
index d832ab9112..91f8005ac5 100644
--- a/src/ChangeLog.13
+++ b/src/ChangeLog.13
@@ -7498,7 +7498,7 @@
 2014-04-16  Eli Zaretskii  <eliz@gnu.org>
 
 	* insdel.c (invalidate_buffer_caches): When deleting or replacing
-	text, invalidate the bidi_paragraph_cache upto and including the
+	text, invalidate the bidi_paragraph_cache up to and including the
 	preceding newline.
 
 2014-04-16  Paul Eggert  <eggert@cs.ucla.edu>
@@ -10868,7 +10868,7 @@
 
 	* xdisp.c (syms_of_xdisp): New vars redisplay--all-windows-cause and
 	redisplay--mode-lines-cause.
-	(redisplay_internal): Keep them uptodate.  Remove redundant check of
+	(redisplay_internal): Keep them up-to-date.  Remove redundant check of
 	buffer_shared_and_changed.
 	* *.[chm]: Number every assignment to update_mode_lines so we
 	can track why it is set.
@@ -12566,7 +12566,7 @@
 2013-09-16  Dmitry Antipov  <dmantipov@yandex.ru>
 
 	Do not copy X event in handle_one_xevent except KeyPress case.
-	Wnen XEvent is processed, it is unlikely to be changed except
+	When XEvent is processed, it is unlikely to be changed except
 	KeyPress case, so we can avoid copying and use const pointer to
 	const data to make sure that an event is not changed elsewhere.
 	* xterm.c (handle_one_xevent): Change 2nd arg to 'const XEvent *
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6
index fc7cc5e4d4..f5653efd91 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -2225,7 +2225,7 @@
 
 1996-02-08  Eli Zaretskii  <eliz@is.elta.co.il>
 
-	* fileio.c (Fmake_temp_name) [MS-DOS]: Allow upto 8 characters in
+	* fileio.c (Fmake_temp_name) [MS-DOS]: Allow up to 8 characters in
 	the prefix of the temporary file name.
 
 1996-02-07  Richard Stallman  <rms@mole.gnu.ai.mit.edu>
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index 2594ced5f6..effdf8a7ac 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -5704,7 +5704,7 @@
 	(x_scroll_bar_expose): Make no-op for toolkit scroll bars.
 	(x_scroll_bar_create): Create and show a scroll bar widget
 	if using toolkit scroll bars.
-	(x_scroll_bar_move): Handle tookit scroll bars.
+	(x_scroll_bar_move): Handle toolkit scroll bars.
 
 	* Makefile.in (LIBW): Use Xaw3d if present.
 
diff --git a/src/comp.c b/src/comp.c
index d2a2252cf2..b6072a866e 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -947,7 +947,7 @@ obj_to_reloc (Lisp_Object obj)
     }
 
   xsignal1 (Qnative_ice,
-	    build_string ("cant't find data in relocation containers"));
+	    build_string ("can't find data in relocation containers"));
   assume (false);
 
  found:
diff --git a/src/haiku_support.h b/src/haiku_support.h
index e940e69bf1..2605a75b40 100644
--- a/src/haiku_support.h
+++ b/src/haiku_support.h
@@ -383,7 +383,7 @@ #define _HAIKU_SUPPORT_H
   /* The number of characters in `wanted_chars'.  */
   int want_chars_len;
 
-  /* List of characters.  The font must fullfill at least one of
+  /* List of characters.  The font must fulfill at least one of
      them for the match to succeed.  */
   int *need_one_of;
 
diff --git a/src/w32inevt.c b/src/w32inevt.c
index 6a1d9afacf..d13b0521c9 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -648,7 +648,7 @@ handle_file_notifications (struct input_event *hold_quit)
       ns = NULL;
 
       /* Find out if there is a record available in the linked list of
-	 notifications sets.  If so, unlink te set from the linked list.
+	 notifications sets.  If so, unlink the set from the linked list.
 	 Use the critical section.  */
       enter_crit ();
       if (notifications_set_head->next != notifications_set_head)
diff --git a/src/xterm.c b/src/xterm.c
index deedc595cb..20bccc165f 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -14490,7 +14490,7 @@ XTmouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
 		    break;
 		  }
 #ifdef USE_GTK
-		/* We don't wan't to know the innermost window.  We
+		/* We don't want to know the innermost window.  We
 		   want the edit window.  For non-Gtk+ the innermost
 		   window is the edit window.  For Gtk+ it might not
 		   be.  It might be the tool bar for example.  */
@@ -14521,7 +14521,7 @@ XTmouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
 	       never use them in that case.)  */
 
 #ifdef USE_GTK
-	    /* We don't wan't to know the innermost window.  We
+	    /* We don't want to know the innermost window.  We
 	       want the edit window.  */
 	    f1 = x_window_to_frame (dpyinfo, win);
 #else
diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el
index a5100ec155..ff5d802697 100644
--- a/test/lisp/erc/erc-tests.el
+++ b/test/lisp/erc/erc-tests.el
@@ -1010,7 +1010,7 @@ erc-select-read-args
                          :nick "nick"
                          :password nil))))
 
-  (ert-info ("Addresss includes nick and password")
+  (ert-info ("Address includes nick and password")
     (should (equal (ert-simulate-keys "nick:sesame@localhost:6667\r"
                      (erc-select-read-args))
                    (list :server "localhost"
diff --git a/test/lisp/gnus/gnus-icalendar-tests.el b/test/lisp/gnus/gnus-icalendar-tests.el
index 348ddf9f05..1b69267bee 100644
--- a/test/lisp/gnus/gnus-icalendar-tests.el
+++ b/test/lisp/gnus/gnus-icalendar-tests.el
@@ -75,7 +75,7 @@ gnus-icalendar-parse
 X-MICROSOFT-CDO-OWNERAPPTID:-362490173
 RECURRENCE-ID;TZID=America/New_York:20201208T091500
 CREATED:20200309T134939Z
-DESCRIPTION:In this meeting\\, we will cover topics from product and enginee
+DESCRIPTION:In this meeting\\, we will cover topics from product and engine
  ring presentations and demos to new hire announcements to watching the late
 LAST-MODIFIED:20200728T182852Z
 LOCATION:New York-22-Town Hall Space (250) [Chrome Box]
diff --git a/test/lisp/net/mailcap-tests.el b/test/lisp/net/mailcap-tests.el
index 9e60a243b3..04462dbc8b 100644
--- a/test/lisp/net/mailcap-tests.el
+++ b/test/lisp/net/mailcap-tests.el
@@ -125,7 +125,7 @@ mailcap--test-viewer
 
 (ert-deftest mailcap-view-file ()
   (with-pristine-mailcap
-   ;; Try using a lambda as viewer and check wether
+   ;; Try using a lambda as viewer and check whether
    ;; `mailcap-view-file' works correctly.
    (let* ((mailcap-mime-extensions '((".test" . "test/test"))))
      (mailcap-add "test/test" 'mailcap--test-viewer)
diff --git a/test/manual/noverlay/overlay-perf.el b/test/manual/noverlay/overlay-perf.el
index e84941c08f..4d79254a53 100644
--- a/test/manual/noverlay/overlay-perf.el
+++ b/test/manual/noverlay/overlay-perf.el
@@ -157,7 +157,7 @@ perf-batch-parse-command-line
       (cond ((string-match-p "\\`-[cn]\\'" (car args))
              (unless (and (cdr args)
                           (string-match-p "\\`[0-9]+\\'" (cadr args)))
-               (error "%s expectes a natnum argument" (car args)))
+               (error "%s expects a natnum argument" (car args)))
              (if (equal (car args) "-c")
                  (setq k (string-to-number (cadr args)))
                (setq n (string-to-number (cadr args))))
diff --git a/test/src/font-tests.el b/test/src/font-tests.el
index 7e9669c651..683d331d75 100644
--- a/test/src/font-tests.el
+++ b/test/src/font-tests.el
@@ -115,7 +115,7 @@ font-parse-tests
 (defun test-font-parse ()
   "Test font name parsing."
   (interactive)
-  (switch-to-buffer (generate-new-buffer "*Font Pase Test*"))
+  (switch-to-buffer (generate-new-buffer "*Font Parse Test*"))
   (setq show-trailing-whitespace nil)
   (let ((pass-face '((t :foreground "green")))
 	(fail-face '((t :foreground "red"))))
diff --git a/test/src/thread-tests.el b/test/src/thread-tests.el
index 75d67140a9..731fa893c1 100644
--- a/test/src/thread-tests.el
+++ b/test/src/thread-tests.el
@@ -217,7 +217,7 @@ threads-mutex-signal
        (while (not threads-mutex-key)
 	 (thread-yield))
        (thread-signal thr 'quit nil)
-       ;; `quit' is not catched by `should-error'.  We must indicate it.
+       ;; `quit' is not caught by `should-error'.  We must indicate it.
        (condition-case nil
            (thread-join thr)
          (quit (signal 'error nil)))))))

commit c116d9f74c8fc81a7e98b1519fa300998a8a15c3
Author: Juanma Barranquero <lekktu@gmail.com>
Date:   Fri Nov 18 13:57:00 2022 +0100

    Avoid `user-init-file' being set to an eln file (bug#59334)
    
    * lisp/startup.el (startup--load-user-init-file): If possible,
    point `user-init-file' to the source file if the init file was
    native-compiled.

diff --git a/lisp/startup.el b/lisp/startup.el
index 70267fc857..d7d8743336 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1063,19 +1063,27 @@ startup--load-user-init-file
 
             ;; If we loaded a compiled file, set `user-init-file' to
             ;; the source version if that exists.
-            (when (equal (file-name-extension user-init-file)
-                         "elc")
-              (let* ((source (file-name-sans-extension user-init-file))
-                     (alt (concat source ".el")))
-                (setq source (cond ((file-exists-p alt) alt)
-                                   ((file-exists-p source) source)
-                                   (t nil)))
-                (when source
-                  (when (file-newer-than-file-p source user-init-file)
-                    (message "Warning: %s is newer than %s"
-                             source user-init-file)
-                    (sit-for 1))
-                  (setq user-init-file source))))
+            (if (equal (file-name-extension user-init-file) "elc")
+                (let* ((source (file-name-sans-extension user-init-file))
+                       (alt (concat source ".el")))
+                  (setq source (cond ((file-exists-p alt) alt)
+                                     ((file-exists-p source) source)
+                                     (t nil)))
+                  (when source
+                    (when (file-newer-than-file-p source user-init-file)
+                      (message "Warning: %s is newer than %s"
+                               source user-init-file)
+                      (sit-for 1))
+                    (setq user-init-file source)))
+              ;; Else, perhaps the user init file was compiled
+              (when (equal (file-name-extension user-init-file) "eln")
+                (if-let (source (gethash (file-name-nondirectory user-init-file)
+                                         comp-eln-to-el-h))
+                    ;; source exists or the .eln file would not load
+                    (setq user-init-file source)
+                  (message "Warning: unknown source file for init file %S"
+                           user-init-file)
+                  (sit-for 1))))
 
             (when (and load-defaults
                        (not inhibit-default-init))

commit f7ee6609ae3b9cbafd48c89bad160b4e17f5b386
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Fri Nov 18 13:06:55 2022 +0100

    ; Fix typos (prefer US spelling)

diff --git a/ChangeLog.3 b/ChangeLog.3
index b76431fbbd..a78f53f377 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -5557,7 +5557,7 @@
 	Fix ert errors when there's a test that binds `debug-on-error'
 
 	* lisp/emacs-lisp/ert.el (ert--run-test-internal): Don't infloop
-	on errors when signalling errors (bug#51131).
+	on errors when signaling errors (bug#51131).
 
 2021-10-10  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -41213,7 +41213,7 @@
 
 2021-02-02  Lars Ingebrigtsen  <larsi@gnus.org>
 
-	Fix up invalid_syntax error signalling
+	Fix up invalid_syntax error signaling
 
 	* src/lread.c (invalid_syntax_lisp): Instead of putting the
 	line/column in a string, signal an error containing the numbers as
@@ -63478,7 +63478,7 @@
 	user-error when there's a wrong password (bug#43704).
 	(epa--wrong-password-p): New function.
 	(epa-file-insert-file-contents): Use it, and stash the error away
-	for later signalling.
+	for later signaling.
 
 	* lisp/emacs-lisp/subr-x.el (if-let): Autoload.
 
@@ -73089,7 +73089,7 @@
 	* lisp/textmodes/tex-mode.el (tex-font-lock-keywords-2): End the
 	expression before the terminating $ in constructions like $\it
 	identifiername$
-	(bug#28277). This avoids italicising the final $ character.
+	(bug#28277). This avoids italicizing the final $ character.
 
 	This fixes the final $ of the final test case here:
 
@@ -73421,7 +73421,7 @@
 
 2020-08-08  Lars Ingebrigtsen  <larsi@gnus.org>
 
-	Modernise a code example in os.texi
+	Modernize a code example in os.texi
 
 	* doc/lispref/os.texi (Session Management): Use
 	with-current-buffer in the example instead of save+switch (bug#40341).
@@ -75687,7 +75687,7 @@
 
 	* lisp/net/eww.el (eww-list-bookmarks): Don't show buffer if there
 	are no bookmarks.  (Bug#41385)
-	(eww-bookmark-prepare): Move signalling an error if there are no
+	(eww-bookmark-prepare): Move signaling an error if there are no
 	bookmarks from here...
 	(eww-read-bookmarks): ...to here.  Add new argument `error-out' to
 	control this.
@@ -101483,7 +101483,7 @@
 	(Create_Pixmap_From_Bitmap_Data):
 	(xpm_load): Use new function.
 	* src/xterm.c (x_composite_image): Use PictOpOver when there is a mask
-	so the transparency is honoured.
+	so the transparency is honored.
 	(x_draw_image_foreground_1): Use x_composite_image.
 
 2019-11-29  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -113664,7 +113664,7 @@
 	Make the NSM not pop up an X dialogue on non-mouse actions
 
 	* lisp/emacs-lisp/rmc.el (read-multiple-choice): Don't pop up X
-	dialogues on (url-retrieve "https://expired.badssl.com/" #'ignore)
+	dialogs on (url-retrieve "https://expired.badssl.com/" #'ignore)
 	and the like.
 
 2019-09-04  Lars Ingebrigtsen  <larsi@gnus.org>
@@ -115157,7 +115157,7 @@
 
 2019-08-21  Lars Ingebrigtsen  <larsi@gnus.org>
 
-	Make hide-ifdef-mode-prefix-key customisable
+	Make hide-ifdef-mode-prefix-key customizable
 
 	* lisp/progmodes/hideif.el (hide-ifdef-mode-prefix-key): Make into
 	a defcustom since it seems like this is something that should be
@@ -130710,7 +130710,7 @@
 	Fix diff-mode face problem when used in terminals (Bug#35695)
 
 	In a terminal supporting 256 colors, both diff-added and diff-removed
-	was mapped to the same greyish color.
+	was mapped to the same grayish color.
 
 	* lisp/vc/diff-mode.el: Modify the colors of diff-removed,
 	  diff-added, diff-refine-removed, and diff-refine-added when
@@ -158744,7 +158744,7 @@
 
 2018-04-17  Basil L. Contovounesios  <contovob@tcd.ie>
 
-	Modernise face specs and set version tags in eww/shr
+	Modernize face specs and set version tags in eww/shr
 
 	* lisp/net/shr.el (shr-strike-through, shr-link, shr-selected-link):
 	Set :version tag (bug#31200).
@@ -159218,10 +159218,10 @@
 
 2018-04-14  Lars Ingebrigtsen  <larsi@gnus.org>
 
-	Modernise a Gnus function a bit
+	Modernize a Gnus function a bit
 
 	* lisp/gnus/gnus-start.el (gnus-update-active-hashtb-from-killed):
-	Modernise code a bit.
+	Modernize code a bit.
 
 2018-04-14  Lars Ingebrigtsen  <larsi@gnus.org>
 
@@ -166738,7 +166738,7 @@
 	5a7d009 * lisp/vc/smerge-mode.el (smerge-refine): Replace obsolete al...
 	e019c35 FOR_EACH_FRAME no longer assumes frame-list
 	d64b88d * src/font.c (Ffont_info): Doc fix.  (Bug#29682)
-	92b2604 Modernise message.el face spec syntax
+	92b2604 Modernize message.el face spec syntax
 	b1efbe6 Update message.el obsolete face aliases
 	2494c14 ; * lisp/comint.el (comint-terminfo-terminal): Add a :version...
 	12ad276 Improve documentation of TERM environment variable
@@ -167034,7 +167034,7 @@
 	5a7d0095a4 * lisp/vc/smerge-mode.el (smerge-refine): Replace obsolete...
 	e019c35df6 FOR_EACH_FRAME no longer assumes frame-list
 	d64b88da2f * src/font.c (Ffont_info): Doc fix.  (Bug#29682)
-	92b2604a7f Modernise message.el face spec syntax
+	92b2604a7f Modernize message.el face spec syntax
 	b1efbe6564 Update message.el obsolete face aliases
 	2494c14e76 ; * lisp/comint.el (comint-terminfo-terminal): Add a :vers...
 	12ad276d15 Improve documentation of TERM environment variable
@@ -181827,7 +181827,7 @@
 
 2017-12-15  Basil L. Contovounesios  <contovob@tcd.ie>
 
-	Modernise message.el face spec syntax
+	Modernize message.el face spec syntax
 
 	* lisp/gnus/message.el (message-header-to, message-header-cc)
 	(message-header-subject, message-header-newsgroups)
diff --git a/doc/lispref/errors.texi b/doc/lispref/errors.texi
index 44a62dcebc..cb05290abd 100644
--- a/doc/lispref/errors.texi
+++ b/doc/lispref/errors.texi
@@ -242,7 +242,7 @@ Standard Errors
 
 @item inhibited-interaction
 The message is @samp{User interaction while inhibited}.  This error is
-signalled when @code{inhibit-interaction} is non-@code{nil} and a user
+signaled when @code{inhibit-interaction} is non-@code{nil} and a user
 interaction function (like @code{read-from-minibuffer}) is called.
 @end table
 
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 7ffde7d43d..9d5a266191 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -734,7 +734,7 @@ Defining Functions
     @result{} (b c)
 @end example
 
-If there's a loop in the definitions, an error will be signalled.  If
+If there's a loop in the definitions, an error will be signaled.  If
 @var{noerror} is non-@code{nil}, the non-looping parts of the chain is
 returned instead.
 @end defun
diff --git a/doc/lispref/minibuf.texi b/doc/lispref/minibuf.texi
index 089ae41f32..332a453619 100644
--- a/doc/lispref/minibuf.texi
+++ b/doc/lispref/minibuf.texi
@@ -2745,7 +2745,7 @@ Inhibiting Interaction
 If @code{my-client-handling-function} ends up calling something that
 asks the user for something (via @code{y-or-n-p} or
 @code{read-from-minibuffer} or the like), an
-@code{inhibited-interaction} error is signalled instead.  The server
+@code{inhibited-interaction} error is signaled instead.  The server
 code then catches that error and reports it to the client.
 
 @node Minibuffer Misc
diff --git a/doc/misc/modus-themes.org b/doc/misc/modus-themes.org
index 56ba5fd348..db92dfb481 100644
--- a/doc/misc/modus-themes.org
+++ b/doc/misc/modus-themes.org
@@ -3649,7 +3649,7 @@ specification of that variable looks like this:
 
 With the exception of ~org-verbatim~ and ~org-code~ faces, everything else
 uses the corresponding type of emphasis: a bold typographic weight, or
-italicised, underlined, and struck through text.
+italicized, underlined, and struck through text.
 
 The best way for users to add some extra attributes, such as a
 foreground color, is to define their own faces and assign them to the
diff --git a/doc/misc/ses.texi b/doc/misc/ses.texi
index 6d0415cdbb..e3ef11ebc0 100644
--- a/doc/misc/ses.texi
+++ b/doc/misc/ses.texi
@@ -750,13 +750,13 @@ Customizing @acronym{SES}
 it changes the entered cell name to that where to jump. The default
 setting @code{upcase} allows you to enter the cell name in low
 case. Another use of @code{ses-jump-cell-name-function} could be some
-internationalisation to convert non latin characters into latin
+internationalization to convert non latin characters into latin
 equivalents to name the cell. Instead of a cell name, the function may
 return cell coordinates in the form of a cons, for instance @code{(0
 . 0)} for cell @code{A1}, @code{(1 . 0)} for cell @code{A2}, etc.
 
 @vindex ses-jump-prefix-function
-@code{ses-jump-prefix-function} is a customisable variable by default
+@code{ses-jump-prefix-function} is a customizable variable by default
 set to the @code{ses-jump-prefix} function. This function is called
 when you give a prefix argument to the @command{ses-jump} command
 (@kbd{j}). It returns a cell name or cell coordinates corresponding to
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 99a268367b..19f82b2447 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -4225,7 +4225,7 @@ Remote processes
 @value{tramp}'s implementation of @code{make-process} and
 @code{start-file-process} requires a serious overhead for
 initialization, every process invocation.  This is needed for handling
-interactive dialogues when connecting the remote host (like providing
+interactive dialogs when connecting the remote host (like providing
 a password), and initial environment setup.
 
 Sometimes, this is not needed.  Instead of starting a remote shell and
diff --git a/etc/NEWS.28 b/etc/NEWS.28
index 8eab05a763..9982296aaa 100644
--- a/etc/NEWS.28
+++ b/etc/NEWS.28
@@ -2771,7 +2771,7 @@ If non-nil, it is a regexp that should match a valid cover image.
 *** 'shell-script-mode' now supports 'outline-minor-mode'.
 The outline headings have lines that start with "###".
 
-*** fileloop will now skip missing files instead of signalling an error.
+*** fileloop will now skip missing files instead of signaling an error.
 
 *** 'tabulated-list-mode' can now restore original display order.
 Many commands (like 'C-x C-b') are derived from 'tabulated-list-mode',
diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el
index a95967bef4..5735126bf5 100644
--- a/lisp/calc/calc-graph.el
+++ b/lisp/calc/calc-graph.el
@@ -1414,7 +1414,7 @@ calc-gnuplot-check-for-errors
 
 (defun calc-gnuplot-command (&rest args)
   "Send ARGS to Gnuplot.
-Returns nil if Gnuplot signalled an error."
+Returns nil if Gnuplot signaled an error."
   (calc-graph-init)
   (let ((cmd (concat (mapconcat 'identity args " ") "\n")))
     (or (calc-graph-w32-p)
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index 047b0069bb..c25ade22d6 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -208,7 +208,7 @@ ert-deftest
 it has to be wrapped in `(eval (quote ...))'.
 
 If NAME is already defined as a test and Emacs is running
-in batch mode, an error is signalled.
+in batch mode, an error is signaled.
 
 \(fn NAME () [DOCSTRING] [:expected-result RESULT-TYPE] \
 [:tags \\='(TAG...)] BODY...)"
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index f9786febf4..2f19573e3c 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -4536,8 +4536,8 @@ package-maintainers
   "Return an email address for the maintainers of PKG-DESC.
 The email address may contain commas, if there are multiple
 maintainers.  If no maintainers are found, an error will be
-signalled.  If the optional argument NO-ERROR is non-nil no error
-will be signalled in that case."
+signaled.  If the optional argument NO-ERROR is non-nil no error
+will be signaled in that case."
   (unless pkg-desc
     (error "Invalid package description"))
   (let* ((extras (package-desc-extras pkg-desc))
diff --git a/lisp/gnus/gnus-search.el b/lisp/gnus/gnus-search.el
index b8f7e7a08f..7941496be6 100644
--- a/lisp/gnus/gnus-search.el
+++ b/lisp/gnus/gnus-search.el
@@ -1943,7 +1943,7 @@ gnus-search-indexed-search-command
 	(thread (alist-get 'thread query)))
     (with-slots (switches config-directory) engine
       `("find" 			; command must come first
-	"--nocolor"		; mu will always give coloured output otherwise
+	"--nocolor"		; mu will always give colored output otherwise
 	,(format "--muhome=%s" config-directory)
 	,@switches
 	,(if thread "-r" "")
diff --git a/lisp/leim/quail/indian.el b/lisp/leim/quail/indian.el
index deef00b4c2..8fe81a2217 100644
--- a/lisp/leim/quail/indian.el
+++ b/lisp/leim/quail/indian.el
@@ -373,7 +373,7 @@ quail-tamil-itrans-various-signs-table
 
 ;; Define the input method straight away.
 (quail-define-package "tamil-phonetic" "Tamil" "ழ" t
- "Customisable Tamil phonetic input method.
+ "Customizable Tamil phonetic input method.
 To change the translation rules of the input method, customize
 `tamil-translation-rules'.
 
diff --git a/lisp/mail/ietf-drums-date.el b/lisp/mail/ietf-drums-date.el
index ddef7f11b6..034854dce5 100644
--- a/lisp/mail/ietf-drums-date.el
+++ b/lisp/mail/ietf-drums-date.el
@@ -126,7 +126,7 @@ ietf-drums-date--tokenize-string
 (defun ietf-drums-parse-date-string (time-string &optional error no-822)
   "Parse an RFC5322 or RFC822 date, passed as TIME-STRING.
 The optional ERROR parameter causes syntax errors to be flagged
-by signalling an instance of the date-parse-error condition.  The
+by signaling an instance of the date-parse-error condition.  The
 optional NO-822 parameter disables the more lax RFC822 syntax,
 which is permitted by default.
 
@@ -162,7 +162,7 @@ ietf-drums-parse-date-string
         (time (list nil nil nil nil nil nil nil -1 nil)))
     (cl-labels ((set-matched-slot (slot index token)
                   ;; Assign a slot value from match data if index is
-                  ;; non-nil, else from token, signalling an error if
+                  ;; non-nil, else from token, signaling an error if
                   ;; enabled and it's out of range.
                   (let ((value (if index
                                    (cl-parse-integer (match-string index token))
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 8813ec4686..7e6dd43175 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -12626,7 +12626,7 @@ c-laomib-put-cache
 
 (defun c-laomib-fix-elt (lwm elt paren-state)
   ;; Correct a c-laomib-cache entry ELT with respect to buffer changes, either
-  ;; doing nothing, signalling it is to be deleted, or replacing its start
+  ;; doing nothing, signaling it is to be deleted, or replacing its start
   ;; point with one lower in the buffer than LWM.  PAREN-STATE is the paren
   ;; state at LWM.  Return the corrected entry, or nil (if it needs deleting).
   ;; Note that corrections are made by `setcar'ing the original structure,
diff --git a/lisp/so-long.el b/lisp/so-long.el
index 75201fefca..661f5ee57a 100644
--- a/lisp/so-long.el
+++ b/lisp/so-long.el
@@ -839,7 +839,7 @@ so-long-minor-modes
     )
   ;; It's not clear to me whether all of these would be problematic, but they
   ;; seemed like reasonable targets.  Some are certainly excessive in smaller
-  ;; buffers of minified code, but we should be aiming to maximise performance
+  ;; buffers of minified code, but we should be aiming to maximize performance
   ;; by default, so that Emacs is as responsive as we can manage in even very
   ;; large buffers of minified code.
   "List of buffer-local minor modes to explicitly disable.
@@ -880,7 +880,7 @@ so-long-variable-overrides
 to their original states.
 
 The combination of `line-move-visual' (enabled) and `truncate-lines' (disabled)
-is important for maximising responsiveness when moving vertically within an
+is important for maximizing responsiveness when moving vertically within an
 extremely long line, as otherwise the full length of the line may need to be
 scanned to find the next position.
 
diff --git a/lisp/subr.el b/lisp/subr.el
index adaa0a9135..a42b61d9b6 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -6911,7 +6911,7 @@ function-alias-p
 If FUNC is a function alias, return the function alias chain.
 
 If the function alias chain contains loops, an error will be
-signalled.  If NOERROR, the non-loop parts of the chain is returned."
+signaled.  If NOERROR, the non-loop parts of the chain is returned."
   (declare (side-effect-free t))
   (let ((chain nil)
         (orig-func func))
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index a9591c9d82..357ce001b3 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -306,7 +306,7 @@ diff-minor-mode-map
 ;; terminal supporting 24 bit colors) doesn't render well in terminal
 ;; supporting only 256 colors.  Concretely, both #ffeeee
 ;; (diff-removed) and #eeffee (diff-added) are mapped to the same
-;; greyish color.  "min-colors 257" ensures that those colors are not
+;; grayish color.  "min-colors 257" ensures that those colors are not
 ;; used terminals supporting only 256 colors.  However, any number
 ;; between 257 and 2^24 (16777216) would do.
 
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index 058ab99f5c..b3465e757a 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -818,7 +818,7 @@ x-dnd-mwheel-scroll
               (let ((inhibit-message t))
                 (funcall function amt))
             ;; Do not error at buffer limits.  Show a message instead.
-            ;; This is especially important here because signalling an
+            ;; This is especially important here because signaling an
             ;; error will mess up the drag-and-drop operation.
             (beginning-of-buffer
              (message (error-message-string '(beginning-of-buffer))))
@@ -1468,7 +1468,7 @@ x-dnd-handle-direct-save
                           (dnd-get-local-file-name local-file-uri))))
     (if (not local-name)
         '(STRING . "F")
-      ;; We want errors to be signalled immediately during ERT
+      ;; We want errors to be signaled immediately during ERT
       ;; testing, instead of being silently handled.  (bug#56712)
       (if x-dnd-xds-testing
           (prog1 '(STRING . "S")
diff --git a/src/eval.c b/src/eval.c
index 78e606267f..7327d681f9 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1329,7 +1329,7 @@ or (:success BODY...), where the BODY is made of Lisp expressions.
 expression.
 
 The special handler (:success BODY...) is invoked if BODYFORM terminated
-without signalling an error.  BODY is then evaluated with VAR bound to
+without signaling an error.  BODY is then evaluated with VAR bound to
 the value returned by BODYFORM.
 
 See also the function `signal' for more info.
@@ -1809,7 +1809,7 @@ signal_or_quit (Lisp_Object error_symbol, Lisp_Object data, bool keyboard_quit)
       unbind_to (count, Qnil);
     }
 
-  /* If an error is signalled during a Lisp hook in redisplay, write a
+  /* If an error is signaled during a Lisp hook in redisplay, write a
      backtrace into the buffer *Redisplay-trace*.  */
   if (!debugger_called && !NILP (error_symbol)
       && backtrace_on_redisplay_error
diff --git a/src/frame.c b/src/frame.c
index bfdd03e501..f63a19e7dc 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -5953,7 +5953,7 @@ DEFUN ("reconsider-frame-fonts", Freconsider_frame_fonts,
        Sreconsider_frame_fonts, 1, 1, 0,
        doc: /* Recreate FRAME's default font using updated font parameters.
 Signal an error if FRAME is not a window system frame.  This should be
-called after a `config-changed' event is received, signalling that the
+called after a `config-changed' event is received, signaling that the
 parameters (such as pixel density) used by the system to open fonts
 have changed.  */)
   (Lisp_Object frame)
diff --git a/src/haikuselect.c b/src/haikuselect.c
index bd004f4900..e8d3b5f0f7 100644
--- a/src/haikuselect.c
+++ b/src/haikuselect.c
@@ -1260,7 +1260,7 @@ syms_of_haikuselect (void)
 {
   DEFVAR_BOOL ("haiku-signal-invalid-refs", haiku_signal_invalid_refs,
     doc: /* If nil, silently ignore invalid file names in system messages.
-Otherwise, an error will be signalled if adding a file reference to a
+Otherwise, an error will be signaled if adding a file reference to a
 system message failed.  */);
   haiku_signal_invalid_refs = true;
 
diff --git a/test/lisp/emacs-lisp/syntax-tests.el b/test/lisp/emacs-lisp/syntax-tests.el
index f266db5c70..d8fc5c4fa8 100644
--- a/test/lisp/emacs-lisp/syntax-tests.el
+++ b/test/lisp/emacs-lisp/syntax-tests.el
@@ -56,7 +56,7 @@ syntax-propertize--shift-groups-and-backrefs
      "\\(?2:[abc]+\\)foo\\(\\2\\)" 2)
     "\\(?4:[abc]+\\)foo\\(\\4\\)"))
   ;; Emacs supports only the back-references \1,...,\9, so when a
-  ;; shift would result in \10 or more, an error must be signalled.
+  ;; shift would result in \10 or more, an error must be signaled.
   (should-error
    (syntax-propertize--shift-groups-and-backrefs "\\(a\\)\\3" 7)))
 
diff --git a/test/lisp/net/dbus-tests.el b/test/lisp/net/dbus-tests.el
index 7631842918..558799286f 100644
--- a/test/lisp/net/dbus-tests.el
+++ b/test/lisp/net/dbus-tests.el
@@ -1093,7 +1093,7 @@ dbus-test06-register-property-several-paths
     (dbus-unregister-service :session dbus--test-service)))
 
 (ert-deftest dbus-test06-register-property-emits-signal ()
-  "Check property registration for an own service, including signalling."
+  "Check property registration for an own service, including signaling."
   (skip-unless dbus--test-enabled-session-bus)
   (dbus-ignore-errors (dbus-unregister-service :session dbus--test-service))
 
@@ -1136,7 +1136,7 @@ dbus-test06-register-property-emits-signal
            dbus--test-interface property)
           "foo"))
 
-        ;; Set property.  The new value shall be signalled.
+        ;; Set property.  The new value shall be signaled.
         (setq dbus--test-signal-received nil)
         (should
          (equal

commit eeab7b5cada942d973ce3c565069add6b7880261
Author: Mattias Engdegård <mattiase@acm.org>
Date:   Fri Nov 18 12:09:46 2022 +0100

    Fix simple-tests when run noninteractively
    
    * test/lisp/simple-tests.el
    (simple-execute-extended-command--describe-binding-msg):
    Bind text-quoting-style explicitly to ensure consistent behaviour
    whether or not the test is run interactively.

diff --git a/test/lisp/simple-tests.el b/test/lisp/simple-tests.el
index d067f3e586..6e48f11fc0 100644
--- a/test/lisp/simple-tests.el
+++ b/test/lisp/simple-tests.el
@@ -85,15 +85,16 @@ simple-execute-extended-command--shorter
                  "di-n")))
 
 (ert-deftest simple-execute-extended-command--describe-binding-msg ()
-  (should (equal (execute-extended-command--describe-binding-msg
-                  'foo "m" nil)
-                 "You can run the command ‘foo’ with m"))
-  (should (equal (execute-extended-command--describe-binding-msg
-                  'foo [14] nil)
-                 "You can run the command ‘foo’ with C-n"))
-  (should (equal (execute-extended-command--describe-binding-msg
-                  'display-line-numbers-mode nil "di-n")
-                 "You can run the command ‘display-line-numbers-mode’ with M-x di-n")))
+  (let ((text-quoting-style 'grave))
+    (should (equal (execute-extended-command--describe-binding-msg
+                    'foo "m" nil)
+                   "You can run the command `foo' with m"))
+    (should (equal (execute-extended-command--describe-binding-msg
+                    'foo [14] nil)
+                   "You can run the command `foo' with C-n"))
+    (should (equal (execute-extended-command--describe-binding-msg
+                    'display-line-numbers-mode nil "di-n")
+                   "You can run the command `display-line-numbers-mode' with M-x di-n"))))
 
 
 ;;; `transpose-sexps'

commit 7571768c6c37d6202f65f18dff33f485a04729fb
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Fri Nov 18 11:59:07 2022 +0100

    Avoid raw control characters in grm-wy-boot.el
    
    * lisp/cedet/semantic/grm-wy-boot.el
    (semantic-grammar-wy--parse-table): Don't use raw control characters.

diff --git a/lisp/cedet/semantic/grm-wy-boot.el b/lisp/cedet/semantic/grm-wy-boot.el
index 376fab89c2..7fff36a3d0 100644
--- a/lisp/cedet/semantic/grm-wy-boot.el
+++ b/lisp/cedet/semantic/grm-wy-boot.el
@@ -396,12 +396,12 @@ semantic-grammar-wy--parse-table
 	      (let
 		  ((s $1))
 	        (if
-		    (string-match "^{[
\n	 ]*" s)
+                    (string-match "^{[\^M\n	 ]*" s)
 		    (setq s
 			  (substring s
 				     (match-end 0))))
 	        (if
-		    (string-match "[
\n	 ]*}$" s)
+                    (string-match "[\^M\n	 ]*}$" s)
 		    (setq s
 			  (substring s 0
 				     (match-beginning 0))))

commit 9711c8c2b4f051ff33b0493f6cc6551c8621dfc9
Author: Juri Linkov <juri@linkov.net>
Date:   Fri Nov 18 09:19:23 2022 +0200

    * lisp/repeat.el (describe-repeat-maps): More outlines and page separators.

diff --git a/lisp/repeat.el b/lisp/repeat.el
index 6b2977205f..33e8d98ce3 100644
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -582,13 +582,15 @@ describe-repeat-maps
                          (push s (alist-get (get s 'repeat-map) keymaps)))))
       (with-help-window (help-buffer)
         (with-current-buffer standard-output
-          (insert "A list of keymaps used by commands with the symbol property `repeat-map'.\n\n")
+          (insert "A list of keymaps used by commands with the symbol property `repeat-map'.\n")
 
           (dolist (keymap (sort keymaps (lambda (a b)
                                           (when (and (symbolp (car a))
                                                      (symbolp (car b)))
-                                            (string-lessp (car a) (car b))))))
-            (insert (format-message "* `%s'\n" (car keymap)))
+                                            (string< (car a) (car b))))))
+            (insert (format-message "\f\n* `%s'\n" (car keymap)))
+            (when (symbolp (car keymap))
+              (insert (substitute-command-keys (format-message "\\{%s}" (car keymap)))))
 
             (let* ((map (if (symbolp (car keymap))
                             (symbol-value (car keymap))
@@ -603,33 +605,34 @@ describe-repeat-maps
               (setq commands-exit  (seq-difference map-commands repeat-commands))
 
               (when (or commands-enter commands-exit)
-                (insert "\n")
                 (when commands-enter
+                  (insert "\n** Entered with:\n\n")
                   (fill-region-as-paragraph
                    (point)
                    (progn
-                     (insert (concat "Entered with: "
-                                     (mapconcat (lambda (cmd)
-                                                  (format-message "`%s'" cmd))
-                                                (sort commands-enter #'string<)
-                                                ", ")
-                                     "\n"))
-                     (point))))
+                     (insert (mapconcat (lambda (cmd)
+                                          (format-message "`%s'" cmd))
+                                        (sort commands-enter #'string<)
+                                        ", "))
+                     (point)))
+                  (insert "\n"))
                 (when commands-exit
+                  (insert "\n** Exited with:\n\n")
                   (fill-region-as-paragraph
                    (point)
                    (progn
-                     (insert (concat "Exited with: "
-                                     (mapconcat (lambda (cmd)
-                                                  (format-message "`%s'" cmd))
-                                                (sort commands-exit #'string<)
-                                                ", ")
-                                     "\n"))
-                     (point))))))
-
-            (when (symbolp (car keymap))
-              (insert (substitute-command-keys (format-message "\\{%s}" (car keymap)))))
-            (insert "\n")))))))
+                     (insert (mapconcat (lambda (cmd)
+                                          (format-message "`%s'" cmd))
+                                        (sort commands-exit #'string<)
+                                        ", "))
+                     (point)))
+                  (insert "\n")))))
+
+          ;; Hide ^Ls.
+          (goto-char (point-min))
+          (while (search-forward "\n\f\n" nil t)
+	    (put-text-property (1+ (match-beginning 0)) (1- (match-end 0))
+                               'invisible t)))))))
 
 (provide 'repeat)
 

commit 32e29afe64897c2ba821e1c2edc2b7d2eb74e70f
Author: Po Lu <luangruo@yahoo.com>
Date:   Fri Nov 18 09:08:59 2022 +0800

    Add knob to make `mouse-position' faster on X
    
    * etc/PROBLEMS (Improving performance with slow X connections):
    Add new advice.
    * src/xterm.c (XTmouse_position): Add alternative
    implementations for slow connections.
    (syms_of_xterm): Add new variable to enable them.
    * src/xterm.h (struct x_display_info): Update commentary.

diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index aaecc41f6e..2169ed0f80 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -1640,16 +1640,21 @@ X expects to find it.
 
 *** Improving performance with slow X connections.
 
-There are several ways to improve this performance, any subset of which can
-be carried out at the same time:
+There are several ways to improve this performance, any subset of
+which can be carried out at the same time:
 
-1) If you don't need X Input Methods (XIM) for entering text in some
+1) Use the "--with-x-toolkit=no" build of Emacs.  By not relying on
+   any toolkit (exhibiting potentially slow behavior), it has been
+   made very fast over networks exhibiting high latency, but suitable
+   bandwidth.
+
+2) If you don't need X Input Methods (XIM) for entering text in some
    language you use, you can improve performance on WAN links by using
    the X resource useXIM to turn off use of XIM.  This does not affect
    the use of Emacs's own input methods, which are part of the Leim
    package.
 
-2) If the connection is very slow, you might also want to consider
+3) If the connection is very slow, you might also want to consider
    switching off scroll bars, menu bar, and tool bar.  Adding the
    following forms to your .emacs file will accomplish that, but only
    after the initial frame is displayed:
@@ -1665,26 +1670,45 @@ be carried out at the same time:
     Emacs.menuBar: off
     Emacs.toolBar: off
 
-3) Use ssh to forward the X connection, and enable compression on this
+4) Use ssh to forward the X connection, and enable compression on this
    forwarded X connection (ssh -XC remotehostname emacs ...).
 
-4) Use lbxproxy on the remote end of the connection.  This is an interface
-   to the low bandwidth X extension in most modern X servers, which
-   improves performance dramatically, at the slight expense of correctness
-   of the X protocol.  lbxproxy achieves the performance gain by grouping
-   several X requests in one TCP packet and sending them off together,
-   instead of requiring a round-trip for each X request in a separate
-   packet.  The switches that seem to work best for emacs are:
-    -noatomsfile  -nowinattr  -cheaterrors -cheatevents
-   Note that the -nograbcmap option is known to cause problems.
-   For more about lbxproxy, see:
+   Keep in mind that this does not help with latency problems, only
+   andwidth ones.
+
+5) Use lbxproxy on the remote end of the connection.  This is an
+   interface to the low bandwidth X extension in some outdated X
+   servers, which improves performance dramatically, at the slight
+   expense of correctness of the X protocol.  lbxproxy achieves the
+   performance gain by grouping several X requests in one TCP packet
+   and sending them off together, instead of requiring a round-trip
+   for each X request in a separate packet.  The switches that seem to
+   work best for emacs are: -noatomsfile -nowinattr -cheaterrors
+   -cheatevents Note that the -nograbcmap option is known to cause
+   problems.  For more about lbxproxy, see:
    http://www.x.org/archive/X11R6.8.0/doc/lbxproxy.1.html
 
-5) If copying and killing is slow, try to disable the interaction with the
+   Keep in mind that lbxproxy and the LBX extension are now obsolete.
+
+6) If copying and killing is slow, try to disable the interaction with the
    native system's clipboard by adding these lines to your .emacs file:
+
      (setq interprogram-cut-function nil)
      (setq interprogram-paste-function nil)
 
+7) If selecting text with the mouse is slow, the main culprit is
+   likely `select-active-regions', coupled with a program monitoring
+   the clipboard on the X server you are connected to.  Try turning
+   that off.
+
+   However, over networks with moderate to high latency, with no
+   clipboard monitor running, the bottleneck is likely to be
+   `mouse-position' instead.  Set the variable
+   `x-use-fast-mouse-position' to either any non-nil value, or to the
+   symbol `really-fast' if that is still too slow.  Doing so will also
+   cause Emacs features that relies on accurate mouse position
+   reporting to stop working reliably.
+
 *** Emacs gives the error, Couldn't find per display information.
 
 This can result if the X server runs out of memory because Emacs uses
diff --git a/src/xterm.c b/src/xterm.c
index b17a7edba6..deedc595cb 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -14261,8 +14261,113 @@ XTmouse_position (struct frame **fp, int insist, Lisp_Object *bar_window,
 		  Time *timestamp)
 {
   struct frame *f1, *maybe_tooltip;
-  struct x_display_info *dpyinfo = FRAME_DISPLAY_INFO (*fp);
+  struct x_display_info *dpyinfo;
   bool unrelated_tooltip;
+  Lisp_Object tail, frame;
+
+  dpyinfo = FRAME_DISPLAY_INFO (*fp);
+
+  if (!NILP (Vx_use_fast_mouse_position))
+    {
+      /* The user says that Emacs is running over the network, and a
+	 fast approximation of `mouse-position' should be used.
+
+         Depending on what the value of `x-use-fast-mouse-position'
+         is, do one of two things: only perform the XQueryPointer to
+         obtain the coordinates from the last mouse frame, or only
+         return the last mouse motion frame and the
+         last_mouse_motion_x and Y.  */
+
+      if (!EQ (Vx_use_fast_mouse_position, Qreally_fast))
+	{
+	  int root_x, root_y, win_x, win_y;
+	  unsigned int mask;
+	  Window dummy;
+
+	  /* This means that Emacs should select a frame and report
+	     the mouse position relative to it.  The approach used
+	     here avoids making multiple roundtrips to the X server
+	     querying for the window beneath the pointer, and was
+	     borrowed from haiku_mouse_position in haikuterm.c.  */
+
+	  FOR_EACH_FRAME (tail, frame)
+	    {
+	      if (FRAME_X_P (XFRAME (frame)))
+		XFRAME (frame)->mouse_moved = false;
+	    }
+
+	  if (gui_mouse_grabbed (dpyinfo)
+	      && !EQ (track_mouse, Qdropping)
+	      && !EQ (track_mouse, Qdrag_source))
+	    /* Pick the last mouse frame if dropping.  */
+	    f1 = x_display_list->last_mouse_frame;
+	  else
+	    /* Otherwise, pick the last mouse motion frame.  */
+	    f1 = x_display_list->last_mouse_motion_frame;
+
+	  if (!f1 && FRAME_X_P (SELECTED_FRAME ()))
+	    f1 = SELECTED_FRAME ();
+
+	  if (!f1 || (!FRAME_X_P (f1) && (insist > 0)))
+	    FOR_EACH_FRAME (tail, frame)
+	      if (FRAME_X_P (XFRAME (frame)) &&
+		  !FRAME_X_P (XFRAME (frame)))
+		f1 = XFRAME (frame);
+
+	  if (f1 && FRAME_TOOLTIP_P (f1))
+	    f1 = NULL;
+
+	  if (f1 && FRAME_X_P (f1) && FRAME_X_WINDOW (f1))
+	    {
+	      if (!x_query_pointer (dpyinfo->display, FRAME_X_WINDOW (f1),
+				    &dummy, &dummy, &root_x, &root_y,
+				    &win_x, &win_y, &mask))
+		/* The pointer is out of the screen.  */
+		return;
+
+	      remember_mouse_glyph (f1, win_x, win_y,
+				    &dpyinfo->last_mouse_glyph);
+	      x_display_list->last_mouse_glyph_frame = f1;
+
+	      *bar_window = Qnil;
+	      *part = scroll_bar_nowhere;
+
+	      /* If track-mouse is `drag-source' and the mouse pointer is
+		 certain to not be actually under the chosen frame, return
+		 NULL in FP.  */
+	      if (EQ (track_mouse, Qdrag_source)
+		  && (win_x < 0 || win_y < 0
+		      || win_x >= FRAME_PIXEL_WIDTH (f1)
+		      || win_y >= FRAME_PIXEL_HEIGHT (f1)))
+		*fp = NULL;
+	      else
+		*fp = f1;
+
+	      *timestamp = dpyinfo->last_mouse_movement_time;
+	      XSETINT (*x, win_x);
+	      XSETINT (*y, win_y);
+	    }
+	}
+      else
+	{
+	  /* This means Emacs should only report the coordinates of
+	     the last mouse motion.  */
+
+	  if (dpyinfo->last_mouse_motion_frame)
+	    {
+	      *fp = dpyinfo->last_mouse_motion_frame;
+	      *timestamp = dpyinfo->last_mouse_movement_time;
+	      *x = make_fixnum (dpyinfo->last_mouse_motion_x);
+	      *y = make_fixnum (dpyinfo->last_mouse_motion_y);
+	      *bar_window = Qnil;
+	      *part = scroll_bar_nowhere;
+
+	      dpyinfo->last_mouse_motion_frame->mouse_moved = false;
+	    }
+	}
+
+      return;
+    }
 
   block_input ();
 
@@ -31131,6 +31236,7 @@ syms_of_xterm (void)
   DEFSYM (Qimitate_pager, "imitate-pager");
   DEFSYM (Qnewer_time, "newer-time");
   DEFSYM (Qraise_and_focus, "raise-and-focus");
+  DEFSYM (Qreally_fast, "really-fast");
 
   DEFVAR_LISP ("x-ctrl-keysym", Vx_ctrl_keysym,
     doc: /* Which keys Emacs uses for the ctrl modifier.
@@ -31410,4 +31516,19 @@ syms_of_xterm (void)
   - The symbol `raise-and-focus', which means to raise the window and
     focus it manually.  */);
   Vx_allow_focus_stealing = Qnewer_time;
+
+  DEFVAR_LISP ("x-use-fast-mouse-position", Vx_use_fast_mouse_position,
+    doc: /* How to make `mouse-position' faster.
+
+`mouse-position' and `mouse-pixel-position' default to querying the X
+server for the window under the mouse pointer.  This results in
+accurate results, but is also very slow when the X connection has
+moderate to high latency.  Setting this variable to a non-nil value
+makes Emacs query only for the position of the pointer, which is
+usually faster.  Doing so improves the performance of dragging to
+select text over slow X connections.
+
+If that is still too slow, setting this variable to the symbol
+`really-fast' will make Emacs return only cached values.  */);
+  Vx_use_fast_mouse_position = Qnil;
 }
diff --git a/src/xterm.h b/src/xterm.h
index b6ab42e72d..c36920081d 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -580,7 +580,9 @@ #define X_INVALID_WINDOW 0xffffffff
   Time last_user_time;
 
   /* Position where the mouse was last time we reported a motion.
-     This is a position on last_mouse_motion_frame.  */
+     This is a position on last_mouse_motion_frame.  It is used in
+     some situations to report the mouse position as well: see
+     XTmouse_position.  */
   int last_mouse_motion_x;
   int last_mouse_motion_y;
 
@@ -1605,22 +1607,15 @@ #define SELECTION_EVENT_TIME(eventp)	\
 
 extern void x_free_gcs (struct frame *);
 extern void x_relative_mouse_position (struct frame *, int *, int *);
-extern void x_real_pos_and_offsets (struct frame *f,
-                                    int *left_offset_x,
-                                    int *right_offset_x,
-                                    int *top_offset_y,
-                                    int *bottom_offset_y,
-                                    int *x_pixels_diff,
-                                    int *y_pixels_diff,
-                                    int *xptr,
-                                    int *yptr,
-                                    int *outer_border);
+extern void x_real_pos_and_offsets (struct frame *, int *, int *, int *,
+                                    int *, int *, int *, int *, int *,
+				    int *);
 extern void x_default_font_parameter (struct frame *, Lisp_Object);
 
 /* From xrdb.c.  */
 
-XrmDatabase x_load_resources (Display *, const char *, const char *,
-			      const char *);
+extern XrmDatabase x_load_resources (Display *, const char *, const char *,
+				     const char *);
 extern const char *x_get_string_resource (void *, const char *, const char *);
 
 /* Defined in xterm.c */

commit 682b068ba712075cea34d8bc790620ba82169d6c
Merge: 17889dd828 091e0f04ff
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Thu Nov 17 18:48:38 2022 -0500

    Merge remote-tracking branch 'origin/scratch/noverlay'

commit 091e0f04ffe494ee4cddb67670f0c495a7c9b691 (refs/remotes/origin/scratch/noverlay)
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Thu Nov 17 18:09:37 2022 -0500

    itree.c: Get rid of the old iterator code
    
    Only use the new iterator which relies on a fixed size (and small)
    state in the iterator.
    This makes non-local exits safe within ITREE_FOREACH loops.
    
    * src/itree.c (make_nav, nav_nodeptr, nav_flag, itree_stack_clear)
    (itree_stack_push_flagged): Delete functions.
    (nodeptr_and_flag): Delete type.
    (struct itree_stack): Make the array hold plain pointers instead.
    (itree_stack_push): Inline the former code of `itree_stack_push_flagged`.
    (itree_stack_pop): Change return type.
    (itree_contains): Don't call `ITREE_FOREACH_ABORT` any more.
    (itree_insert_gap): Simplify access to the stack of nodes.
    (itree_delete_gap, itree_insert_gap): Adjust code to new return type of
    `itree_stack_pop`.
    (itree_iterator_finish): Delete function.
    (itree_iterator_start): Don't setup the `stack` field any more.
    (itree_iterator_next): Delete function.
    (itree_iter_next): Rename to `itree_iterator_next` and make it non-static.
    (itree_iterator_narrow): Don't check the `running` flag any more.
    
    * src/itree.h (itree_iterator_finish): Remove declaration.
    (struct itree_iterator): Remove the `stack` and `running` fields.
    (ITREE_FOREACH_ABORT): Delete macro.
    (ITREE_FOREACH): Don't call `itree_iterator_finish` any more.
    
    * src/xdisp.c (strings_with_newlines):
    * src/buffer.c (overlays_in, next_overlay_change, overlay_touches_p):
    Don't call `ITREE_FOREACH_ABORT` any more.

diff --git a/src/buffer.c b/src/buffer.c
index 9be2c4a970..4da5b451d0 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2985,17 +2985,13 @@ overlays_in (ptrdiff_t beg, ptrdiff_t end, bool extend,
       if (node->begin > end)
         {
           next = min (next, node->begin);
-          ITREE_FOREACH_ABORT ();
           break;
         }
       else if (node->begin == end)
         {
           next = node->begin;
           if ((! empty || end < ZV) && beg < end)
-            {
-              ITREE_FOREACH_ABORT ();
-              break;
-            }
+            break;
           if (empty && node->begin != node->end)
             continue;
         }
@@ -3050,7 +3046,6 @@ next_overlay_change (ptrdiff_t pos)
              of pos, because the search is limited to [pos,next) . */
           eassert (node->begin < next);
           next = node->begin;
-          ITREE_FOREACH_ABORT ();
           break;
         }
       else if (node->begin < node->end && node->end < next)
@@ -3155,10 +3150,7 @@ overlay_touches_p (ptrdiff_t pos)
      pos. */
   ITREE_FOREACH (node, current_buffer->overlays, pos - 1, pos + 1, DESCENDING)
     if (node->begin == pos || node->end == pos)
-      {
-        ITREE_FOREACH_ABORT ();
-        return true;
-      }
+      return true;
   return false;
 }
 
diff --git a/src/itree.c b/src/itree.c
index 9e60071980..e4d5fb304b 100644
--- a/src/itree.c
+++ b/src/itree.c
@@ -131,33 +131,10 @@ Copyright (C) 2017-2022  Free Software Foundation, Inc.
  * | Stack
  * +=======================================================================+ */
 
-typedef uintptr_t nodeptr_and_flag;
-
-static inline nodeptr_and_flag
-make_nav (struct itree_node *ptr, bool flag)
-{
-  uintptr_t v = (uintptr_t) ptr;
-  /* We assume alignment imposes the LSB is clear for us to use it.  */
-  eassert (!(v & 1));
-  return v | !!flag;
-}
-
-static inline struct itree_node *
-nav_nodeptr (nodeptr_and_flag nav)
-{
-  return (struct itree_node *) (nav & (~(uintptr_t)1));
-}
-
-static inline bool
-nav_flag (nodeptr_and_flag nav)
-{
-  return (bool) (nav & 1);
-}
-
 /* Simple dynamic array. */
 struct itree_stack
 {
-  nodeptr_and_flag *nodes;
+  struct itree_node **nodes;
   size_t size;
   size_t length;
 };
@@ -184,12 +161,6 @@ itree_stack_destroy (struct itree_stack *stack)
   xfree (stack);
 }
 
-static void
-itree_stack_clear (struct itree_stack *stack)
-{
-  stack->length = 0;
-}
-
 static inline void
 itree_stack_ensure_space (struct itree_stack *stack, uintmax_t nelements)
 {
@@ -204,34 +175,20 @@ itree_stack_ensure_space (struct itree_stack *stack, uintmax_t nelements)
 /* Push NODE on the STACK, while settings its visited flag to FLAG. */
 
 static inline void
-itree_stack_push_flagged (struct itree_stack *stack,
-			     struct itree_node *node, bool flag)
+itree_stack_push (struct itree_stack *stack, struct itree_node *node)
 {
   eassert (node);
-
-  /* FIXME: While the stack used in the iterator is bounded by the tree
-     depth and could be easily pre-allocated to a large enough size to avoid
-     this "ensure" check, `itree_stack_push` is also used elsewhere to
-     simply collect some subset of the overlays, where it's only bounded by
-     the total number of overlays in the buffer (which can be large and thus
-     preferably not pre-allocated needlessly).  */
   itree_stack_ensure_space (stack, stack->length + 1);
 
-  stack->nodes[stack->length] = make_nav (node, flag);
+  stack->nodes[stack->length] = node;
   stack->length++;
 }
 
-static inline void
-itree_stack_push (struct itree_stack *stack, struct itree_node *node)
-{
-  itree_stack_push_flagged (stack, node, false);
-}
-
-static inline nodeptr_and_flag
+static inline struct itree_node *
 itree_stack_pop (struct itree_stack *stack)
 {
   if (stack->length == 0)
-    return make_nav (NULL, false);
+    return NULL;
   return stack->nodes[--stack->length];
 }
 
@@ -815,10 +772,7 @@ itree_contains (struct itree_tree *tree, struct itree_node *node)
   struct itree_node *other;
   ITREE_FOREACH (other, tree, node->begin, PTRDIFF_MAX, ASCENDING)
     if (other == node)
-      {
-	ITREE_FOREACH_ABORT ();
-	return true;
-      }
+      return true;
 
   return false;
 }
@@ -1122,7 +1076,7 @@ itree_insert_gap (struct itree_tree *tree,
 	}
     }
   for (size_t i = 0; i < saved->length; ++i)
-    itree_remove (tree, nav_nodeptr (saved->nodes[i]));
+    itree_remove (tree, saved->nodes[i]);
 
   /* We can't use an iterator here, because we can't effectively
      narrow AND shift some subtree at the same time.  */
@@ -1131,9 +1085,7 @@ itree_insert_gap (struct itree_tree *tree,
       const int size = itree_max_height (tree) + 1;
       struct itree_stack *stack = itree_stack_create (size);
       itree_stack_push (stack, tree->root);
-      nodeptr_and_flag nav;
-      while ((nav = itree_stack_pop (stack),
-	      node = nav_nodeptr (nav)))
+      while ((node = itree_stack_pop (stack)))
 	{
 	  /* Process in pre-order. */
 	  itree_inherit_offset (tree->otick, node);
@@ -1170,9 +1122,7 @@ itree_insert_gap (struct itree_tree *tree,
 
   /* Reinsert nodes starting at POS having front-advance.  */
   uintmax_t notick = tree->otick;
-  nodeptr_and_flag nav;
-  while ((nav = itree_stack_pop (saved),
-	  node = nav_nodeptr (nav)))
+  while ((node = itree_stack_pop (saved)))
     {
       eassert (node->otick == ootick);
       eassert (node->begin == pos);
@@ -1205,10 +1155,8 @@ itree_delete_gap (struct itree_tree *tree,
   struct itree_node *node;
 
   itree_stack_push (stack, tree->root);
-  nodeptr_and_flag nav;
-  while ((nav = itree_stack_pop (stack)))
+  while ((node = itree_stack_pop (stack)))
     {
-      node = nav_nodeptr (nav);
       itree_inherit_offset (tree->otick, node);
       if (pos > node->limit)
 	continue;
@@ -1244,16 +1192,6 @@ itree_delete_gap (struct itree_tree *tree,
  * | Iterator
  * +=======================================================================+ */
 
-/* Stop using the iterator. */
-
-void
-itree_iterator_finish (struct itree_iterator *iter)
-{
-  eassert (iter && iter->running);
-  itree_stack_destroy (iter->stack);
-  iter->running = false;
-}
-
 /* Return true, if NODE's interval intersects with [BEGIN, END).
    Note: We always include empty nodes at BEGIN (and not at END),
    but if BEGIN==END, then we don't include non-empty nodes starting
@@ -1436,7 +1374,7 @@ itree_iterator_first_node (struct itree_tree *tree,
 }
 
 /* Start a iterator enumerating all intervals in [BEGIN,END) in the
-   given ORDER.  Only one iterator per tree can be running at any time.  */
+   given ORDER.  */
 
 struct itree_iterator *
 itree_iterator_start (struct itree_iterator *iter,
@@ -1444,133 +1382,28 @@ itree_iterator_start (struct itree_iterator *iter,
 		      ptrdiff_t begin, ptrdiff_t end, enum itree_order order)
 {
   eassert (iter);
-  /* eassert (!iter->running); */
-  /* 19 here just avoids starting with a silly-small stack.
-     FIXME: Since this stack only needs to be about 2*max_depth
-     in the worst case, we could completely pre-allocate it to something
-     like word-bit-size * 2 and then never worry about growing it.  */
-  const int size = (tree ? itree_max_height (tree) : 19) + 1;
-  iter->stack = itree_stack_create (size);
-  uintmax_t otick= tree->otick;
   iter->begin = begin;
   iter->end = end;
-  iter->otick = otick;
+  iter->otick = tree->otick;
   iter->order = order;
-  itree_stack_clear (iter->stack);
-  if (begin <= end && tree->root != NULL)
-    itree_stack_push_flagged (iter->stack, tree->root, false);
-  iter->running = true;
-  /* itree_stack_ensure_space (iter->stack,
-			       2 * itree_max_height (tree)); */
   iter->node = itree_iterator_first_node (tree, iter);
   return iter;
 }
 
-static struct itree_node *
-itree_iter_next (struct itree_iterator *iter)
+struct itree_node *
+itree_iterator_next (struct itree_iterator *iter)
 {
   struct itree_node *node = iter->node;
   while (node
          && !itree_node_intersects (node, iter->begin, iter->end))
     {
       node = itree_iter_next_in_subtree (node, iter);
+      eassert (itree_limit_is_stable (node));
     }
   iter->node = node ? itree_iter_next_in_subtree (node, iter) : NULL;
   return node;
 }
 
-/* Return the next node of the iterator in the order given when it was
-   started; or NULL if there are no more nodes. */
-
-struct itree_node *
-itree_iterator_next (struct itree_iterator *g)
-{
-  eassert (g && g->running);
-
-  struct itree_node *const null = NULL;
-  struct itree_node *node;
-
-  /* The `visited` flag stored in each node is used here (and only here):
-     We keep a "workstack" of nodes we need to consider.  This stack
-     consist of nodes of two types: nodes that we have decided
-     should be returned by the iterator, and nodes which we may
-     need to consider (including checking their children).
-     We start an iteration with a stack containing just the root
-     node marked as "not visited" which means that it (and its children)
-     needs to be considered but we haven't yet decided whether it's included
-     in the iterator's output.  */
-
-  do
-    {
-      nodeptr_and_flag nav;
-      bool visited;
-      while ((nav = itree_stack_pop (g->stack),
-	      node = nav_nodeptr (nav),
-	      visited = nav_flag (nav),
-	      node && !visited))
-	{
-	  struct itree_node *const left = node->left;
-	  struct itree_node *const right = node->right;
-
-	  itree_inherit_offset (g->otick, node);
-	  eassert (itree_limit_is_stable (node));
-	  switch (g->order)
-	    {
-	    case ITREE_ASCENDING:
-	      if (right != null && node->begin <= g->end)
-		itree_stack_push_flagged (g->stack, right, false);
-	      if (itree_node_intersects (node, g->begin, g->end))
-		itree_stack_push_flagged (g->stack, node, true);
-	      /* Node's children may still be off-set and we need to add it.  */
-	      if (left != null && g->begin <= left->limit + left->offset)
-		itree_stack_push_flagged (g->stack, left, false);
-	      break;
-	    case ITREE_DESCENDING:
-	      if (left != null && g->begin <= left->limit + left->offset)
-		itree_stack_push_flagged (g->stack, left, false);
-	      if (itree_node_intersects (node, g->begin, g->end))
-		itree_stack_push_flagged (g->stack, node, true);
-	      if (right != null && node->begin <= g->end)
-		itree_stack_push_flagged (g->stack, right, false);
-	      break;
-	    case ITREE_PRE_ORDER:
-	      if (right != null && node->begin <= g->end)
-		itree_stack_push_flagged (g->stack, right, false);
-	      if (left != null && g->begin <= left->limit + left->offset)
-		itree_stack_push_flagged (g->stack, left, false);
-	      if (itree_node_intersects (node, g->begin, g->end))
-		itree_stack_push_flagged (g->stack, node, true);
-	      break;
-	    case ITREE_POST_ORDER:
-	      if (itree_node_intersects (node, g->begin, g->end))
-		itree_stack_push_flagged (g->stack, node, true);
-	      if (right != null && node->begin <= g->end)
-		itree_stack_push_flagged (g->stack, right, false);
-	      if (left != null && g->begin <= left->limit + left->offset)
-		itree_stack_push_flagged (g->stack, left, false);
-	      break;
-	    }
-	}
-      /* Node may have been invalidated by itree_iterator_narrow
-	 after it was pushed: Check if it still intersects. */
-    } while (node && ! itree_node_intersects (node, g->begin, g->end));
-
-  struct itree_node *old_node = g->node;
-  struct itree_node *other_node = itree_iter_next (g);
-  if (other_node != node)
-    {
-      fprintf (stderr, "WOW!! %ld..%ld vs %ld..%ld\n",
-               other_node ? other_node->begin : -1,
-               other_node ? other_node->end : -1,
-               node ? node->begin : -1,
-               node ? node->end : -1);
-      fprintf (stderr, "ON=%lx N=%lx OlN=%lx\n", other_node, node,
-               old_node);
-      emacs_abort ();
-    }
-  return node;
-}
-
 /* Limit G to the new interval [BEGIN, END), which must be a subset of
    the current one.  I.E. it can't grow on either side. */
 
@@ -1578,7 +1411,7 @@ itree_iterator_next (struct itree_iterator *g)
 itree_iterator_narrow (struct itree_iterator *g,
 		       ptrdiff_t begin, ptrdiff_t end)
 {
-  eassert (g && g->running);
+  eassert (g);
   eassert (begin >= g->begin);
   eassert (end <= g->end);
   g->begin = max (begin, g->begin);
diff --git a/src/itree.h b/src/itree.h
index 37cd423d34..291fa53fd3 100644
--- a/src/itree.h
+++ b/src/itree.h
@@ -132,24 +132,21 @@ #define ITREE_H
 						    enum itree_order);
 extern void itree_iterator_narrow (struct itree_iterator *, ptrdiff_t,
 				   ptrdiff_t);
-extern void itree_iterator_finish (struct itree_iterator *);
 extern struct itree_node *itree_iterator_next (struct itree_iterator *);
 
 /* State used when iterating interval. */
 struct itree_iterator
   {
-    struct itree_node *node; /* FIXME: It should be either `node` or `stack`. */
-    struct itree_stack *stack;
+    struct itree_node *node;
     ptrdiff_t begin;
     ptrdiff_t end;
     uintmax_t otick;    /* A copy of the tree's `otick`.  */
     enum itree_order order;
-    bool running;
   };
 
 /* Iterate over the intervals between BEG and END in the tree T.
    N will hold successive nodes.  ORDER can be one of : `ASCENDING`,
-   `DESCENDING`, or `PRE_ORDER`.
+   `DESCENDING`, `POST_ORDER`, or `PRE_ORDER`.
    It should be used as:
 
       ITREE_FOREACH (n, t, beg, end, order)
@@ -160,9 +157,6 @@ #define ITREE_H
    BEWARE:
    - The expression T may be evaluated more than once, so make sure
      it is cheap and pure.
-   - If you need to exit the loop early, you *have* to call `ITREE_ABORT`
-     just before exiting (e.g. with `break` or `return`).
-   - Non-local exits are not supported within the body of the loop.
    - Don't modify the tree during the iteration.
  */
 #define ITREE_FOREACH(n, t, beg, end, order)                        \
@@ -179,11 +173,7 @@ #define ITREE_FOREACH(n, t, beg, end, order)                        \
                                *itree_iter_                      \
             = itree_iterator_start (&itree_local_iter_,          \
                                     t, beg, end, ITREE_##order); \
-          ((n = itree_iterator_next (itree_iter_))               \
-           || (itree_iterator_finish (itree_iter_), false));)
-
-#define ITREE_FOREACH_ABORT() \
-  itree_iterator_finish (itree_iter_)
+          ((n = itree_iterator_next (itree_iter_)));)
 
 #define ITREE_FOREACH_NARROW(beg, end) \
   itree_iterator_narrow (itree_iter_, beg, end)
diff --git a/src/xdisp.c b/src/xdisp.c
index f6a279636a..414ee9bfe2 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7036,17 +7036,11 @@ strings_with_newlines (ptrdiff_t startpos, ptrdiff_t endpos, struct window *w)
       str = Foverlay_get (overlay, Qbefore_string);
       if (STRINGP (str) && SCHARS (str)
 	  && memchr (SDATA (str), '\n', SBYTES (str)))
-	{
-	  ITREE_FOREACH_ABORT ();
-	  return true;
-	}
+	return true;
       str = Foverlay_get (overlay, Qafter_string);
       if (STRINGP (str) && SCHARS (str)
 	  && memchr (SDATA (str), '\n', SBYTES (str)))
-	{
-	  ITREE_FOREACH_ABORT ();
-	  return true;
-	}
+	return true;
     }
 
   /* Check for 'display' properties whose values include strings.  */

commit fb7f1864da4aa4c09756cfe47db6c56b4e87bd14
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Thu Nov 17 17:00:22 2022 -0500

    itree.c: Make the iterator reentrant (bug#59183)
    
    Get rid of the global iterator object and instead allocate
    a separate iterator for every loop.  This still uses the "duplicate
    iterator" code, including the old iterator which needs a stack,
    make ITREE_FOREACH a bit more expensive than we'd like.
    
    * src/itree.h (init_itree, forget_itree, itree_iterator_busy_p):
    Delete declarations.
    (itree_iterator_start): Add iterator arg and remove `line` and `file` args.
    (struct itree_iterator): Move from `itree.c`.  Remove `line` and
    `file` fields.
    (ITREE_FOREACH): Stack allocate an iterator object and pass it to
    `itree_iterator_start`.
    
    * src/itree.c (struct itree_iterator): Move to itree.h.
    (iter): Delete global variable.
    (itree_iterator_create, init_itree, forget_itree, itree_iterator_busy_p):
    Delete functions.
    (itree_contains): Adjust assertion.
    (itree_iterator_finish): Deallocate the iterator's stack.
    (itree_iterator_start): Take the (uninitialized) iterator as argument.
    Allocate a fresh new stack.  Remove `file` and `line` arguments.
    Don't check `running` any more since the iterator is not expected to be
    initialized at all.
    
    * src/eval.c (signal_or_quit):
    * src/alloc.c (garbage_collect): Don't check `itree_iterator_busy_p`
    any more.
    
    * src/emacs.c (main): No need to `init_itree` any more.
    (Fdump_emacs): No need to `forget_itree` any more.

diff --git a/src/alloc.c b/src/alloc.c
index 6862cf916f..b9d12dff7e 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6279,11 +6279,6 @@ garbage_collect (void)
   image_prune_animation_caches (false);
 #endif
 
-  /* ELisp code run by `gc-post-hook' could result in itree iteration,
-     which must not happen while the itree is already busy.  See
-     bug#58639.  */
-  eassert (!itree_iterator_busy_p ());
-
   if (!NILP (Vpost_gc_hook))
     {
       specpdl_ref gc_count = inhibit_garbage_collection ();
diff --git a/src/emacs.c b/src/emacs.c
index c4c8bfc82f..85102acd28 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1932,7 +1932,6 @@ main (int argc, char **argv)
   running_asynch_code = 0;
   init_random ();
   init_xfaces ();
-  init_itree ();
 
 #if defined HAVE_JSON && !defined WINDOWSNT
   init_json ();
@@ -3105,8 +3104,6 @@ DEFUN ("dump-emacs", Fdump_emacs, Sdump_emacs, 2, 2, 0,
   gflags.will_dump_with_unexec_ = false;
   gflags.dumped_with_unexec_ = true;
 
-  forget_itree ();
-
   alloc_unexec_pre ();
 
   unexec (SSDATA (filename), !NILP (symfile) ? SSDATA (symfile) : 0);
diff --git a/src/eval.c b/src/eval.c
index ea23829948..78e606267f 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1716,7 +1716,6 @@ signal_or_quit (Lisp_Object error_symbol, Lisp_Object data, bool keyboard_quit)
   Lisp_Object clause = Qnil;
   struct handler *h;
 
-  eassert (!itree_iterator_busy_p ());
   if (gc_in_progress || waiting_for_input)
     emacs_abort ();
 
diff --git a/src/itree.c b/src/itree.c
index 4f25a924b4..9e60071980 100644
--- a/src/itree.c
+++ b/src/itree.c
@@ -238,72 +238,12 @@ itree_stack_pop (struct itree_stack *stack)
 
 /* +-----------------------------------------------------------------------+ */
 
-/* State used when iterating interval. */
-struct itree_iterator
-{
-  struct itree_stack *stack;
-  struct itree_node *node;
-  ptrdiff_t begin;
-  ptrdiff_t end;
-
-  /* A copy of the tree's `otick`.  */
-  uintmax_t otick;
-  enum itree_order order;
-  bool running;
-  const char *file;
-  int line;
-};
-
-/* Ideally, every iteration would use its own `iter` object, so we could
-   have several iterations active at the same time.  In practice, iterations
-   are limited by the fact we don't allow modifying the tree at the same
-   time, making the use of nested iterations quite rare anyway.
-   So we just use a single global iterator instead for now.  */
-static struct itree_iterator *iter = NULL;
-
 static int
 itree_max_height (const struct itree_tree *tree)
 {
   return 2 * log (tree->size + 1) / log (2) + 0.5;
 }
 
-/* Allocate a new iterator for TREE. */
-
-static struct itree_iterator *
-itree_iterator_create (struct itree_tree *tree)
-{
-  struct itree_iterator *g = xmalloc (sizeof *g);
-  /* 19 here just avoids starting with a silly-small stack.
-     FIXME: Since this stack only needs to be about 2*max_depth
-     in the worst case, we could completely pre-allocate it to something
-     like word-bit-size * 2 and then never worry about growing it.  */
-  const int size = (tree ? itree_max_height (tree) : 19) + 1;
-
-  g->stack = itree_stack_create (size);
-  g->node = NULL;
-  g->running = false;
-  g->begin = 0;
-  g->end = 0;
-  g->file = NULL;
-  g->line = 0;
-  return g;
-}
-
-void
-init_itree (void)
-{
-  eassert (!iter);
-  iter = itree_iterator_create (NULL);
-}
-
-#ifdef HAVE_UNEXEC
-void
-forget_itree (void)
-{
-  iter = NULL;
-}
-#endif
-
 struct check_subtree_result
 {
   /* Node count of the tree.  */
@@ -871,7 +811,7 @@ itree_node_set_region (struct itree_tree *tree,
 static bool
 itree_contains (struct itree_tree *tree, struct itree_node *node)
 {
-  eassert (iter && node);
+  eassert (node);
   struct itree_node *other;
   ITREE_FOREACH (other, tree, node->begin, PTRDIFF_MAX, ASCENDING)
     if (other == node)
@@ -1304,18 +1244,13 @@ itree_delete_gap (struct itree_tree *tree,
  * | Iterator
  * +=======================================================================+ */
 
-bool
-itree_iterator_busy_p (void)
-{
-  return (iter && iter->running);
-}
-
 /* Stop using the iterator. */
 
 void
 itree_iterator_finish (struct itree_iterator *iter)
 {
   eassert (iter && iter->running);
+  itree_stack_destroy (iter->stack);
   iter->running = false;
 }
 
@@ -1504,18 +1439,18 @@ itree_iterator_first_node (struct itree_tree *tree,
    given ORDER.  Only one iterator per tree can be running at any time.  */
 
 struct itree_iterator *
-itree_iterator_start (struct itree_tree *tree, ptrdiff_t begin,
-		      ptrdiff_t end, enum itree_order order,
-		      const char *file, int line)
+itree_iterator_start (struct itree_iterator *iter,
+		      struct itree_tree *tree,
+		      ptrdiff_t begin, ptrdiff_t end, enum itree_order order)
 {
   eassert (iter);
-  if (iter->running)
-    {
-      fprintf (stderr,
-	       "Detected nested iteration!\nOuter: %s:%d\nInner: %s:%d\n",
-	       iter->file, iter->line, file, line);
-      emacs_abort ();
-    }
+  /* eassert (!iter->running); */
+  /* 19 here just avoids starting with a silly-small stack.
+     FIXME: Since this stack only needs to be about 2*max_depth
+     in the worst case, we could completely pre-allocate it to something
+     like word-bit-size * 2 and then never worry about growing it.  */
+  const int size = (tree ? itree_max_height (tree) : 19) + 1;
+  iter->stack = itree_stack_create (size);
   uintmax_t otick= tree->otick;
   iter->begin = begin;
   iter->end = end;
@@ -1524,8 +1459,6 @@ itree_iterator_start (struct itree_tree *tree, ptrdiff_t begin,
   itree_stack_clear (iter->stack);
   if (begin <= end && tree->root != NULL)
     itree_stack_push_flagged (iter->stack, tree->root, false);
-  iter->file = file;
-  iter->line = line;
   iter->running = true;
   /* itree_stack_ensure_space (iter->stack,
 			       2 * itree_max_height (tree)); */
diff --git a/src/itree.h b/src/itree.h
index dc44823322..37cd423d34 100644
--- a/src/itree.h
+++ b/src/itree.h
@@ -107,10 +107,6 @@ #define ITREE_H
     ITREE_POST_ORDER,
   };
 
-extern void init_itree (void);
-#ifdef HAVE_UNEXEC
-extern void forget_itree (void);
-#endif
 extern void itree_node_init (struct itree_node *, bool, bool, Lisp_Object);
 extern ptrdiff_t itree_node_begin (struct itree_tree *, struct itree_node *);
 extern ptrdiff_t itree_node_end (struct itree_tree *, struct itree_node *);
@@ -129,17 +125,28 @@ #define ITREE_H
 
 /* Iteration functions.  Almost all code should use ITREE_FOREACH
    instead.  */
-extern bool itree_iterator_busy_p (void);
-extern struct itree_iterator *itree_iterator_start (struct itree_tree *,
+extern struct itree_iterator *itree_iterator_start (struct itree_iterator *,
+						    struct itree_tree *,
 						    ptrdiff_t,
 						    ptrdiff_t,
-						    enum itree_order,
-						    const char *, int);
+						    enum itree_order);
 extern void itree_iterator_narrow (struct itree_iterator *, ptrdiff_t,
 				   ptrdiff_t);
 extern void itree_iterator_finish (struct itree_iterator *);
 extern struct itree_node *itree_iterator_next (struct itree_iterator *);
 
+/* State used when iterating interval. */
+struct itree_iterator
+  {
+    struct itree_node *node; /* FIXME: It should be either `node` or `stack`. */
+    struct itree_stack *stack;
+    ptrdiff_t begin;
+    ptrdiff_t end;
+    uintmax_t otick;    /* A copy of the tree's `otick`.  */
+    enum itree_order order;
+    bool running;
+  };
+
 /* Iterate over the intervals between BEG and END in the tree T.
    N will hold successive nodes.  ORDER can be one of : `ASCENDING`,
    `DESCENDING`, or `PRE_ORDER`.
@@ -153,29 +160,26 @@ #define ITREE_H
    BEWARE:
    - The expression T may be evaluated more than once, so make sure
      it is cheap and pure.
-   - Only a single iteration can happen at a time, so make sure none of the
-     code within the loop can start another tree iteration, i.e. it shouldn't
-     be able to run ELisp code, nor GC since GC can run ELisp by way
-     of `post-gc-hook`.
    - If you need to exit the loop early, you *have* to call `ITREE_ABORT`
      just before exiting (e.g. with `break` or `return`).
    - Non-local exits are not supported within the body of the loop.
    - Don't modify the tree during the iteration.
  */
 #define ITREE_FOREACH(n, t, beg, end, order)                        \
-  /* FIXME: We'd want to declare `x` right here, but I can't figure out
+  /* FIXME: We'd want to declare `n` right here, but I can't figure out
      how to make that work here: the `for` syntax only allows a single
      clause for the var declarations where we need 2 different types.
      We could use the `struct {foo x; bar y; } p;` trick to declare two
      vars `p.x` and `p.y` of unrelated types, but then none of the names
-     of the vars matches the `n` we receive :-(.  */                \
-  if (!t)                                                           \
-    { }                                                             \
-  else                                                              \
-    for (struct itree_iterator *itree_iter_                         \
-            = itree_iterator_start (t, beg, end, ITREE_##order,     \
-                                        __FILE__, __LINE__);        \
-          ((n = itree_iterator_next (itree_iter_))                  \
+     of the vars matches the `n` we receive :-(.  */             \
+  if (!t)                                                        \
+    { }                                                          \
+  else                                                           \
+    for (struct itree_iterator itree_local_iter_,                \
+                               *itree_iter_                      \
+            = itree_iterator_start (&itree_local_iter_,          \
+                                    t, beg, end, ITREE_##order); \
+          ((n = itree_iterator_next (itree_iter_))               \
            || (itree_iterator_finish (itree_iter_), false));)
 
 #define ITREE_FOREACH_ABORT() \

commit 17889dd828dabc8d4a015c3df889799818178afb
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Thu Nov 17 17:39:46 2022 +0100

    * lisp/emacs-lisp/package-vc.el: Autoload package-vc-update{,-all}

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index b3638cda28..9e2bd106cb 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -562,6 +562,7 @@ package-vc--read-package-desc
                (if installed package-alist package-archive-contents)
                #'string=)))
 
+;;;###autoload
 (defun package-vc-update-all ()
   "Attempt to update all installed VC packages."
   (interactive)
@@ -571,6 +572,7 @@ package-vc-update-all
         (package-vc-update pkg-desc))))
   (message "Done updating packages."))
 
+;;;###autoload
 (defun package-vc-update (pkg-desc)
   "Attempt to update the package PKG-DESC."
   (interactive (list (package-vc--read-package-desc "Update source package: " t)))

commit fb6d62f881d4df4c9f0bedff7054d13be9587853
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Wed Nov 16 10:59:53 2022 +0100

    ; Clarify what a package specification is
    
    * lisp/emacs-lisp/package-vc.el (package-vc-selected-packages): Expand
    docstring.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 84c4dda6f4..b3638cda28 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -141,7 +141,8 @@ package-vc-selected-packages
 
 - nil, if any package version can be installed;
 - a version string, if that specific revision is to be installed;
-- a property list.  Valid key/value pairs are
+- a property list, describing a package specification.  Valid
+  key/value pairs are
 
    `:url' (string)
       The URL of the repository used to fetch the package source.
@@ -165,7 +166,7 @@ package-vc-selected-packages
       `vc-clone' will fall back onto the archive default or on
       `package-vc-default-backend'.
 
-  All other values are ignored.
+  All other keys are ignored.
 
 This user option differs from `package-selected-packages' in that
 it is meant to be specified manually.  If you want to install all

commit db28ba29ddad0deda8aee3513d2652e95fc15342
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Wed Nov 16 10:46:43 2022 +0100

    Ensure 'package-vc-prepare-patch' runs in the right directory
    
    * lisp/emacs-lisp/package-vc.el (package-vc-prepare-patch): Bind
    'default-directory'.p

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 7edecddaa1..84c4dda6f4 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -780,8 +780,9 @@ package-vc-prepare-patch
          (and (not vc-prepare-patches-separately)
               (read-string "Subject: " "[PATCH] " nil nil t))
          (vc-prepare-patch-prompt-revisions)))
-  (vc-prepare-patch (package-maintainers pkg-desc t)
-                    subject revisions))
+  (let ((default-directory (package-desc-dir pkg-desc)))
+    (vc-prepare-patch (package-maintainers pkg-desc t)
+                      subject revisions)))
 
 (provide 'package-vc)
 ;;; package-vc.el ends here

commit 0b77909cac1ef6705dfb1d4aed0d64ccc55864cf
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Wed Nov 16 10:37:10 2022 +0100

    Avoid duplicate source packages in 'package-alist'
    
    * lisp/emacs-lisp/package-vc.el (package-vc--unpack-1): Remove all
    other source packages before installing the new package description.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 8811f9ac7b..7edecddaa1 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -390,7 +390,7 @@ package-vc--unpack-1
   ;; Remove any previous instance of PKG-DESC from `package-alist'
   (let ((pkgs (assq (package-desc-name pkg-desc) package-alist)))
     (when pkgs
-      (setf (cdr pkgs) (delq pkg-desc (cdr pkgs)))))
+      (setf (cdr pkgs) (seq-remove #'package-vc-p (cdr pkgs)))))
 
   ;; In case the package was installed directly from source, the
   ;; dependency list wasn't know beforehand, and they might have

commit 5b8f165f75698f3d0dd612129f4e6405430567e7
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Wed Nov 16 10:28:14 2022 +0100

    Fix issues related to 'package-vc-install-from-checkout'
    
    * lisp/emacs-lisp/package-vc.el (package-vc--main-file): Ensure the
    package name is a string.
    (package-vc--unpack-1): Use pkg-dir instead of the empty return value
    of 'package-lisp-dir'.
    (package-vc-install-from-checkout): Fix file name handling.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index aa67458676..8811f9ac7b 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -296,15 +296,14 @@ package-vc--version
 (defun package-vc--main-file (pkg-desc)
   "Return the name of the main file for PKG-DESC."
   (cl-assert (package-vc-p pkg-desc))
-  (let ((pkg-spec (package-vc--desc->spec pkg-desc)))
+  (let ((pkg-spec (package-vc--desc->spec pkg-desc))
+        (name (symbol-name (package-desc-name pkg-desc))))
     (or (plist-get pkg-spec :main-file)
         (expand-file-name
-         (format "%s.el" (package-desc-name pkg-desc))
+         (concat name ".el")
          (file-name-concat
           (or (package-desc-dir pkg-desc)
-              (expand-file-name
-               (package-desc-name pkg-desc)
-               package-user-dir))
+              (expand-file-name name package-user-dir))
           (plist-get pkg-spec :lisp-dir))))))
 
 (defun package-vc--generate-description-file (pkg-desc pkg-file)
@@ -396,8 +395,8 @@ package-vc--unpack-1
   ;; In case the package was installed directly from source, the
   ;; dependency list wasn't know beforehand, and they might have
   ;; to be installed explicitly.
-  (let (deps)
-    (dolist (file (directory-files (package-lisp-dir pkg-desc) t "\\.el\\'" t))
+  (let ((deps '()))
+    (dolist (file (directory-files pkg-dir t "\\.el\\'" t))
       (with-temp-buffer
         (insert-file-contents file)
         (when-let* ((require-lines (lm-header-multiline "package-requires")))
@@ -748,11 +747,12 @@ package-vc-install-from-checkout
   (package-vc--archives-initialize)
   (let* ((name (or name (file-name-base (directory-file-name dir))))
          (pkg-dir (expand-file-name name package-user-dir)))
-    (make-symbolic-link dir pkg-dir)
-    (package-vc--unpack-1 (package-desc-create
-                          :name (intern name)
-                          :kind 'vc)
-                         pkg-dir)))
+    (make-symbolic-link (expand-file-name dir) pkg-dir)
+    (package-vc--unpack-1
+     (package-desc-create
+      :name (intern name)
+      :kind 'vc)
+     (file-name-as-directory pkg-dir))))
 
 ;;;###autoload
 (defun package-vc-rebuild (pkg-desc)

commit 53c90abfa814d9c5a5c82adb57f6eccaccc0630e
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Tue Nov 15 20:19:33 2022 +0100

    ; * lisp/emacs-lisp/package-vc.el: Update TODO

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index ad468cade6..aa67458676 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -39,6 +39,9 @@
 
 ;; - Allow maintaining patches that are ported back onto regular
 ;;   packages and maintained between versions.
+;;
+;; - Add a heuristic for guessing a `:lisp-dir' when cloning directly
+;;  from a URL.
 
 ;;; Code:
 

commit 4bd7ae833fd3e7922ca86c84fbccaaf1605bb08a
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Tue Nov 15 20:05:33 2022 +0100

    Allow the direct installation of package specifications
    
    * lisp/emacs-lisp/package-vc.el (package-vc-install): Handle package
    specifications as an argument.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index e8cae75c9c..ad468cade6 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -631,20 +631,25 @@ package-vc--release-rev
                              (line-number-at-pos nil t))))))))
 
 ;;;###autoload
-(defun package-vc-install (name-or-url &optional name rev backend)
-  "Fetch a package NAME-OR-URL and set it up for using with Emacs.
-If NAME-OR-URL is a URL, download the package from the repository
-at that URL; the function will try to guess the name of the package
-from the URL.  Otherwise NAME-OR-URL should be a symbol whose name
-is the package name, and the URL for the package will be taken from
-the package's metadata.
+(defun package-vc-install (package &optional name rev backend)
+  "Fetch a PACKAGE and set it up for using with Emacs.
+
+If PACKAGE is a string containing an URL, download the package
+from the repository at that URL; the function will try to guess
+the name of the package from the URL.  This can be overridden by
+passing the optional argument NAME.  If PACKAGE is a cons-cell,
+it should have the form (NAME . SPEC), where NAME is a symbol
+indicating the package name and SPEC is a plist as described in
+`package-vc-selected-packages'.  Otherwise PACKAGE should be a
+symbol whose name is the package name, and the URL for the
+package will be taken from the package's metadata.
+
 By default, this function installs the last version of the package
 available from its repository, but if REV is given and non-nil, it
 specifies the revision to install.  If REV has the special value
 `:last-release' (interactively, the prefix argument), that stands
 for the last released version of the package.
-When calling from Lisp, optional argument NAME overrides the package
-name as deduced from NAME-OR-URL.
+
 Optional argument BACKEND specifies the VC backend to use for cloning
 the package's repository; this is only possible if NAME-OR-URL is a URL,
 a string.  If BACKEND is omitted or nil, the function
@@ -663,17 +668,23 @@ package-vc-install
              (and current-prefix-arg :last-release)))))
   (package-vc--archives-initialize)
   (cond
-   ((null name-or-url)
+   ((null package)
     (signal 'wrong-type-argument nil))
-   ((and-let* (((stringp name-or-url))
-               (backend (or backend (package-vc--guess-backend name-or-url))))
+   ((consp package)
+    (package-vc--unpack
+     (package-desc-create :name (car package)
+                          :kind 'vc)
+     (cdr package)
+     rev))
+   ((and-let* (((stringp package))
+               (backend (or backend (package-vc--guess-backend package))))
       (package-vc--unpack
        (package-desc-create
-        :name (or name (intern (file-name-base name-or-url)))
+        :name (or name (intern (file-name-base package)))
         :kind 'vc)
-       (list :vc-backend backend :url name-or-url)
+       (list :vc-backend backend :url package)
        rev)))
-   ((and-let* ((desc (assoc name-or-url package-archive-contents #'string=)))
+   ((and-let* ((desc (assoc package package-archive-contents #'string=)))
       (package-vc--unpack
        (let ((copy (copy-package-desc (cadr desc))))
          (setf (package-desc-kind copy) 'vc)
@@ -683,9 +694,9 @@ package-vc-install
                       (url (alist-get :url extras))
                       (backend (package-vc--guess-backend url)))
              (list :vc-backend backend :url url))
-           (user-error "Package `%s' has no VC data" name-or-url))
+           (user-error "Package `%s' has no VC data" package))
        rev)))
-   ((user-error "Unknown package to fetch: %s" name-or-url))))
+   ((user-error "Unknown package to fetch: %s" package))))
 
 ;;;###autoload
 (defun package-vc-checkout (pkg-desc directory &optional rev)

commit 874d8a418f30f97c3099af1ca9a001f5bda05b6a
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Tue Nov 15 15:40:58 2022 +0100

    Only fetch elpa-packages.eld when necessary
    
    * lisp/emacs-lisp/package-vc.el: Remove hook from
    'package-refresh-contents-hook'.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 368667814c..e8cae75c9c 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -267,7 +267,6 @@ package-vc--download-and-read-archives
       (error (message "Failed to download `%s' archive." (car archive))))))
 
 (add-hook 'package-read-archive-hook     #'package-vc--read-archive-data 20)
-(add-hook 'package-refresh-contents-hook #'package-vc--download-and-read-archives 20)
 
 (defun package-vc-commit (pkg)
   "Return the last commit of a development package PKG."

commit 228c247e6ff79b5aeb4cf65911fdea60d1f8edcf
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Tue Nov 15 14:36:26 2022 +0100

    Remove duplicate package descriptions after updating
    
    * lisp/emacs-lisp/package-vc.el (package-vc--unpack-1): Ensure there
    is always just one instance of a package description in 'package-alist'.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index bf8deb2024..368667814c 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -386,6 +386,11 @@ package-vc--unpack-1
 autoloads, generating a package description file (used to
 identify a package as a source package later on), building
 documentation and marking the package as installed."
+  ;; Remove any previous instance of PKG-DESC from `package-alist'
+  (let ((pkgs (assq (package-desc-name pkg-desc) package-alist)))
+    (when pkgs
+      (setf (cdr pkgs) (delq pkg-desc (cdr pkgs)))))
+
   ;; In case the package was installed directly from source, the
   ;; dependency list wasn't know beforehand, and they might have
   ;; to be installed explicitly.

commit 32f51f17c425baf6e816a51f0823d58ef79f3d3d
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Tue Nov 15 13:27:59 2022 +0100

    Remove temporary .texi files if used to build documentation
    
    * lisp/emacs-lisp/package-vc.el (package-vc--build-documentation):
    Remember if a temporary file was generated and delete it afterwards.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 78d09400c9..bf8deb2024 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -355,14 +355,16 @@ package-vc--build-documentation
 otherwise it's assumed to be an Info file."
   (let* ((pkg-name (package-desc-name pkg-desc))
          (default-directory (package-desc-dir pkg-desc))
-         (output (expand-file-name (format "%s.info" pkg-name))))
+         (output (expand-file-name (format "%s.info" pkg-name)))
+         clean-up)
     (when (string-match-p "\\.org\\'" file)
       (require 'ox)
       (require 'ox-texinfo)
       (with-temp-buffer
         (insert-file-contents file)
         (setq file (make-temp-file "ox-texinfo-"))
-        (org-export-to-file 'texinfo file)))
+        (org-export-to-file 'texinfo file)
+        (setq clean-up t)))
     (with-current-buffer (get-buffer-create " *package-vc doc*")
       (erase-buffer)
       (cond
@@ -374,7 +376,9 @@ package-vc--build-documentation
                             output (expand-file-name "dir")))
         (message "Failed to install manual %s, see buffer %S"
                  output (buffer-name)))
-       ((kill-buffer))))))
+       ((kill-buffer))))
+    (when clean-up
+      (delete-file file))))
 
 (defun package-vc--unpack-1 (pkg-desc pkg-dir)
   "Prepare PKG-DESC that is already checked-out in PKG-DIR.

commit 11cb8103565abfd67e3ba18d638d63a4fc5a0970
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Tue Nov 15 11:03:58 2022 +0100

    Fix the behaviour of 'byte-compile-ignore-files'
    
    * lisp/emacs-lisp/bytecomp.el (byte-recompile-directory): Negate the
    'string-match-p' check.  (Bug#59139)

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index c685e5087f..c81c42e042 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1941,11 +1941,10 @@ byte-recompile-directory
 		      ;; This file is a subdirectory.  Handle them differently.
 		      (or (null arg) (eq 0 arg)
 			  (y-or-n-p (concat "Check " source "? ")))
-		      (setq directories (nconc directories (list source)))
                       ;; Directory is requested to be ignored
-                      (string-match-p
-                       (regexp-opt byte-compile-ignore-files)
-                       source)
+                      (not (string-match-p
+                            (regexp-opt byte-compile-ignore-files)
+                            source))
                       (setq directories (nconc directories (list source))))
                ;; It is an ordinary file.  Decide whether to compile it.
                (if (and (string-match emacs-lisp-file-regexp source)

commit 345bfd376e3e29426529a4c99930a36a04c7bb2f
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Tue Nov 15 11:00:14 2022 +0100

    Add missing elpa-package.eld to package test resources

diff --git a/test/lisp/emacs-lisp/package-resources/elpa-packages.eld b/test/lisp/emacs-lisp/package-resources/elpa-packages.eld
new file mode 100644
index 0000000000..7884aac278
--- /dev/null
+++ b/test/lisp/emacs-lisp/package-resources/elpa-packages.eld
@@ -0,0 +1,3 @@
+;; Dummy elpa-package.eld
+
+(() :version 1)
diff --git a/test/lisp/emacs-lisp/package-resources/newer-versions/elpa-packages.eld b/test/lisp/emacs-lisp/package-resources/newer-versions/elpa-packages.eld
new file mode 100644
index 0000000000..7884aac278
--- /dev/null
+++ b/test/lisp/emacs-lisp/package-resources/newer-versions/elpa-packages.eld
@@ -0,0 +1,3 @@
+;; Dummy elpa-package.eld
+
+(() :version 1)
diff --git a/test/lisp/emacs-lisp/package-resources/signed/elpa-packages.eld b/test/lisp/emacs-lisp/package-resources/signed/elpa-packages.eld
new file mode 100644
index 0000000000..7884aac278
--- /dev/null
+++ b/test/lisp/emacs-lisp/package-resources/signed/elpa-packages.eld
@@ -0,0 +1,3 @@
+;; Dummy elpa-package.eld
+
+(() :version 1)
diff --git a/test/lisp/emacs-lisp/package-resources/signed/elpa-packages.eld.sig b/test/lisp/emacs-lisp/package-resources/signed/elpa-packages.eld.sig
new file mode 100644
index 0000000000..39202ca75e
Binary files /dev/null and b/test/lisp/emacs-lisp/package-resources/signed/elpa-packages.eld.sig differ
diff --git a/test/lisp/emacs-lisp/package-resources/signed/update-signatures.sh b/test/lisp/emacs-lisp/package-resources/signed/update-signatures.sh
index 30e74156c0..ddd96748ec 100755
--- a/test/lisp/emacs-lisp/package-resources/signed/update-signatures.sh
+++ b/test/lisp/emacs-lisp/package-resources/signed/update-signatures.sh
@@ -30,4 +30,5 @@ GPG=
 #$GPG --export-secret-keys -armor > "../key.sec"
 $GPG --import ../key.sec
 $GPG --detach-sign --sign "./archive-contents"
+$GPG --detach-sign --sign "./elpa-packages.eld"
 $GPG --detach-sign --sign "./signed-good-1.0.el"
diff --git a/test/lisp/emacs-lisp/package-resources/with-nil-entry/elpa-packages.eld b/test/lisp/emacs-lisp/package-resources/with-nil-entry/elpa-packages.eld
new file mode 100644
index 0000000000..7884aac278
--- /dev/null
+++ b/test/lisp/emacs-lisp/package-resources/with-nil-entry/elpa-packages.eld
@@ -0,0 +1,3 @@
+;; Dummy elpa-package.eld
+
+(() :version 1)

commit 33263377767be2826b4b31695a2e310f2ab021d9
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Tue Nov 15 10:46:23 2022 +0100

    Avoid destructive manipulation of 'package-vc--archive-spec-alist'
    
    * lisp/emacs-lisp/package-vc.el (package-vc--desc->spec): Replace
    'mapcar' with 'apply'.  This is done to avoid unintentional cycles.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 289f8e37ce..78d09400c9 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -218,7 +218,7 @@ package-vc--desc->spec
    (if (package-desc-archive pkg-desc)
        (alist-get (intern (package-desc-archive pkg-desc))
                   package-vc--archive-spec-alist)
-     (mapcan #'append (mapcar #'cdr package-vc--archive-spec-alist)))
+     (apply #'append (mapcar #'cdr package-vc--archive-spec-alist)))
    nil nil #'string=))
 
 (define-inline package-vc--query-spec (pkg-desc prop)

commit 7ab556b57631cb28db86b89ba296bc0599d9a399
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Tue Nov 15 10:20:01 2022 +0100

    Improve robustness of 'package-vc-update'
    
    * lisp/emacs-lisp/package-vc.el (package-vc-update): Ensure that the
    command is only invoked with installed packages. that the hook is
    always removed and that 'vc-pull' is always called in the right
    directory.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 9d8d3ee5f4..289f8e37ce 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -562,7 +562,7 @@ package-vc-update-all
 
 (defun package-vc-update (pkg-desc)
   "Attempt to update the package PKG-DESC."
-  (interactive (list (package-vc--read-package-desc "Update source package:")))
+  (interactive (list (package-vc--read-package-desc "Update source package: " t)))
   ;; HACK: To run `package-vc--unpack-1' after checking out the new
   ;; revision, we insert a hook into `vc-post-command-functions', and
   ;; remove it right after it ran.  To avoid running the hook multiple
@@ -577,28 +577,23 @@ package-vc-update
   ;; If there is a better way to do this, it should be done.
   (cl-assert (package-vc-p pkg-desc))
   (letrec ((pkg-dir (package-desc-dir pkg-desc))
-           (empty (make-symbol "empty"))
-           (args (list empty empty empty empty))
+           (vc-flags)
            (vc-filter-command-function
             (lambda (command file-or-list flags)
-              (setf (nth 0 args) command
-                    (nth 1 args) file-or-list
-                    (nth 2 args) flags
-                    (nth 3 args) default-directory)
+              (setq vc-flags flags)
               (list command file-or-list flags)))
            (post-upgrade
-            (lambda (command file-or-list flags)
-              (when (and (memq (nth 0 args) (list command empty))
-                         (memq (nth 1 args) (list file-or-list empty))
-                         (memq (nth 2 args) (list flags empty))
-                         (or (eq (nth 3 args) empty)
-                             (file-equal-p (nth 3 args) default-directory)))
-                (with-demoted-errors "Failed to activate: %S"
-                  (package-vc--unpack-1 pkg-desc pkg-dir))
-                (remove-hook 'vc-post-command-functions post-upgrade)))))
+            (lambda (_command _file-or-list flags)
+              (when (and (file-equal-p pkg-dir default-directory)
+                         (eq flags vc-flags))
+                (unwind-protect
+                    (with-demoted-errors "Failed to activate: %S"
+                      (package-vc--unpack-1 pkg-desc pkg-dir))
+                  (remove-hook 'vc-post-command-functions post-upgrade))))))
     (add-hook 'vc-post-command-functions post-upgrade)
     (with-demoted-errors "Failed to fetch: %S"
-      (vc-pull))))
+      (let ((default-directory pkg-dir))
+        (vc-pull)))))
 
 (defun package-vc--archives-initialize ()
   "Initialize package.el and fetch package specifications."

commit fd4da9151f9434e63c3e1da8fc3de20e49a6d234
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Mon Nov 14 14:24:14 2022 +0100

    * lisp/vc/vc.el (vc-default-last-change): Use 'vc-call'

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index adf5722998..990b03b4c7 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -3615,9 +3615,7 @@ vc-default-last-change
                      file (current-buffer))
     (goto-char (point-min))
     (forward-line (1- line))
-    (let ((rev (vc-call-backend
-                (vc-backend file)
-                'annotate-extract-revision-at-line)))
+    (let ((rev (vc-call annotate-extract-revision-at-line file)))
       (if (consp rev) (car rev) rev))))
 
 

commit d0ea38b5fe0b34cd3833d451cc56dbaadc06d51d
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Sun Nov 13 17:05:20 2022 +0100

    Have 'vc-prepare-patch' handle prefix arguments.
    
    * lisp/emacs-lisp/package-vc.el (package-vc-prepare-patch): Use
    'vc-prepare-patch-prompt-revisions'.
    * lisp/vc/vc.el (vc-prepare-patch-prompt-revisions): Extract common
    function and handle prefix arguments.
    (vc-prepare-patch): Pull logic out to
    'vc-prepare-patch-prompt-revisions'.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index acef568e54..9d8d3ee5f4 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -750,20 +750,20 @@ package-vc-rebuild
   (package-vc--unpack-1 pkg-desc (package-desc-dir pkg-desc)))
 
 ;;;###autoload
-(defun package-vc-prepare-patch (pkg subject revisions)
+(defun package-vc-prepare-patch (pkg-desc subject revisions)
   "Send patch for REVISIONS to maintainer of the package PKG using SUBJECT.
-SUBJECT and REVISIONS are passed on to `vc-prepare-patch', which see.
-PKG must be a package description.
-Interactively, prompt for PKG, SUBJECT, and REVISIONS.  However,
-if the current buffer has marked commit log entries, REVISIONS
-are the tags of the marked entries, see `log-view-get-marked'."
+The function uses `vc-prepare-patch', passing SUBJECT and
+REVISIONS directly.  PKG-DESC must be a package description.
+Interactively, prompt for PKG-DESC, SUBJECT, and REVISIONS.  When
+invoked with a numerical prefix argument, use the last N
+revisions.  When invoked interactively in a Log View buffer with
+marked revisions, use those."
   (interactive
    (list (package-vc--read-package-desc "Package to prepare a patch for: " t)
          (and (not vc-prepare-patches-separately)
               (read-string "Subject: " "[PATCH] " nil nil t))
-         (or (log-view-get-marked)
-             (vc-read-multiple-revisions "Revisions: "))))
-  (vc-prepare-patch (package-maintainers pkg t)
+         (vc-prepare-patch-prompt-revisions)))
+  (vc-prepare-patch (package-maintainers pkg-desc t)
                     subject revisions))
 
 (provide 'package-vc)
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index fd59c95fc8..adf5722998 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -3384,25 +3384,43 @@ vc-default-prepare-patch
                                (vc-root-dir))))
             :buffer (current-buffer)))))
 
+(defun vc-prepare-patch-prompt-revisions ()
+  "Prompt the user for a list revisions.
+Prepare a default value, depending on the current context.  With
+a numerical prefix argument, use the last N revisions as the
+default value.  If the current buffer is a log-view buffer, use
+the marked commits.  Otherwise fall back to the working revision
+of the current file."
+  (vc-read-multiple-revisions
+   "Revisions: " nil nil nil
+   (or (and-let* ((arg current-prefix-arg)
+                  (fs (vc-deduce-fileset t)))
+         (cl-loop with file = (caadr fs)
+                  repeat (prefix-numeric-value arg)
+                  for rev = (vc-working-revision file)
+                  then (vc-call-backend
+                        (car fs) 'previous-revision
+                        file rev)
+                  when rev collect it into revs
+                  finally return (mapconcat #'identity revs ",")))
+       (and-let* ((revs (log-view-get-marked)))
+         (mapconcat #'identity revs ","))
+       (and-let* ((file (buffer-file-name)))
+         (vc-working-revision file)))))
+
 ;;;###autoload
 (defun vc-prepare-patch (addressee subject revisions)
   "Compose an Email sending patches for REVISIONS to ADDRESSEE.
-If `vc-prepare-patches-separately' is nil, SUBJECT will be used
-as the default subject for the message (and it will be prompted
-for when called interactively).  Otherwise a separate message
-will be composed for each revision, with SUBJECT derived from the
-invidividual commits.
-
-When invoked interactively in a Log View buffer with marked
-revisions, those revisions will be used."
+If `vc-prepare-patches-separately' is nil, use SUBJECT as the
+default subject for the message, or prompt a subject when invoked
+interactively.  Otherwise compose a separate message for each
+revision, with SUBJECT derived from each revision subject.
+When invoked with a numerical prefix argument, use the last N
+revisions.
+When invoked interactively in a Log View buffer with
+marked revisions, use those these."
   (interactive
-   (let ((revs (vc-read-multiple-revisions
-                "Revisions: " nil nil nil
-                (or (and-let* ((revs (log-view-get-marked)))
-                      (mapconcat #'identity revs ","))
-                    (and-let* ((file (buffer-file-name)))
-                      (vc-working-revision file)))))
-         to)
+   (let ((revs (vc-prepare-patch-prompt-revisions)) to)
      (require 'message)
      (while (null (setq to (completing-read-multiple
                             (format-prompt

commit 4aee4cde3aa3d9cdf4184af7c06f9ea7464c8824
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Sun Nov 13 08:18:49 2022 +0100

    Explain that 'package-vc-install' doesn't remove tarball packages
    
    * lisp/emacs-lisp/package-vc.el (package-vc-install): Expand documentation.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 96ae518b21..acef568e54 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -645,7 +645,9 @@ package-vc-install
 Optional argument BACKEND specifies the VC backend to use for cloning
 the package's repository; this is only possible if NAME-OR-URL is a URL,
 a string.  If BACKEND is omitted or nil, the function
-uses `package-vc-heuristic-alist' to guess the backend."
+uses `package-vc-heuristic-alist' to guess the backend.
+Note that by default, a source package will be prioritised over a
+regular package, but it will not remove a source package."
   (interactive
    (progn
      ;; Initialize the package system to get the list of package

commit a467afbd982db5c5dc9e834c9db3244d21379586
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Sun Nov 13 08:17:07 2022 +0100

    Mention package name when package is lacking VC data
    
    * lisp/emacs-lisp/package-vc.el (package-vc-install): Add package name.
    (package-vc-checkout): Add package name.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index b93205e558..96ae518b21 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -678,7 +678,7 @@ package-vc-install
                       (url (alist-get :url extras))
                       (backend (package-vc--guess-backend url)))
              (list :vc-backend backend :url url))
-           (user-error "Package has no VC data"))
+           (user-error "Package `%s' has no VC data" name-or-url))
        rev)))
    ((user-error "Unknown package to fetch: %s" name-or-url))))
 
@@ -706,7 +706,8 @@ package-vc-checkout
                                  (url (alist-get :url extras))
                                  (backend (package-vc--guess-backend url)))
                         (list :vc-backend backend :url url))
-                      (user-error "Package has no VC data"))))
+                      (user-error "Package `%s' has no VC data"
+                                  (package-desc-name pkg-desc)))))
     (package-vc--clone pkg-desc pkg-spec directory rev)
     (find-file directory)))
 

commit c8e5069e6d2f9c443ab7b5184a0f42c8a8ad7127
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Sun Nov 13 08:12:18 2022 +0100

    Add new command 'package-vc-update-all'
    
    * lisp/emacs-lisp/package-vc.el (package-vc-update-all): Add command
    (package-vc-update): Add an assertion to verify this.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 36d17c6116..b93205e558 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -551,6 +551,15 @@ package-vc--read-package-desc
                (if installed package-alist package-archive-contents)
                #'string=)))
 
+(defun package-vc-update-all ()
+  "Attempt to update all installed VC packages."
+  (interactive)
+  (dolist (package package-alist)
+    (dolist (pkg-desc (cdr package))
+      (when (package-vc-p pkg-desc)
+        (package-vc-update pkg-desc))))
+  (message "Done updating packages."))
+
 (defun package-vc-update (pkg-desc)
   "Attempt to update the package PKG-DESC."
   (interactive (list (package-vc--read-package-desc "Update source package:")))
@@ -566,6 +575,7 @@ package-vc-update
   ;; `package-vc--unpack-1'.  Ugh...
   ;;
   ;; If there is a better way to do this, it should be done.
+  (cl-assert (package-vc-p pkg-desc))
   (letrec ((pkg-dir (package-desc-dir pkg-desc))
            (empty (make-symbol "empty"))
            (args (list empty empty empty empty))

commit aa56e50fe21cd07bc6aab5ceecc2e92288793a8b
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Sat Nov 12 09:18:19 2022 +0100

    Raise 'wrong-type-argument' when installing package nil
    
    * lisp/emacs-lisp/package-vc.el (package-vc-install): Check if the
    package is nil.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 62724d398c..36d17c6116 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -648,6 +648,8 @@ package-vc-install
              (and current-prefix-arg :last-release)))))
   (package-vc--archives-initialize)
   (cond
+   ((null name-or-url)
+    (signal 'wrong-type-argument nil))
    ((and-let* (((stringp name-or-url))
                (backend (or backend (package-vc--guess-backend name-or-url))))
       (package-vc--unpack

commit 496c578d9c8a5482f0e38a2315ce5e40331d48c7
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Sat Nov 12 09:14:33 2022 +0100

    Have 'package-vc-selected-packages' consider all installed packages
    
    * lisp/emacs-lisp/package-vc.el
    (package-vc-install-selected-packages): Consider more than just one
    value in `package-alist', in case there are multiple installations.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 7fed1b5885..62724d398c 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -119,9 +119,8 @@ package-vc-install-selected-packages
   (pcase-dolist (`(,name . ,spec) package-vc-selected-packages)
     (when (stringp name)
       (setq name (intern name)))
-    (let ((pkg-desc (cadr (assoc name package-alist #'string=))))
-      (unless (and name (package-installed-p name)
-                   (package-vc-p pkg-desc))
+    (let ((pkg-descs (assoc name package-alist #'string=)))
+      (unless (seq-some #'package-vc-p (cdr pkg-descs))
         (cond
          ((null spec)
           (package-vc-install name))
@@ -129,7 +128,7 @@ package-vc-install-selected-packages
           (package-vc-install name nil spec))
          ((listp spec)
           (package-vc--archives-initialize)
-          (package-vc--unpack pkg-desc spec)))))))
+          (package-vc--unpack (cadr pkg-descs) spec)))))))
 
 ;;;###autoload
 (defcustom package-vc-selected-packages '()

commit 2ed115fc3ca98efb83206afa608f94edc48782d6
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Fri Nov 11 18:34:14 2022 +0100

    Fix indefinite loading of asynchronous downloads
    
    * lisp/emacs-lisp/package.el (package--download-one-archive): Only add
    the archive that is actually being downloaded to
    'package--downloads-in-progress'.

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 23e0bb15d0..f9786febf4 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1787,7 +1787,7 @@ package--download-one-archive
 \"archives/NAME/FILE\" in `package-user-dir'."
   ;; The downloaded archive contents will be read as part of
   ;; `package--update-downloads-in-progress'.
-  (dolist (archive package-archives)
+  (when async
     (cl-pushnew (cons archive file) package--downloads-in-progress
                 :test #'equal))
   (package--with-response-buffer (cdr archive) :file file

commit ccd7ab84c5a8685c66ee1b62cb486c00edd2d992
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Fri Nov 11 18:32:13 2022 +0100

    Fix edebug spec for 'package--with-response-buffer'
    
    * lisp/emacs-lisp/package.el (package--with-response-buffer): Add a
    spec that makes the macro debuggable.

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 8e6e7b7dcf..23e0bb15d0 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1363,10 +1363,7 @@ package--with-response-buffer
 errors signaled by ERROR-FORM or by BODY).
 
 \(fn URL &key ASYNC FILE ERROR-FORM NOERROR &rest BODY)"
-  (declare (indent defun)
-           ;; FIXME: This should be something like
-           ;; `form def-body &rest form', but that doesn't work.
-           (debug (form &rest sexp)))
+  (declare (indent defun) (debug (sexp body)))
   (while (keywordp (car body))
     (setq body (cdr (cdr body))))
   `(package--with-response-buffer-1 ,url (lambda () ,@body)

commit 7c3d3fa44e666b71881c34afa3d357feec758ec0
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Fri Nov 11 00:09:46 2022 +0100

    Improve robustness of documentation generation
    
    * lisp/emacs-lisp/package-vc.el (package-vc--build-documentation): Log
    output and display error messages if anything goes wrong.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index d9b335f1cf..7fed1b5885 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -355,10 +355,8 @@ package-vc--build-documentation
 FILE can be an Org file, indicated by its \".org\" extension,
 otherwise it's assumed to be an Info file."
   (let* ((pkg-name (package-desc-name pkg-desc))
-         (pkg-dir (package-desc-dir pkg-desc))
-         (output (file-name-concat
-                  (format "%s.info" pkg-name)
-                  pkg-dir)))
+         (default-directory (package-desc-dir pkg-desc))
+         (output (expand-file-name (format "%s.info" pkg-name))))
     (when (string-match-p "\\.org\\'" file)
       (require 'ox)
       (require 'ox-texinfo)
@@ -366,10 +364,18 @@ package-vc--build-documentation
         (insert-file-contents file)
         (setq file (make-temp-file "ox-texinfo-"))
         (org-export-to-file 'texinfo file)))
-    (call-process "makeinfo" nil nil nil
-                  "--no-split" file "-o" output)
-    (call-process "install-info" nil nil nil
-                  output pkg-dir)))
+    (with-current-buffer (get-buffer-create " *package-vc doc*")
+      (erase-buffer)
+      (cond
+       ((/= 0 (call-process "makeinfo" nil t nil
+                            "--no-split" file "-o" output))
+        (message "Failed to build manual %s, see buffer %S"
+                 file (buffer-name)))
+       ((/= 0 (call-process "install-info" nil t nil
+                            output (expand-file-name "dir")))
+        (message "Failed to install manual %s, see buffer %S"
+                 output (buffer-name)))
+       ((kill-buffer))))))
 
 (defun package-vc--unpack-1 (pkg-desc pkg-dir)
   "Prepare PKG-DESC that is already checked-out in PKG-DIR.

commit a6cd44734d33a37dfef2a989b79cba41da71e2f8
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Thu Nov 10 21:55:30 2022 +0100

    Remove unused variable in 'package-vc--unpack'
    
    * lisp/emacs-lisp/package-vc.el (package-vc--unpack): Remove 'url'.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 70d9ac98d7..d9b335f1cf 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -500,7 +500,7 @@ package-vc--unpack
 how to fetch and build the package.  See `package-vc--archive-spec-alist'
 for details.  The optional argument REV specifies a specific revision to
 checkout.  This overrides the `:branch' attribute in PKG-SPEC."
-  (pcase-let* (((map :url :lisp-dir) pkg-spec)
+  (pcase-let* (((map :lisp-dir) pkg-spec)
                (name (package-desc-name pkg-desc))
                (dirname (package-desc-full-name pkg-desc))
                (pkg-dir (expand-file-name dirname package-user-dir)))

commit 348f7d263c56ad48e871b2901307684b5c49b149
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Thu Nov 10 21:52:46 2022 +0100

    Move package spec documentation to 'package-vc-selected-packages'
    
    * lisp/emacs-lisp/package-vc.el (package-vc-selected-packages): Add
    documentation.
    (package-vc--archive-spec-alist): Remove documentation.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index ad12008fce..70d9ac98d7 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -139,9 +139,31 @@ package-vc-selected-packages
 
 - nil, if any package version can be installed;
 - a version string, if that specific revision is to be installed;
-- a property list of the form described in
-  `package-vc-archive-spec-alist', giving a package
-  specification.
+- a property list.  Valid key/value pairs are
+
+   `:url' (string)
+      The URL of the repository used to fetch the package source.
+
+   `:branch' (string)
+      If given, the name of the branch to checkout after cloning the directory.
+
+   `:lisp-dir' (string)
+      The repository-relative name of the directory to use for loading the Lisp
+      sources.  If not given, the value defaults to the root directory
+      of the repository.
+
+   `:main-file' (string)
+      The main file of the project, relevant to gather package metadata.
+      If not given, the assumed default is the package name with \".el\"
+      appended to it.
+
+   `:vc-backend' (symbol)
+      A symbol of the VC backend to use for cloning the package.  The
+      value ought to be a member of `vc-handled-backends'.  If omitted,
+      `vc-clone' will fall back onto the archive default or on
+      `package-vc-default-backend'.
+
+  All other values are ignored.
 
 This user option differs from `package-selected-packages' in that
 it is meant to be specified manually.  If you want to install all
@@ -168,32 +190,8 @@ package-vc-selected-packages
 
 (defvar package-vc--archive-spec-alist nil
   "List of package specifications for each archive.
-The list maps each package name, as a string, to a plist.
-Valid keys and the corresponding value types are:
-
- `:url' (string)
-    The URL of the repository used to fetch the package source.
-
- `:branch' (string)
-    If given, the name of the branch to checkout after cloning the directory.
-
- `:lisp-dir' (string)
-    The repository-relative name of the directory to use for loading the Lisp
-    sources.  If not given, the value defaults to the root directory
-    of the repository.
-
- `:main-file' (string)
-    The main file of the project, relevant to gather package metadata.
-    If not given, the assumed default is the package name with \".el\"
-    appended to it.
-
- `:vc-backend' (symbol)
-    A symbol of the VC backend to use for cloning the package.  The
-    value ought to be a member of `vc-handled-backends'.  If omitted,
-    `vc-clone' will fall back onto the archive default or on
-    `package-vc-default-backend'.
-
-All other values are ignored.")
+The list maps each package name, as a string, to a plist as
+specified in `package-vc-selected-packages'.")
 
 (defvar package-vc--archive-data-alist nil
   "List of package specification metadata for archives.

commit 2b93d0e6f1f23e050d1be09efc71ed3f8571b661
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Thu Nov 10 19:18:00 2022 +0100

    Fix type error in package-vc prompt function
    
    * lisp/emacs-lisp/package-vc.el (package-vc--read-package-name):  Pass
    (not allow-url) as REQUIRE-MATCH, not as INITIAL-INPUT.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 620b21d0a1..ad12008fce 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -536,7 +536,7 @@ package-vc--read-package-name
                            (and-let* ((extras (package-desc-extras (cadr pkg)))
                                       (url (alist-get :url extras))
                                       ((package-vc--guess-backend url)))))))
-                   nil (not allow-url)))
+                   (not allow-url)))
 
 (defun package-vc--read-package-desc (prompt &optional installed)
   "Query the user for a source package and return a description with PROMPT.

commit c53c5f388470188632d518df68cff1204c930c49
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Sun Nov 13 00:59:35 2022 +0100

    Rename 'package-vc-refresh' to 'package-vc-rebuild'
    
    * doc/emacs/package.texi (Fetching Package Sources): Update documentation.
    * lisp/emacs-lisp/package-vc.el (package-vc-refresh): Rename from.
    (package-vc-rebuild): Rename to.
    
    This intends to clarify the intention and avoid confusion with
    'package-refresh-contents'.  Thanks to Rudolf Adamkovič for the
    suggestion.

diff --git a/doc/emacs/package.texi b/doc/emacs/package.texi
index a0f02f38b7..cd4c113ae5 100644
--- a/doc/emacs/package.texi
+++ b/doc/emacs/package.texi
@@ -593,7 +593,7 @@ Fetching Package Sources
 @code{package-vc-prepare-patch} to share it.  @xref{Preparing Patches}.
 
 @findex package-vc-install-from-checkout
-@findex package-vc-refresh
+@findex package-vc-rebuild
   If you maintain your own packages you might want to use a local
 checkout instead of cloning a remote repository.  You can do this by
 using @code{package-vc-install-from-checkout}, which creates a symbolic link
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 8031bea490..620b21d0a1 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -720,10 +720,15 @@ package-vc-install-from-checkout
                          pkg-dir)))
 
 ;;;###autoload
-(defun package-vc-refresh (pkg-desc)
-  "Refresh the installation for package given by PKG-DESC.
-Interactively, prompt for the name of the package to refresh."
-  (interactive (list (package-vc--read-package-desc "Refresh package: " t)))
+(defun package-vc-rebuild (pkg-desc)
+  "Rebuild the installation for package given by PKG-DESC.
+Rebuilding an installation means scraping for new autoload
+cookies, re-compiling Emacs Lisp files, building and installing
+any documentation, downloading any missing dependencies.  This
+command does not fetch new revisions from a remote server.  That
+is the responsibility of `package-vc-update'.  Interactively,
+prompt for the name of the package to rebuild."
+  (interactive (list (package-vc--read-package-desc "Rebuild package: " t)))
   (package-vc--unpack-1 pkg-desc (package-desc-dir pkg-desc)))
 
 ;;;###autoload

commit 2ec02024ab70802b793ecd9b0bbc5a5c81398516
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Wed Nov 9 09:35:11 2022 +0100

    Track 'default-directory' while updating source packages
    
    * lisp/emacs-lisp/package-vc.el (package-vc-update): Add the source
    directory to the identifier list, in case the remaining
    'vc-do-command' arguments are all read-time constants.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 548e788011..8031bea490 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -564,19 +564,22 @@ package-vc-update
   ;;
   ;; If there is a better way to do this, it should be done.
   (letrec ((pkg-dir (package-desc-dir pkg-desc))
-           (empty (make-symbol empty))
-           (args (list empty empty empty))
+           (empty (make-symbol "empty"))
+           (args (list empty empty empty empty))
            (vc-filter-command-function
             (lambda (command file-or-list flags)
               (setf (nth 0 args) command
                     (nth 1 args) file-or-list
-                    (nth 2 args) flags)
+                    (nth 2 args) flags
+                    (nth 3 args) default-directory)
               (list command file-or-list flags)))
            (post-upgrade
             (lambda (command file-or-list flags)
               (when (and (memq (nth 0 args) (list command empty))
                          (memq (nth 1 args) (list file-or-list empty))
-                         (memq (nth 2 args) (list flags empty)))
+                         (memq (nth 2 args) (list flags empty))
+                         (or (eq (nth 3 args) empty)
+                             (file-equal-p (nth 3 args) default-directory)))
                 (with-demoted-errors "Failed to activate: %S"
                   (package-vc--unpack-1 pkg-desc pkg-dir))
                 (remove-hook 'vc-post-command-functions post-upgrade)))))

commit d67b66f8abb72369d77bd800301eb74b8b9ad321
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Tue Nov 8 23:45:35 2022 +0100

    Respect :lisp-dir in package specs by loading a sub-directory
    
    * lisp/emacs-lisp/package-vc.el (package-vc-repository-store): Remove
    obsolete variable.
    (package-vc--unpack-1): Respect :lisp-dir.
    (package-vc--unpack): Add :lisp-dir to the package description if
    necessary.
    * lisp/emacs-lisp/package.el (package--delete-directory): Check if a
    directory is a symbolic link.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index b1da2c010f..548e788011 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -49,7 +49,6 @@
 (require 'lisp-mnt)
 (require 'vc)
 (require 'seq)
-(require 'xdg)
 
 (defgroup package-vc nil
   "Manage packages from VC checkouts."
@@ -100,12 +99,6 @@ package-vc-heuristic-alist
                                               vc-handled-backends)))
   :version "29.1")
 
-(defcustom package-vc-repository-store
-  (expand-file-name "emacs/vc-packages" (xdg-data-home))
-  "Directory used by to store repositories."
-  :type 'directory
-  :version "29.1")
-
 (defcustom package-vc-default-backend 'Git
   "Default VC backend used when cloning a package repository.
 If no repository type was specified or could be guessed by
@@ -390,7 +383,7 @@ package-vc--unpack-1
   ;; dependency list wasn't know beforehand, and they might have
   ;; to be installed explicitly.
   (let (deps)
-    (dolist (file (directory-files pkg-dir t "\\.el\\'" t))
+    (dolist (file (directory-files (package-lisp-dir pkg-desc) t "\\.el\\'" t))
       (with-temp-buffer
         (insert-file-contents file)
         (when-let* ((require-lines (lm-header-multiline "package-requires")))
@@ -406,10 +399,26 @@ package-vc--unpack-1
      (package-compute-transaction nil (delete-dups deps))))
 
   (let ((default-directory (file-name-as-directory pkg-dir))
-        (name (package-desc-name pkg-desc))
         (pkg-file (expand-file-name (package--description-file pkg-dir) pkg-dir)))
     ;; Generate autoloads
-    (package-generate-autoloads name pkg-dir)
+    (let* ((name (package-desc-name pkg-desc))
+           (auto-name (format "%s-autoloads.el" name))
+           (extras (package-desc-extras pkg-desc))
+           (lisp-dir (alist-get :lisp-dir extras)))
+      (package-generate-autoloads
+       name (file-name-concat pkg-dir lisp-dir))
+      (when lisp-dir
+        (write-region
+         (with-temp-buffer
+           (insert ";; Autoload indirection for package-vc\n\n")
+           (prin1 `(load (expand-file-name
+                          ,(file-name-concat lisp-dir auto-name)
+                          (or (and load-file-name
+                                   (file-name-directory load-file-name))
+                              (car load-path))))
+                  (current-buffer))
+           (buffer-string))
+         nil (expand-file-name auto-name pkg-dir))))
 
     ;; Generate package file
     (package-vc--generate-description-file pkg-desc pkg-file)
@@ -496,28 +505,17 @@ package-vc--unpack
   (pcase-let* (((map :url :lisp-dir) pkg-spec)
                (name (package-desc-name pkg-desc))
                (dirname (package-desc-full-name pkg-desc))
-               (pkg-dir (expand-file-name dirname package-user-dir))
-               (real-dir (if (null lisp-dir)
-                             pkg-dir
-                           (unless (file-exists-p package-vc-repository-store)
-                             (make-directory package-vc-repository-store t))
-                           (file-name-concat
-                            package-vc-repository-store
-                            ;; FIXME: We aren't sure this directory
-                            ;; will be unique, but we can try other
-                            ;; names to avoid an unnecessary error.
-                            (file-name-base url)))))
+               (pkg-dir (expand-file-name dirname package-user-dir)))
     (setf (package-desc-dir pkg-desc) pkg-dir)
     (when (file-exists-p pkg-dir)
       (if (yes-or-no-p "Overwrite previous checkout?")
-          (package--delete-directory pkg-dir pkg-desc)
+          (package--delete-directory pkg-dir)
         (error "There already exists a checkout for %s" name)))
-    (package-vc--clone pkg-desc pkg-spec real-dir rev)
-    (unless (eq pkg-dir real-dir)
-      ;; Link from the right position in `repo-dir' to the package
-      ;; directory in the ELPA store.
-      (make-symbolic-link (file-name-concat real-dir lisp-dir) pkg-dir))
+    (package-vc--clone pkg-desc pkg-spec pkg-dir rev)
 
+    (when lisp-dir
+      (push (cons :lisp-dir lisp-dir)
+            (package-desc-extras pkg-desc)))
     (package-vc--unpack-1 pkg-desc pkg-dir)))
 
 (defun package-vc--read-package-name (prompt &optional allow-url installed)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index a7bcdd214c..8e6e7b7dcf 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1090,10 +1090,15 @@ package-generate-autoloads
          (backup-inhibited t)
          (version-control 'never))
     (loaddefs-generate
-     pkg-dir output-file
-     nil
-     "(add-to-list 'load-path (directory-file-name
-                         (or (file-name-directory #$) (car load-path))))")
+     pkg-dir output-file nil
+     (prin1-to-string
+      '(add-to-list
+        'load-path
+        ;; Add the directory that will contain the autoload file to
+        ;; the load path.  We don't hard-code `pkg-dir', to avoid
+        ;; issues if the package directory is moved around.
+        (or (and load-file-name (file-name-directory load-file-name))
+            (car load-path)))))
     (let ((buf (find-buffer-visiting output-file)))
       (when buf (kill-buffer buf)))
     auto-name))
@@ -2419,7 +2424,7 @@ package--newest-p
 
 (declare-function comp-el-to-eln-filename "comp.c")
 (defvar package-vc-repository-store)
-(defun package--delete-directory (dir pkg-desc)
+(defun package--delete-directory (dir)
   "Delete PKG-DESC directory DIR recursively.
 Clean-up the corresponding .eln files if Emacs is native
 compiled."
@@ -2427,17 +2432,8 @@ package--delete-directory
     (cl-loop
      for file in (directory-files-recursively dir "\\.el\\'")
      do (comp-clean-up-stale-eln (comp-el-to-eln-filename file))))
-  (if (and (package-vc-p pkg-desc)
-           (require 'package-vc)   ;load `package-vc-repository-store'
-           (file-in-directory-p dir package-vc-repository-store))
-      (progn
-        (delete-directory
-         (expand-file-name
-          (car (file-name-split
-                (file-relative-name dir package-vc-repository-store)))
-          package-vc-repository-store)
-         t)
-        (delete-file (directory-file-name dir)))
+  (if (file-symlink-p (directory-file-name dir))
+      (delete-file (directory-file-name dir))
     (delete-directory dir t)))
 
 
@@ -2493,7 +2489,7 @@ package-delete
                   (package-desc-name pkg-used-elsewhere-by)))
           (t
            (add-hook 'post-command-hook #'package-menu--post-refresh)
-           (package--delete-directory dir pkg-desc)
+           (package--delete-directory dir)
            ;; Remove NAME-VERSION.signed and NAME-readme.txt files.
            ;;
            ;; NAME-readme.txt files are no longer created, but they

commit 9f4a433b27686aa22652fc6099814ed50f4d2cfd
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Sun Nov 6 21:53:32 2022 +0100

    Fix generation of documentation for source packages
    
    * lisp/emacs-lisp/package-vc.el (package-vc--build-documentation):
    Call "makeinfo" before "install-info"

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 44b310e76d..b1da2c010f 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -363,7 +363,11 @@ package-vc--build-documentation
   "Build documentation for package PKG-DESC from documentation source in FILE.
 FILE can be an Org file, indicated by its \".org\" extension,
 otherwise it's assumed to be an Info file."
-  (let ((pkg-dir (package-desc-dir pkg-desc)))
+  (let* ((pkg-name (package-desc-name pkg-desc))
+         (pkg-dir (package-desc-dir pkg-desc))
+         (output (file-name-concat
+                  (format "%s.info" pkg-name)
+                  pkg-dir)))
     (when (string-match-p "\\.org\\'" file)
       (require 'ox)
       (require 'ox-texinfo)
@@ -371,8 +375,10 @@ package-vc--build-documentation
         (insert-file-contents file)
         (setq file (make-temp-file "ox-texinfo-"))
         (org-export-to-file 'texinfo file)))
+    (call-process "makeinfo" nil nil nil
+                  "--no-split" file "-o" output)
     (call-process "install-info" nil nil nil
-                  file pkg-dir)))
+                  output pkg-dir)))
 
 (defun package-vc--unpack-1 (pkg-desc pkg-dir)
   "Prepare PKG-DESC that is already checked-out in PKG-DIR.

commit 13d051b4434e8931967a43a7e2b76a64cae81617
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Sun Nov 6 17:45:08 2022 +0100

    Remove references to internal symbols from public docstrings
    
    * lisp/emacs-lisp/package-vc.el (package-vc-repository-store):
    Unmention 'package-vc--unpack'.
    (package-vc-install): Unmention 'package-vc--guess-backend' in favour
    of 'package-vc-heuristic-alist'.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 5d9e7c91a5..44b310e76d 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -102,7 +102,7 @@ package-vc-heuristic-alist
 
 (defcustom package-vc-repository-store
   (expand-file-name "emacs/vc-packages" (xdg-data-home))
-  "Directory used by `package-vc--unpack' to store repositories."
+  "Directory used by to store repositories."
   :type 'directory
   :version "29.1")
 
@@ -625,7 +625,7 @@ package-vc-install
 Optional argument BACKEND specifies the VC backend to use for cloning
 the package's repository; this is only possible if NAME-OR-URL is a URL,
 a string.  If BACKEND is omitted or nil, the function
-uses `package-vc--guess-backend' to guess the backend."
+uses `package-vc-heuristic-alist' to guess the backend."
   (interactive
    (progn
      ;; Initialize the package system to get the list of package

commit b0200a37e4d6da32f72ce3832ed44a57934c599c
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Sun Nov 6 13:16:50 2022 +0100

    Expand 'package-vc--unpack-1' documentation
    
    * lisp/emacs-lisp/package-vc.el (package-vc--unpack-1): Explain what
    the function does.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index e1a84c466e..5d9e7c91a5 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -375,7 +375,11 @@ package-vc--build-documentation
                   file pkg-dir)))
 
 (defun package-vc--unpack-1 (pkg-desc pkg-dir)
-  "Install PKG-DESC that is already checked-out in PKG-DIR."
+  "Prepare PKG-DESC that is already checked-out in PKG-DIR.
+This includes downloading missing dependencies, generating
+autoloads, generating a package description file (used to
+identify a package as a source package later on), building
+documentation and marking the package as installed."
   ;; In case the package was installed directly from source, the
   ;; dependency list wasn't know beforehand, and they might have
   ;; to be installed explicitly.

commit f939859fe4eab6774f41030b27f5329afd4e98b1
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Sun Nov 6 12:12:23 2022 +0100

    Clarify 'package-vc--build-documentation' docstring
    
    * lisp/emacs-lisp/package-vc.el (package-vc--build-documentation):
    Rewrite the first line.
    
    As suggested by Eli Zaretskii.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 9288faf380..e1a84c466e 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -360,7 +360,7 @@ package-vc--generate-description-file
 (declare-function org-export-to-file "ox" (backend file))
 
 (defun package-vc--build-documentation (pkg-desc file)
-  "Build documentation FILE for PKG-DESC.
+  "Build documentation for package PKG-DESC from documentation source in FILE.
 FILE can be an Org file, indicated by its \".org\" extension,
 otherwise it's assumed to be an Info file."
   (let ((pkg-dir (package-desc-dir pkg-desc)))

commit 32758c6da0bb9d3de60244e471b73dd43602d7fb
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Sun Nov 6 12:05:32 2022 +0100

    Fix the docstring for 'package-vc--version'
    
    * lisp/emacs-lisp/package-vc.el (package-vc--version): Replace
    docstring.
    
    It seems like this was just copied over from 'package-vc-commit', for
    no good reason.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 1ef7d0d318..9288faf380 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -291,7 +291,7 @@ package-vc-commit
            finally return "unknown"))
 
 (defun package-vc--version (pkg)
-  "Extract the commit of a development package PKG."
+  "Return the version number for the source package PKG."
   (cl-assert (package-vc-p pkg))
   (if-let ((main-file (package-vc--main-file pkg)))
       (with-temp-buffer

commit 83ff0de4cec8ad5342dc5dc2d0dacd0fe29795df
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Sun Nov 6 10:43:44 2022 +0100

    Fix 'package-vc-selected-packages' documentation
    
    * lisp/emacs-lisp/package-vc.el (package-vc-selected-packages): Remove
    reference to non-existent function and add an explanation that the
    value won't override an existing source package installation.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index d6d3f7645e..1ef7d0d318 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -151,8 +151,12 @@ package-vc-selected-packages
   specification.
 
 This user option differs from `package-selected-packages' in that
-it is meant to be specified manually.  You can also use the
-function `package-vc-selected-packages' to apply the changes."
+it is meant to be specified manually.  If you want to install all
+the packages in the list, you cal also use
+`package-vc-install-selected-packages'.
+
+Note that this option will not override an existing source
+package installation or revert the checked out revision."
   :type '(alist :tag "List of packages you want to be installed"
                 :key-type (symbol :tag "Package")
                 :value-type

commit 3ff8310cc303a54e52d92dea3f778c7f3422746d
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Sun Nov 6 10:24:56 2022 +0100

    Mark 'package-vc-update' as interactive
    
    * lisp/emacs-lisp/package-vc.el (package-vc--sourced-packages-list):
    Remove function in favour of 'package-vc--read-package-name'.
    (package-vc--read-package-name):
    Extract out common functionality.
    (package-vc--read-package-desc): Add auxiliary function based on
    'package-vc--read-package-name'.
    (package-vc-update): Add interactive spec using
    'package-vc--read-package-desc'.
    (package-vc-install): Use 'package-vc--read-package-desc'.
    (package-vc-checkout): Use 'package-vc--read-package-desc'.
    (package-vc--read-pkg): Remove in favour of 'package-vc--read-package-desc'.
    (package-vc-refresh): Use 'package-vc--read-package-desc'.
    (package-vc-prepare-patch): Use 'package-vc--read-package-desc'.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index e7b871e171..d6d3f7645e 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -506,21 +506,39 @@ package-vc--unpack
 
     (package-vc--unpack-1 pkg-desc pkg-dir)))
 
-(defun package-vc--sourced-packages-list ()
-  "Generate a list of packages with VC data."
-  (seq-filter
-   (lambda (pkg)
-     (or (package-vc--desc->spec (cadr pkg))
-         ;; If we have no explicit VC data, we can try a kind of
-         ;; heuristic and use the URL header, that might already be
-         ;; pointing towards a repository, and use that as a backup
-         (and-let* ((extras (package-desc-extras (cadr pkg)))
-                    (url (alist-get :url extras))
-                    ((package-vc--guess-backend url))))))
-   package-archive-contents))
+(defun package-vc--read-package-name (prompt &optional allow-url installed)
+  "Query the user for a source package and return a name with PROMPT.
+If the optional argument ALLOW-URL is non-nil, the user is also
+allowed to specify a non-package name.  If the optional argument
+INSTALLED is non-nil, the selection will be filtered down to
+source packages that have already been installed."
+  (package-vc--archives-initialize)
+  (completing-read prompt (if installed package-alist package-archive-contents)
+                   (if installed
+                       (lambda (pkg) (package-vc-p (cadr pkg)))
+                     (lambda (pkg)
+                       (or (package-vc--desc->spec (cadr pkg))
+                           ;; If we have no explicit VC data, we can try a kind of
+                           ;; heuristic and use the URL header, that might already be
+                           ;; pointing towards a repository, and use that as a backup
+                           (and-let* ((extras (package-desc-extras (cadr pkg)))
+                                      (url (alist-get :url extras))
+                                      ((package-vc--guess-backend url)))))))
+                   nil (not allow-url)))
+
+(defun package-vc--read-package-desc (prompt &optional installed)
+  "Query the user for a source package and return a description with PROMPT.
+If the optional argument INSTALLED is non-nil, the selection will
+be filtered down to source packages that have already been
+installed, and the package description will be that of an
+installed package."
+  (cadr (assoc (package-vc--read-package-name prompt nil installed)
+               (if installed package-alist package-archive-contents)
+               #'string=)))
 
 (defun package-vc-update (pkg-desc)
   "Attempt to update the package PKG-DESC."
+  (interactive (list (package-vc--read-package-desc "Update source package:")))
   ;; HACK: To run `package-vc--unpack-1' after checking out the new
   ;; revision, we insert a hook into `vc-post-command-functions', and
   ;; remove it right after it ran.  To avoid running the hook multiple
@@ -605,11 +623,10 @@ package-vc-install
      ;; Initialize the package system to get the list of package
      ;; symbols for completion.
      (package-vc--archives-initialize)
-     (let* ((packages (package-vc--sourced-packages-list))
-            (input (completing-read
-                    "Fetch package source (name or URL): " packages))
-            (name (file-name-base input)))
-       (list input (intern (string-remove-prefix "emacs-" name))
+     (let* ((name-or-url (package-vc--read-package-name
+                          "Fetch and install package: " t))
+            (name (file-name-base name-or-url)))
+       (list name-or-url (intern (string-remove-prefix "emacs-" name))
              (and current-prefix-arg :last-release)))))
   (package-vc--archives-initialize)
   (cond
@@ -647,18 +664,12 @@ package-vc-checkout
 `:last-release' (interactively, the prefix argument), that stands
 for the last released version of the package."
   (interactive
-   (progn
-     ;; Initialize the package system to get the list of package
-     ;; symbols for completion.
-     (package-vc--archives-initialize)
-     (let* ((packages (package-vc--sourced-packages-list))
-            (input (completing-read
-                    "Fetch package source (name or URL): " packages)))
-       (list (cadr (assoc input package-archive-contents #'string=))
-             (read-file-name "Clone into new or empty directory: " nil nil t nil
-                             (lambda (dir) (or (not (file-exists-p dir))
-                                               (directory-empty-p dir))))
-             (and current-prefix-arg :last-release)))))
+   (let* ((name (package-vc--read-package-name "Fetch package source: ")))
+     (list (cadr (assoc name package-archive-contents #'string=))
+           (read-file-name "Clone into new or empty directory: " nil nil t nil
+                           (lambda (dir) (or (not (file-exists-p dir))
+                                             (directory-empty-p dir))))
+           (and current-prefix-arg :last-release))))
   (package-vc--archives-initialize)
   (let ((pkg-spec (or (package-vc--desc->spec pkg-desc)
                       (and-let* ((extras (package-desc-extras pkg-desc))
@@ -697,19 +708,9 @@ package-vc-install-from-checkout
 (defun package-vc-refresh (pkg-desc)
   "Refresh the installation for package given by PKG-DESC.
 Interactively, prompt for the name of the package to refresh."
-  (interactive (list (package-vc--read-pkg "Refresh package: ")))
+  (interactive (list (package-vc--read-package-desc "Refresh package: " t)))
   (package-vc--unpack-1 pkg-desc (package-desc-dir pkg-desc)))
 
-(defun package-vc--read-pkg (prompt)
-  "Query for a source package description with PROMPT."
-  (cadr (assoc (completing-read
-                prompt
-                package-alist
-                (lambda (pkg) (package-vc-p (cadr pkg)))
-                t)
-               package-alist
-               #'string=)))
-
 ;;;###autoload
 (defun package-vc-prepare-patch (pkg subject revisions)
   "Send patch for REVISIONS to maintainer of the package PKG using SUBJECT.
@@ -719,7 +720,7 @@ package-vc-prepare-patch
 if the current buffer has marked commit log entries, REVISIONS
 are the tags of the marked entries, see `log-view-get-marked'."
   (interactive
-   (list (package-vc--read-pkg "Package to prepare a patch for: ")
+   (list (package-vc--read-package-desc "Package to prepare a patch for: " t)
          (and (not vc-prepare-patches-separately)
               (read-string "Subject: " "[PATCH] " nil nil t))
          (or (log-view-get-marked)

commit aadf07f5b80467a3ca5485bc0eae7fbcb3fa0e48
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Sun Nov 6 09:52:57 2022 +0100

    Autoload 'package-vc-install-selected-packages'
    
    * lisp/emacs-lisp/package-vc.el (package-vc-ensure-packages): Add an
    autoload cookie.
    (package-vc-selected-packages): Set
    :initialize to 'custom-initialize-default'.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index a405a65017..e7b871e171 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -118,6 +118,8 @@ package-vc-default-backend
   :version "29.1")
 
 (defvar package-vc-selected-packages) ; pacify byte-compiler
+
+;;;###autoload
 (defun package-vc-install-selected-packages ()
   "Ensure packages specified in `package-vc-selected-packages' are installed."
   (interactive)
@@ -161,6 +163,7 @@ package-vc-selected-packages
                                          (:lisp-dir string)
                                          (:main-file string)
                                          (:vc-backend symbol)))))
+  :initialize #'custom-initialize-default
   :set (lambda (sym val)
          (custom-set-default sym val)
          (package-vc-install-selected-packages))

commit e1ce202ad18ad4879adfa5bca06441ad8fa132db
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Sun Nov 6 09:52:12 2022 +0100

    Mark 'package-vc-install-selected-packages' as interactive
    
    * lisp/emacs-lisp/package-vc.el (package-vc-ensure-packages): Add an
    interactive spec.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 8acaf16927..a405a65017 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -120,6 +120,7 @@ package-vc-default-backend
 (defvar package-vc-selected-packages) ; pacify byte-compiler
 (defun package-vc-install-selected-packages ()
   "Ensure packages specified in `package-vc-selected-packages' are installed."
+  (interactive)
   (pcase-dolist (`(,name . ,spec) package-vc-selected-packages)
     (when (stringp name)
       (setq name (intern name)))

commit 9d3c6205aec01855d31c234795eba45d79ec768f
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Sun Nov 6 09:51:45 2022 +0100

    Rename '-ensure-packages' to -install-selected-packages'
    
    * doc/emacs/package.texi (Fetching Package Sources): Rename instances.
    * lisp/emacs-lisp/package-vc.el (package-vc-ensure-packages): Rename
    to 'package-vc-install-selected-packages'.
    (package-vc-selected-packages): Call renamed function.

diff --git a/doc/emacs/package.texi b/doc/emacs/package.texi
index f9fa28074f..a0f02f38b7 100644
--- a/doc/emacs/package.texi
+++ b/doc/emacs/package.texi
@@ -559,7 +559,7 @@ Fetching Package Sources
 @code{package-vc-checkout}.
 
 @vindex package-vc-selected-packages
-@findex package-vc-ensure-packages
+@findex package-vc-install-selected-packages
   An alternative way to use @code{package-vc-install} is via the
 @code{package-vc-selected-packages} user option.  This is an alist of
 packages to install, where each key is a package name and the value is
@@ -567,8 +567,8 @@ Fetching Package Sources
 indicating a specific revision or a package specification plist.  The
 side effect of setting the user option is to install the package, but
 the process can also be manually triggered using the function
-@code{package-vc-ensure-packages}.  Here is an example of how the user
-option:
+@code{package-vc-install-selected-packages}.  Here is an example of
+how the user option:
 
 @example
 @group
diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 505d258969..8acaf16927 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -118,7 +118,7 @@ package-vc-default-backend
   :version "29.1")
 
 (defvar package-vc-selected-packages) ; pacify byte-compiler
-(defun package-vc-ensure-packages ()
+(defun package-vc-install-selected-packages ()
   "Ensure packages specified in `package-vc-selected-packages' are installed."
   (pcase-dolist (`(,name . ,spec) package-vc-selected-packages)
     (when (stringp name)
@@ -162,7 +162,7 @@ package-vc-selected-packages
                                          (:vc-backend symbol)))))
   :set (lambda (sym val)
          (custom-set-default sym val)
-         (package-vc-ensure-packages))
+         (package-vc-install-selected-packages))
   :version "29.1")
 
 (defvar package-vc--archive-spec-alist nil

commit a4e4ceb47a5579bba7d156ae5535ab02085534de
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Sun Nov 6 09:47:39 2022 +0100

    Handle strings as keys in 'package-vc-ensure-packages'
    
    * lisp/emacs-lisp/package-vc.el (package-vc-ensure-packages): Inter
    sting keys while processing 'package-vc-selected-packages'.
    
    As requested by Rudolf Adamkovič.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index 127a7e073f..505d258969 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -120,8 +120,9 @@ package-vc-default-backend
 (defvar package-vc-selected-packages) ; pacify byte-compiler
 (defun package-vc-ensure-packages ()
   "Ensure packages specified in `package-vc-selected-packages' are installed."
-  (pcase-dolist (`(,(and (pred symbolp) name) . ,spec)
-                 package-vc-selected-packages)
+  (pcase-dolist (`(,name . ,spec) package-vc-selected-packages)
+    (when (stringp name)
+      (setq name (intern name)))
     (let ((pkg-desc (cadr (assoc name package-alist #'string=))))
       (unless (and name (package-installed-p name)
                    (package-vc-p pkg-desc))

commit e55be31d557adde5f6183e0af19cc752ac0d9064
Author: Philip Kaludercic <philipk@posteo.net>
Date:   Sun Nov 6 09:42:52 2022 +0100

    ; Fix interactive spec for 'package-vc-refresh'
    
    * lisp/emacs-lisp/package-vc.el (package-vc-refresh):
    
    Thanks to Rudolf Adamkovič for noticing the mistake.

diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
index a0b4b03118..127a7e073f 100644
--- a/lisp/emacs-lisp/package-vc.el
+++ b/lisp/emacs-lisp/package-vc.el
@@ -692,7 +692,7 @@ package-vc-install-from-checkout
 (defun package-vc-refresh (pkg-desc)
   "Refresh the installation for package given by PKG-DESC.
 Interactively, prompt for the name of the package to refresh."
-  (interactive (package-vc--read-pkg "Refresh package: "))
+  (interactive (list (package-vc--read-pkg "Refresh package: ")))
   (package-vc--unpack-1 pkg-desc (package-desc-dir pkg-desc)))
 
 (defun package-vc--read-pkg (prompt)

commit 2967356891874c355e634e3f4c0cae5456d1bb09
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Thu Nov 17 20:08:54 2022 +0100

    Avoid raw control characters in two files
    
    * lisp/net/rcirc.el (rcirc-format, rcirc-unformat)
    (rcirc-format-bold, rcirc-format-italic, rcirc-format-underline)
    (rcirc-format-strike-trough, rcirc-format-fixed-width):
    * test/lisp/subr-tests.el (test-keymap-parse-macros): Don't use
    raw control characters.

diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 370f388b3e..29957a62d0 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -1353,10 +1353,10 @@ rcirc-format
     (if (use-region-p)
         (let ((beg (region-beginning)))
           (goto-char (region-end))
-          (insert "")
+          (insert "\^O")
           (goto-char beg)
           (insert pre))
-      (insert pre "")))
+      (insert pre "\^O")))
   (when (or (not (region-active-p)) (< (point) (mark)))
     (forward-char (length pre))))
 
@@ -1364,11 +1364,11 @@ rcirc-unformat
   "Remove the closes formatting found closes to the current point."
   (interactive)
   (save-excursion
-    (when (and (search-backward-regexp (rx (or "" "" "" "" ""))
+    (when (and (search-backward-regexp (rx (or "\^B" "\^]" "\^_" "\^^" "\^Q"))
                                        rcirc-prompt-end-marker t)
-               (looking-at (rx (group (or "" "" "" "" ""))
+               (looking-at (rx (group (or "\^B" "\^]" "\^_" "\^^" "\^Q"))
                                (*? nonl)
-                               (group ""))))
+                               (group "\^O"))))
       (replace-match "" nil nil nil 2)
       (replace-match "" nil nil nil 1))))
 
@@ -1378,7 +1378,7 @@ rcirc-format-bold
 formatting will be replaced before the bold formatting is
 inserted."
   (interactive "P")
-  (rcirc-format "" replace))
+  (rcirc-format "\^B" replace))
 
 (defun rcirc-format-italic (replace)
   "Insert italic formatting.
@@ -1386,7 +1386,7 @@ rcirc-format-italic
 formatting will be replaced before the italic formatting is
 inserted."
   (interactive "P")
-  (rcirc-format "" replace))
+  (rcirc-format "\^]" replace))
 
 (defun rcirc-format-underline (replace)
   "Insert underlining formatting.
@@ -1394,7 +1394,7 @@ rcirc-format-underline
 formatting will be replaced before the underline formatting is
 inserted."
   (interactive "P")
-  (rcirc-format "" replace))
+  (rcirc-format "\^_" replace))
 
 (defun rcirc-format-strike-trough (replace)
   "Insert strike-trough formatting.
@@ -1402,7 +1402,7 @@ rcirc-format-strike-trough
 formatting will be replaced before the strike-trough formatting
 is inserted."
   (interactive "P")
-  (rcirc-format "" replace))
+  (rcirc-format "\^^" replace))
 
 (defun rcirc-format-fixed-width (replace)
   "Insert fixed-width formatting.
@@ -1410,7 +1410,7 @@ rcirc-format-fixed-width
 formatting will be replaced before the fixed width formatting is
 inserted."
   (interactive "P")
-  (rcirc-format "" replace))
+  (rcirc-format "\^Q" replace))
 
 (defvar-keymap rcirc-mode-map
   :doc "Keymap for rcirc mode."
diff --git a/test/lisp/subr-tests.el b/test/lisp/subr-tests.el
index cc9610cd39..e22d1c7be0 100644
--- a/test/lisp/subr-tests.el
+++ b/test/lisp/subr-tests.el
@@ -1106,7 +1106,7 @@ test-string-lines
 
 (ert-deftest test-keymap-parse-macros ()
   (should (equal (key-parse "C-x ( C-d C-x )") [24 40 4 24 41]))
-  (should (equal (kbd "C-x ( C-d C-x )") ""))
+  (should (equal (kbd "C-x ( C-d C-x )") "\^D"))
   (should (equal (kbd "C-x ( C-x )") "")))
 
 (defvar subr-test--global)

commit 2f03053e568f38a1dce5ffe02ad1359069ef84c8
Author: Randy Taylor <dev@rjt.dev>
Date:   Sun Nov 13 22:06:33 2022 -0500

    Utilize new font-lock faces for C/C++ and Python tree-sitter use
    
    * lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings): Use new
    escape, number, property, operator, bracket, and delimiter font-lock
    faces.
    (c-ts-mode--base-mode): Add them to the feature list.
    (c-ts-mode): Fix typo.
    * lisp/progmodes/python.el (python--treesit-settings): Use new number,
    property, operator, bracket, and delimiter font-lock faces.
    (python-mode): Add them to the feature list.

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index b951031d81..f8e809bb43 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -230,19 +230,17 @@ c-ts-mode--font-lock-settings
 
    :language mode
    :feature 'operator
-   :override t
    `([,@c-ts-mode--operators] @font-lock-operator-face
      "!" @font-lock-negation-char-face)
 
    :language mode
    :feature 'string
    `((string_literal) @font-lock-string-face
-     (system_lib_string) @font-lock-string-face
-     (escape_sequence) @font-lock-escape-face)
+     (system_lib_string) @font-lock-string-face)
 
    :language mode
    :feature 'literal
-   `((number_literal) @font-lock-constant-face
+   `((number_literal) @font-lock-number-face
      (char_literal) @font-lock-constant-face)
 
    :language mode
@@ -268,14 +266,11 @@ c-ts-mode--font-lock-settings
       declarator: (_) @c-ts-mode--fontify-struct-declarator)
 
      (function_definition
-      declarator: (_) @c-ts-mode--fontify-struct-declarator)
+      declarator: (_) @c-ts-mode--fontify-struct-declarator))
 
-     ;; Should we highlight identifiers in the parameter list?
-     ;; (parameter_declaration
-     ;;  declarator: (_) @c-ts-mode--fontify-struct-declarator)
-
-     (enumerator
-      name: (identifier) @font-lock-variable-name-face))
+   ;; Should we highlight identifiers in the parameter list?
+   ;; (parameter_declaration
+   ;;  declarator: (_) @c-ts-mode--fontify-struct-declarator))
 
    :language mode
    :feature 'assignment
@@ -298,8 +293,7 @@ c-ts-mode--font-lock-settings
    '((call_expression
       function: (identifier) @font-lock-function-name-face)
      (field_expression
-      argument: (identifier) @font-lock-variable-name-face
-      field: (field_identifier) @font-lock-property-face)
+      argument: (identifier) @font-lock-variable-name-face)
      (pointer_expression
       (identifier) @font-lock-variable-name-face))
 
@@ -313,6 +307,25 @@ c-ts-mode--font-lock-settings
    :feature 'error
    '((ERROR) @font-lock-warning-face)
 
+   :feature 'escape-sequence
+   :language mode
+   :override t
+   '((escape_sequence) @font-lock-escape-face)
+
+   :language mode
+   :feature 'property
+   '((field_identifier) @font-lock-property-face
+     (enumerator
+      name: (identifier) @font-lock-property-face))
+
+   :language mode
+   :feature 'bracket
+   '((["(" ")" "[" "]" "{" "}"]) @font-lock-bracket-face)
+
+   :language mode
+   :feature 'delimiter
+   '((["," ":" ";"]) @font-lock-delimiter-face)
+
    :language mode
    :feature 'emacs-devel
    '(((call_expression function: (identifier) @fn)
@@ -471,9 +484,10 @@ c-ts-mode--base-mode
   (setq-local which-func-functions nil)
 
   (setq-local treesit-font-lock-feature-list
-              '((comment preprocessor constant string literal keyword)
-                (type definition label assignment)
-                (expression error operator))))
+              '(( comment constant keyword literal preprocessor string)
+                ( assignment definition label property type)
+                ( bracket delimiter error escape-sequence expression
+                  operator))))
 
 ;;;###autoload
 (define-derived-mode c-ts-mode c-ts-mode--base-mode "C"
@@ -500,7 +514,7 @@ c-ts-mode
 
 ;;;###autoload
 (define-derived-mode c++-ts-mode c-ts-mode--base-mode "C++"
-  "Major mode for editing C, powered by tree-sitter."
+  "Major mode for editing C++, powered by tree-sitter."
   :group 'c++
 
   (unless (treesit-ready-p nil 'cpp)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index ad4665eb19..22485a025e 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -975,11 +975,8 @@ python--treesit-constants
     "copyright" "credits" "exit" "license" "quit"))
 
 (defvar python--treesit-operators
-  ;; This is not used. And and, or, not, is, in are fontified as
-  ;; keywords.
   '("-" "-=" "!=" "*" "**" "**=" "*=" "/" "//" "//=" "/=" "&" "%" "%="
-    "^" "+" "+=" "<" "<<" "<=" "<>" "=" "==" ">" ">=" ">>" "|" "~"
-    "and" "in" "is" "not" "or"))
+    "^" "+" "+=" "<" "<<" "<=" "<>" "=" "==" ">" ">=" ">>" "|" "~"))
 
 (defvar python--treesit-special-attributes
   '("__annotations__" "__closure__" "__code__"
@@ -1117,7 +1114,38 @@ python--treesit-settings
    :feature 'escape-sequence
    :language 'python
    :override t
-   '((escape_sequence) @font-lock-escape-face))
+   '((escape_sequence) @font-lock-escape-face)
+
+   :feature 'number
+   :language 'python
+   :override t
+   '([(integer) (float)] @font-lock-number-face)
+
+   :feature 'property
+   :language 'python
+   :override t
+   '((attribute
+      attribute: (identifier) @font-lock-property-face)
+     (class_definition
+      body: (block
+             (expression_statement
+              (assignment left:
+                          (identifier) @font-lock-property-face)))))
+
+   :feature 'operator
+   :language 'python
+   :override t
+   `([,@python--treesit-operators] @font-lock-operator-face)
+
+   :feature 'bracket
+   :language 'python
+   :override t
+   '(["(" ")" "[" "]" "{" "}"] @font-lock-bracket-face)
+
+   :feature 'delimiter
+   :language 'python
+   :override t
+   '(["," "." ":" ";" (ellipsis)] @font-lock-delimiter-face))
   "Tree-sitter font-lock settings.")
 
 
@@ -6553,7 +6581,8 @@ python-mode
                 '(( comment string function-name class-name)
                   ( keyword builtin constant type)
                   ( assignment decorator escape-sequence
-                    string-interpolation)))
+                    string-interpolation number property
+                    operator bracket delimiter)))
     (setq-local treesit-font-lock-settings python--treesit-settings)
     (setq-local imenu-create-index-function
                 #'python-imenu-treesit-create-index)

commit d5c6d69b4fea2d5a1167a0bcc0b9994a5939b97e
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Nov 17 10:07:15 2022 -0800

    Improvements to the tree-sitter setup in sh-script.el
    
    * lisp/progmodes/sh-script.el (sh-mode--treesit-settings): Add defvar.
    (sh-mode): Change feature names.
    (sh-mode--treesit-fontify-decl-command): Remove function.
    (sh-mode--treesit-declaration-commands): New variable.
    (sh-mode--treesit-settings): Change feature names.  Simplify
    declaration-command feature.

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 54284ff284..7483b31a37 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1466,6 +1466,8 @@ sh-after-hack-local-variables
                       (symbol-name sh-shell)
                     sh-shell))))
 
+(defvar sh-mode--treesit-settings)
+
 ;;;###autoload
 (define-derived-mode sh-mode prog-mode "Shell-script"
   "Major mode for editing shell scripts.
@@ -1584,12 +1586,12 @@ sh-mode
     #'sh-after-hack-local-variables nil t)
 
   (cond
-   ;; Tree-sitter
-   ((treesit-ready-p 'sh-mode 'bash)
+   ;; Tree-sitter.  If the shell is bash, we can enable tree-sitter.
+   ((treesit-ready-p 'sh-mode sh-shell)
     (setq-local treesit-font-lock-feature-list
-                '((comments functions strings heredocs)
-                  (variables keywords commands decl-commands)
-                  (constants operators builtin-variables)))
+                '((comment function string heredoc)
+                  (variable keyword command declaration-command)
+                  (constant operator builtin-variable)))
     (setq-local treesit-font-lock-settings
                 sh-mode--treesit-settings)
     (treesit-major-mode-setup))
@@ -3238,50 +3240,33 @@ sh-mode--treesit-other-keywords
       (if (not (member keyword minimal))
           (setq others (cons keyword others))))))
 
-(defun sh-mode--treesit-fontify-decl-command (node override start end &rest _)
-  "Fontifies only the name of declaration_command nodes.
-
-NODE should be the first child of a declaration_command node.
-For OVERRIDE, START and END see `treesit-font-lock-rules'.
-
-This is used instead of `font-lock-builtion-face' directly
-because otherwise the whole command, including the variable
-assignment part, is fontified with with `font-lock-builtin-face'.
-An alternative to this would be to declaration_command to have a
-`name:' field."
-  (let* ((maybe-decl-cmd (treesit-node-parent node))
-         (node-type (treesit-node-type maybe-decl-cmd)))
-    (when (string= node-type "declaration_command")
-      (let* ((name-node (treesit-node-child maybe-decl-cmd 0))
-             (name-beg (treesit-node-start name-node))
-             (name-end (treesit-node-end name-node)))
-        (treesit-fontify-with-override
-         (max start name-beg) (min end name-end)
-         'font-lock-builtin-face override)))))
+(defvar sh-mode--treesit-declaration-commands
+  '("declare" "typeset" "export" "readonly" "local")
+  "Keywords in declaration commands.")
 
 (defvar sh-mode--treesit-settings
   (treesit-font-lock-rules
-   :feature 'comments
+   :feature 'comment
    :language 'bash
    '((comment) @font-lock-comment-face)
 
-   :feature 'functions
+   :feature 'function
    :language 'bash
    '((function_definition name: (word) @font-lock-function-name-face))
 
-   :feature 'strings
+   :feature 'string
    :language 'bash
    '([(string) (raw_string)] @font-lock-string-face)
 
-   :feature 'heredocs
+   :feature 'heredoc
    :language 'bash
    '([(heredoc_start) (heredoc_body)] @sh-heredoc)
 
-   :feature 'variables
+   :feature 'variable
    :language 'bash
    '((variable_name) @font-lock-variable-name-face)
 
-   :feature 'keywords
+   :feature 'keyword
    :language 'bash
    `(;; keywords
      [ ,@sh-mode--treesit-keywords ] @font-lock-keyword-face
@@ -3295,7 +3280,7 @@ sh-mode--treesit-settings
                 eol))
         @font-lock-keyword-face))))
 
-   :feature 'commands
+   :feature 'command
    :language 'bash
    `(;; function/non-builtin command calls
      (command_name (word) @font-lock-function-name-face)
@@ -3310,21 +3295,20 @@ sh-mode--treesit-settings
                          eol)))
                @font-lock-builtin-face))))
 
-   :feature 'decl-commands
+   :feature 'declaration-command
    :language 'bash
-   '(;; declaration commands
-     (declaration_command _ @sh-mode--treesit-fontify-decl-command))
+   `([,@sh-mode--treesit-declaration-commands] @font-lock-builtin-face)
 
-   :feature 'constants
+   :feature 'constant
    :language 'bash
    '((case_item value: (word) @font-lock-constant-face)
      (file_descriptor) @font-lock-constant-face)
 
-   :feature 'operators
+   :feature 'operator
    :language 'bash
    `([ ,@sh-mode--treesit-operators ] @font-lock-builtin-face)
 
-   :feature 'builtin-variables
+   :feature 'builtin-variable
    :language 'bash
    `(((special_variable_name) @font-lock-builtin-face
       (:match ,(let ((builtin-vars (sh-feature sh-variables)))

commit 28490cd65ba50ce4e1f411556e1faa36f1db84ec
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Nov 17 09:40:37 2022 -0800

    ; Minor stylistic fix for previous change on sh-script.el
    
    * lisp/progmodes/sh-script.el: Stylistic change.

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index c6a828548d..54284ff284 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -3210,7 +3210,7 @@ sh-shellcheck-flymake
 (defvar sh-mode--treesit-operators
   '("|" "|&" "||" "&&" ">" ">>" "<" "<<" "<<-" "<<<" "==" "!=" ";"
     ";;" ";&" ";;&")
-  "List of `sh-mode' operator to fontify")
+  "A list of `sh-mode' operators to fontify.")
 
 (defvar sh-mode--treesit-keywords
   '("case" "do" "done" "elif" "else" "esac" "export" "fi" "for"
@@ -3218,15 +3218,15 @@ sh-mode--treesit-keywords
   "Minimal list of keywords that belong to tree-sitter-bash's grammar.
 
 Some reserved words are not recognize to keep the grammar
-simpler. Those are identified with regex-based filtered queries.
+simpler.  Those are identified with regex-based filtered queries.
 
-See `sh-mode--treesit-other-keywords' and
+\(See `sh-mode--treesit-other-keywords' and
 `sh-mode--treesit-settings').")
 
 (defun sh-mode--treesit-other-keywords ()
-  "Returns a list `others' of key/reserved words to be fontified with
-regex-based queries as they are not part of tree-sitter-bash's
-grammar.
+  "Return a list `others' of key/reserved words.
+These words are fontified with regex-based queries as they are
+not part of tree-sitter-bash's grammar.
 
 See `sh-mode--treesit-other-keywords' and
 `sh-mode--treesit-settings')."
@@ -3238,41 +3238,49 @@ sh-mode--treesit-other-keywords
       (if (not (member keyword minimal))
           (setq others (cons keyword others))))))
 
-(defun sh-mode--treesit-fontify-decl-command (node override _start _end)
+(defun sh-mode--treesit-fontify-decl-command (node override start end &rest _)
   "Fontifies only the name of declaration_command nodes.
 
-This is used instead of `font-lock-builtion-face' directly because
-otherwise the whole command, including the variable assignment part,
-is fontified with with `font-lock-builtin-face'. An alternative to
-this would be to declaration_command to have a `name:' field."
+NODE should be the first child of a declaration_command node.
+For OVERRIDE, START and END see `treesit-font-lock-rules'.
+
+This is used instead of `font-lock-builtion-face' directly
+because otherwise the whole command, including the variable
+assignment part, is fontified with with `font-lock-builtin-face'.
+An alternative to this would be to declaration_command to have a
+`name:' field."
   (let* ((maybe-decl-cmd (treesit-node-parent node))
          (node-type (treesit-node-type maybe-decl-cmd)))
     (when (string= node-type "declaration_command")
-      (let* ((name-node (car (treesit-node-children maybe-decl-cmd)))
+      (let* ((name-node (treesit-node-child maybe-decl-cmd 0))
              (name-beg (treesit-node-start name-node))
              (name-end (treesit-node-end name-node)))
-        (put-text-property name-beg
-                           name-end
-                           'face
-                           font-lock-builtin-face)))))
+        (treesit-fontify-with-override
+         (max start name-beg) (min end name-end)
+         'font-lock-builtin-face override)))))
 
 (defvar sh-mode--treesit-settings
   (treesit-font-lock-rules
    :feature 'comments
    :language 'bash
    '((comment) @font-lock-comment-face)
+
    :feature 'functions
    :language 'bash
    '((function_definition name: (word) @font-lock-function-name-face))
+
    :feature 'strings
    :language 'bash
    '([(string) (raw_string)] @font-lock-string-face)
+
    :feature 'heredocs
    :language 'bash
    '([(heredoc_start) (heredoc_body)] @sh-heredoc)
+
    :feature 'variables
    :language 'bash
    '((variable_name) @font-lock-variable-name-face)
+
    :feature 'keywords
    :language 'bash
    `(;; keywords
@@ -3282,10 +3290,11 @@ sh-mode--treesit-settings
       ((word) @font-lock-keyword-face
        (:match
         ,(rx-to-string
-            `(seq bol
-                  (or ,@(sh-mode--treesit-other-keywords))
-                  eol))
+          `(seq bol
+                (or ,@(sh-mode--treesit-other-keywords))
+                eol))
         @font-lock-keyword-face))))
+
    :feature 'commands
    :language 'bash
    `(;; function/non-builtin command calls
@@ -3300,17 +3309,21 @@ sh-mode--treesit-settings
                          (or ,@builtins)
                          eol)))
                @font-lock-builtin-face))))
+
    :feature 'decl-commands
    :language 'bash
    '(;; declaration commands
      (declaration_command _ @sh-mode--treesit-fontify-decl-command))
+
    :feature 'constants
    :language 'bash
    '((case_item value: (word) @font-lock-constant-face)
      (file_descriptor) @font-lock-constant-face)
+
    :feature 'operators
    :language 'bash
    `([ ,@sh-mode--treesit-operators ] @font-lock-builtin-face)
+
    :feature 'builtin-variables
    :language 'bash
    `(((special_variable_name) @font-lock-builtin-face

commit d06127e5736b0564daf99a41c77c8c23d394e759
Author: João P. L. de Carvalho <jaopaulolc@gmail.com>
Date:   Thu Oct 27 15:45:56 2022 -0600

    Initial fontification in sh-mode with tree-sitter
    
    * lisp/progmodes/sh-script.el (sh-mode): Add tree-sitter setup.  Move
    setup of font-lock-defaults into branch.
    (sh-mode--treesit-operators)
    (sh-mode--treesit-keywords)
    (sh-mode--treesit-settings): New variables.
    (sh-mode--treesit-other-keywords)
    (sh-mode--treesit-fontify-decl-command): New functions.

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 558b62b20a..c6a828548d 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -148,6 +148,7 @@
   (require 'let-alist)
   (require 'subr-x))
 (require 'executable)
+(require 'treesit)
 
 (autoload 'comint-completion-at-point "comint")
 (autoload 'comint-filename-completion "comint")
@@ -1534,13 +1535,6 @@ sh-mode
   ;; we can't look if previous line ended with `\'
   (setq-local comint-prompt-regexp "^[ \t]*")
   (setq-local imenu-case-fold-search nil)
-  (setq font-lock-defaults
-	`((sh-font-lock-keywords
-	   sh-font-lock-keywords-1 sh-font-lock-keywords-2)
-	  nil nil
-	  ((?/ . "w") (?~ . "w") (?. . "w") (?- . "w") (?_ . "w")) nil
-	  (font-lock-syntactic-face-function
-	   . ,#'sh-font-lock-syntactic-face-function)))
   (setq-local syntax-propertize-function #'sh-syntax-propertize-function)
   (add-hook 'syntax-propertize-extend-region-functions
             #'syntax-propertize-multiline 'append 'local)
@@ -1587,7 +1581,27 @@ sh-mode
    nil nil)
   (add-hook 'flymake-diagnostic-functions #'sh-shellcheck-flymake nil t)
   (add-hook 'hack-local-variables-hook
-    #'sh-after-hack-local-variables nil t))
+    #'sh-after-hack-local-variables nil t)
+
+  (cond
+   ;; Tree-sitter
+   ((treesit-ready-p 'sh-mode 'bash)
+    (setq-local treesit-font-lock-feature-list
+                '((comments functions strings heredocs)
+                  (variables keywords commands decl-commands)
+                  (constants operators builtin-variables)))
+    (setq-local treesit-font-lock-settings
+                sh-mode--treesit-settings)
+    (treesit-major-mode-setup))
+   ;; Elisp.
+   (t
+    (setq font-lock-defaults
+          `((sh-font-lock-keywords
+             sh-font-lock-keywords-1 sh-font-lock-keywords-2)
+            nil nil
+            ((?/ . "w") (?~ . "w") (?. . "w") (?- . "w") (?_ . "w")) nil
+            (font-lock-syntactic-face-function
+             . ,#'sh-font-lock-syntactic-face-function))))))
 
 ;;;###autoload
 (defalias 'shell-script-mode 'sh-mode)
@@ -3191,6 +3205,122 @@ sh-shellcheck-flymake
       (process-send-region sh--shellcheck-process (point-min) (point-max))
       (process-send-eof sh--shellcheck-process))))
 
-(provide 'sh-script)
+;;; Tree-sitter font-lock
+
+(defvar sh-mode--treesit-operators
+  '("|" "|&" "||" "&&" ">" ">>" "<" "<<" "<<-" "<<<" "==" "!=" ";"
+    ";;" ";&" ";;&")
+  "List of `sh-mode' operator to fontify")
+
+(defvar sh-mode--treesit-keywords
+  '("case" "do" "done" "elif" "else" "esac" "export" "fi" "for"
+    "function" "if" "in" "unset" "while" "then")
+  "Minimal list of keywords that belong to tree-sitter-bash's grammar.
+
+Some reserved words are not recognize to keep the grammar
+simpler. Those are identified with regex-based filtered queries.
+
+See `sh-mode--treesit-other-keywords' and
+`sh-mode--treesit-settings').")
+
+(defun sh-mode--treesit-other-keywords ()
+  "Returns a list `others' of key/reserved words to be fontified with
+regex-based queries as they are not part of tree-sitter-bash's
+grammar.
+
+See `sh-mode--treesit-other-keywords' and
+`sh-mode--treesit-settings')."
+  (let ((minimal sh-mode--treesit-keywords)
+        (all (append (sh-feature sh-leading-keywords)
+                     (sh-feature sh-other-keywords)))
+        (others))
+    (dolist (keyword all others)
+      (if (not (member keyword minimal))
+          (setq others (cons keyword others))))))
+
+(defun sh-mode--treesit-fontify-decl-command (node override _start _end)
+  "Fontifies only the name of declaration_command nodes.
+
+This is used instead of `font-lock-builtion-face' directly because
+otherwise the whole command, including the variable assignment part,
+is fontified with with `font-lock-builtin-face'. An alternative to
+this would be to declaration_command to have a `name:' field."
+  (let* ((maybe-decl-cmd (treesit-node-parent node))
+         (node-type (treesit-node-type maybe-decl-cmd)))
+    (when (string= node-type "declaration_command")
+      (let* ((name-node (car (treesit-node-children maybe-decl-cmd)))
+             (name-beg (treesit-node-start name-node))
+             (name-end (treesit-node-end name-node)))
+        (put-text-property name-beg
+                           name-end
+                           'face
+                           font-lock-builtin-face)))))
+
+(defvar sh-mode--treesit-settings
+  (treesit-font-lock-rules
+   :feature 'comments
+   :language 'bash
+   '((comment) @font-lock-comment-face)
+   :feature 'functions
+   :language 'bash
+   '((function_definition name: (word) @font-lock-function-name-face))
+   :feature 'strings
+   :language 'bash
+   '([(string) (raw_string)] @font-lock-string-face)
+   :feature 'heredocs
+   :language 'bash
+   '([(heredoc_start) (heredoc_body)] @sh-heredoc)
+   :feature 'variables
+   :language 'bash
+   '((variable_name) @font-lock-variable-name-face)
+   :feature 'keywords
+   :language 'bash
+   `(;; keywords
+     [ ,@sh-mode--treesit-keywords ] @font-lock-keyword-face
+     ;; reserved words
+     (command_name
+      ((word) @font-lock-keyword-face
+       (:match
+        ,(rx-to-string
+            `(seq bol
+                  (or ,@(sh-mode--treesit-other-keywords))
+                  eol))
+        @font-lock-keyword-face))))
+   :feature 'commands
+   :language 'bash
+   `(;; function/non-builtin command calls
+     (command_name (word) @font-lock-function-name-face)
+     ;; builtin commands
+     (command_name
+      ((word) @font-lock-builtin-face
+       (:match ,(let ((builtins
+                       (sh-feature sh-builtins)))
+                  (rx-to-string
+                   `(seq bol
+                         (or ,@builtins)
+                         eol)))
+               @font-lock-builtin-face))))
+   :feature 'decl-commands
+   :language 'bash
+   '(;; declaration commands
+     (declaration_command _ @sh-mode--treesit-fontify-decl-command))
+   :feature 'constants
+   :language 'bash
+   '((case_item value: (word) @font-lock-constant-face)
+     (file_descriptor) @font-lock-constant-face)
+   :feature 'operators
+   :language 'bash
+   `([ ,@sh-mode--treesit-operators ] @font-lock-builtin-face)
+   :feature 'builtin-variables
+   :language 'bash
+   `(((special_variable_name) @font-lock-builtin-face
+      (:match ,(let ((builtin-vars (sh-feature sh-variables)))
+                 (rx-to-string
+                  `(seq bol
+                        (or ,@builtin-vars)
+                        eol)))
+              @font-lock-builtin-face))))
+  "Tree-sitter font-lock settings for `sh-mode'.")
 
+(provide 'sh-script)
 ;;; sh-script.el ends here

commit b440fa0a6b48a95323fa922b88e9a9a73d6c6360
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Nov 16 21:31:04 2022 -0800

    ; Elaborate on tree-sitter fontification features documentation
    
    * doc/lispref/modes.texi (Parser-based Font Lock)
    * lisp/treesit.el (treesit-font-lock-feature-list): Explain in more
    detail, and change some features.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 71687b0783..8b20bc0b75 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -4077,11 +4077,20 @@ Parser-based Font Lock
 list disables the corresponding query during font-lock.
 
 Common feature names, for many programming languages, include
-function-name, type, variable-name (left-hand-side or @acronym{LHS} of
-assignments), builtin, constant, keyword, string-interpolation,
-comment, doc, string, operator, preprocessor, escape-sequence, and key
-(in key-value pairs).  Major modes are free to subdivide or extend
-these common features.
+@code{definition}, @code{type}, @code{assignment}, @code{builtin},
+@code{constant}, @code{keyword}, @code{string-interpolation},
+@code{comment}, @code{doc}, @code{string}, @code{operator},
+@code{preprocessor}, @code{escape-sequence}, and @code{key}.  Major
+modes are free to subdivide or extend these common features.
+
+Some of these features warrant some explanation: @code{definition}
+highlights whatever is being defined, e.g., the function name in a
+function definition, the struct name in a struct definition, the
+variable name in a variable definition; @code{assignment} highlights
+the whatever is being assigned to, e.g., the variable or field in an
+assignment statement; @code{key} highlights keys in key-value pairs,
+e.g., keys in a JSON object, or a Python dictionary; @code{doc}
+highlights docstrings or doc-comments.
 
 For example, the value of this variable could be:
 @example
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 1284afe84b..6a41c1a411 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -542,11 +542,11 @@ treesit-font-lock-feature-list
 corresponding query during font-lock.
 
 Common feature names (for general programming languages) include
-function-name, type, variable-name (LHS of assignments), builtin,
-constant, keyword, string-interpolation, comment, doc, string,
-operator, preprocessor, escape-sequence, key (in key-value
-pairs).  Major modes are free to subdivide or extend on these
-common features.
+definition, type, assignment, builtin, constant, keyword,
+string-interpolation, comment, doc, string, operator, property,
+preprocessor, escape-sequence, key (in key-value pairs).  Major
+modes are free to subdivide or extend on these common features.
+See the manual for more explanations on some of the feature.
 
 For changes to this variable to take effect, run
 `treesit-font-lock-recompute-features'.")

commit 875a8582ec586afb2ff01b4cf8a81b0862c374d9
Author: Juri Linkov <juri@linkov.net>
Date:   Thu Nov 17 19:54:33 2022 +0200

    * lisp/repeat.el (describe-repeat-maps): Use fill-region-as-paragraph.

diff --git a/lisp/repeat.el b/lisp/repeat.el
index f2e1c0ad5a..6b2977205f 100644
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -595,22 +595,37 @@ describe-repeat-maps
                           (car keymap)))
                    (repeat-commands (cdr keymap))
                    map-commands commands-enter commands-exit)
-              (map-keymap (lambda (_key cmd) (when (symbolp cmd) (push cmd map-commands))) map)
+              (map-keymap (lambda (_key cmd)
+                            (when (symbolp cmd) (push cmd map-commands)))
+                          map)
               (setq map-commands (seq-uniq map-commands))
               (setq commands-enter (seq-difference repeat-commands map-commands))
               (setq commands-exit  (seq-difference map-commands repeat-commands))
 
-              (when (or commands-enter commands-exit) (insert "\n"))
-              (when commands-enter
-                (insert (concat "Entered with: "
-                                (mapconcat (lambda (cmd) (format-message "`%s'" cmd))
-                                           commands-enter ", ")
-                                "\n")))
-              (when commands-exit
-                (insert (concat "Exited with: "
-                                (mapconcat (lambda (cmd) (format-message "`%s'" cmd))
-                                           commands-exit ", ")
-                                "\n"))))
+              (when (or commands-enter commands-exit)
+                (insert "\n")
+                (when commands-enter
+                  (fill-region-as-paragraph
+                   (point)
+                   (progn
+                     (insert (concat "Entered with: "
+                                     (mapconcat (lambda (cmd)
+                                                  (format-message "`%s'" cmd))
+                                                (sort commands-enter #'string<)
+                                                ", ")
+                                     "\n"))
+                     (point))))
+                (when commands-exit
+                  (fill-region-as-paragraph
+                   (point)
+                   (progn
+                     (insert (concat "Exited with: "
+                                     (mapconcat (lambda (cmd)
+                                                  (format-message "`%s'" cmd))
+                                                (sort commands-exit #'string<)
+                                                ", ")
+                                     "\n"))
+                     (point))))))
 
             (when (symbolp (car keymap))
               (insert (substitute-command-keys (format-message "\\{%s}" (car keymap)))))

commit 2bf7a06c4bb6cef53bfdfdc58e31128f49b691af
Author: Robert Pluim <rpluim@gmail.com>
Date:   Thu Nov 17 16:53:41 2022 +0100

    Use mapc instead of mapcar when walking rmail threads
    
    * lisp/mail/rmailsum.el (rmail-summary--walk-thread-message-recursively):
    Use `mapc' instead of `mapcar'; we don't care about the results.

diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 971e504dcd..f161664d96 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -410,10 +410,10 @@ rmail-summary--walk-thread-message-recursively
            (lambda (msg)
              (rmail-summary--walk-thread-message-recursively
               msg encountered-msgs))))
-      (mapcar walk-thread-msg
-              (aref rmail-summary-message-parents-vector msgnum))
-      (mapcar walk-thread-msg
-              (rmail-summary-direct-descendants msgnum encountered-msgs)))))
+      (mapc walk-thread-msg
+            (aref rmail-summary-message-parents-vector msgnum))
+      (mapc walk-thread-msg
+            (rmail-summary-direct-descendants msgnum encountered-msgs)))))
 
 ;;;###autoload
 (defun rmail-summary-by-thread (&optional msgnum)

commit 11e64d0048215a87a80b4a493a2a0295b524cbba
Author: Robert Pluim <rpluim@gmail.com>
Date:   Thu Nov 17 16:58:34 2022 +0100

    ; Fix previous rmailsum change

diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 93fc0f5d2b..971e504dcd 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -436,7 +436,7 @@ rmail-summary-by-thread
       (rmail-summary--walk-thread-message-recursively msgnum enc-msgs)
       (rmail-new-summary (format "thread containing message %d" msgnum)
 			 (list 'rmail-summary-by-thread msgnum)
-			 (if (and rmail-summary-intersect-consecutive-filters
+			 (if (and rmail-summary-progressively-narrow
 				  (rmail-summary--exists-1))
 			     (lambda (msg msgnum)
 			       (and (eq (aref rmail-summary-currently-displayed-msgs msg)

commit 13003105a8edf746a8e8819122bd1bcdf7f9ecdd
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Date:   Thu Nov 17 09:08:24 2022 -0500

    itree.c: Add new "stateless" iterator code and post-order traversal
    
    This still uses the old iterator code, but runs the new code
    alongside to make sure they behave identically.
    
    * src/itree.c (struct itree_iterator): New field `node`.
    (itree_iterator_create): Give it a sane default value.
    (itree_iterator_busy_p, itree_iterator_start, itree_iterator_finish):
    Move down to the "iterator" section of the file.
    (itree_iter_next_in_subtree, itree_iterator_first_node)
    (itree_iter_next): New functions.
    (itree_iterator_start): Initialize the new `node` field.
    (itree_iterator_next): Add post-order case.
    Call the new "stateless" `itree_iter_next` function and check that it
    agrees.
    
    * src/itree.h (enum itree_order): New value for post-order traversals.

diff --git a/src/itree.c b/src/itree.c
index da0242905c..4f25a924b4 100644
--- a/src/itree.c
+++ b/src/itree.c
@@ -242,6 +242,7 @@ itree_stack_pop (struct itree_stack *stack)
 struct itree_iterator
 {
   struct itree_stack *stack;
+  struct itree_node *node;
   ptrdiff_t begin;
   ptrdiff_t end;
 
@@ -279,6 +280,7 @@ itree_iterator_create (struct itree_tree *tree)
   const int size = (tree ? itree_max_height (tree) : 19) + 1;
 
   g->stack = itree_stack_create (size);
+  g->node = NULL;
   g->running = false;
   g->begin = 0;
   g->end = 0;
@@ -1138,52 +1140,6 @@ itree_remove (struct itree_tree *tree, struct itree_node *node)
   return node;
 }
 
-bool
-itree_iterator_busy_p (void)
-{
-  return (iter && iter->running);
-}
-
-/* Start a iterator enumerating all intervals in [BEGIN,END) in the
-   given ORDER.  Only one iterator per tree can be running at any time.  */
-
-struct itree_iterator *
-itree_iterator_start (struct itree_tree *tree, ptrdiff_t begin,
-		      ptrdiff_t end, enum itree_order order,
-		      const char *file, int line)
-{
-  eassert (iter);
-  if (iter->running)
-    {
-      fprintf (stderr,
-	       "Detected nested iteration!\nOuter: %s:%d\nInner: %s:%d\n",
-	       iter->file, iter->line, file, line);
-      emacs_abort ();
-    }
-  iter->begin = begin;
-  iter->end = end;
-  iter->otick = tree->otick;
-  iter->order = order;
-  itree_stack_clear (iter->stack);
-  if (begin <= end && tree->root != NULL)
-    itree_stack_push_flagged (iter->stack, tree->root, false);
-  iter->file = file;
-  iter->line = line;
-  iter->running = true;
-  /* itree_stack_ensure_space (iter->stack,
-				  2 * itree_max_height (tree)); */
-  return iter;
-}
-
-/* Stop using the iterator. */
-
-void
-itree_iterator_finish (struct itree_iterator *iter)
-{
-  eassert (iter && iter->running);
-  iter->running = false;
-}
-
 
 /* +=======================================================================+
  * | Insert/Delete Gaps
@@ -1214,6 +1170,7 @@ itree_insert_gap (struct itree_tree *tree,
   struct itree_node *node = NULL;
   if (!before_markers)
     {
+      /* Actually any order would do.  */
       ITREE_FOREACH (node, tree, pos, pos + 1, PRE_ORDER)
 	{
 	  if (node->begin == pos && node->front_advance
@@ -1347,6 +1304,21 @@ itree_delete_gap (struct itree_tree *tree,
  * | Iterator
  * +=======================================================================+ */
 
+bool
+itree_iterator_busy_p (void)
+{
+  return (iter && iter->running);
+}
+
+/* Stop using the iterator. */
+
+void
+itree_iterator_finish (struct itree_iterator *iter)
+{
+  eassert (iter && iter->running);
+  iter->running = false;
+}
+
 /* Return true, if NODE's interval intersects with [BEGIN, END).
    Note: We always include empty nodes at BEGIN (and not at END),
    but if BEGIN==END, then we don't include non-empty nodes starting
@@ -1357,12 +1329,223 @@ itree_delete_gap (struct itree_tree *tree,
 
 static inline bool
 itree_node_intersects (const struct itree_node *node,
-			  ptrdiff_t begin, ptrdiff_t end)
+		       ptrdiff_t begin, ptrdiff_t end)
 {
   return (begin < node->end && node->begin < end)
     || (node->begin == node->end && begin == node->begin);
 }
 
+/* Return the "next" node in the current traversal order.
+
+   Note that this should return all the nodes that we need to traverse
+   in order to traverse the nodes selected by the current narrowing (i.e.
+   `ITER->begin..ITER->end`) so it will also return some nodes which aren't in
+   that narrowing simply because they may have children which are.
+
+   The code itself is very unsatifactory because the code of each one
+   of the supported traversals seems completely different from the others.
+   If someone knows how to make it more uniform and "obviously correct",
+   please make yourself heard.  */
+
+static struct itree_node *
+itree_iter_next_in_subtree (struct itree_node *node,
+                            struct itree_iterator *iter)
+{
+  struct itree_node *next;
+  switch (iter->order)
+    {
+    case ITREE_ASCENDING:
+      next = node->right;
+      if (!next)
+        {
+          while ((next = node->parent)
+                 && next->right == node)
+            node = next;
+          if (!next)
+            return NULL;   /* No more nodes to visit. */
+          node = next;
+        }
+      else
+        {
+          node = next;
+          itree_inherit_offset (iter->otick, node);
+          while ((next = node->left)
+                 && (itree_inherit_offset (iter->otick, next),
+                     iter->begin <= next->limit))
+            node = next;
+        }
+      if (node->begin > iter->end)
+        return NULL;  /* No more nodes within begin..end.  */
+      return node;
+
+    case ITREE_DESCENDING:
+      next = node->left;
+      if (!next
+          || (itree_inherit_offset (iter->otick, next),
+              next->limit < iter->begin))
+        {
+          while ((next = node->parent)
+                 && next->left == node)
+            node = next;
+          if (!next)
+            return NULL;   /* No more nodes to visit. */
+          node = next;
+        }
+      else
+        {
+          node = next;
+          while (node->begin <= iter->end
+                 && (next = node->right))
+            {
+              itree_inherit_offset (iter->otick, next),
+              node = next;
+            }
+        }
+      return node;
+
+    case ITREE_PRE_ORDER:
+      next = node->left;
+      if (next
+          && (itree_inherit_offset (iter->otick, next),
+              !(next->limit < iter->begin)))
+        return next;
+      next = node->right;
+      if (node->begin <= iter->end && next)
+        {
+          itree_inherit_offset (iter->otick, next);
+          return next;
+        }
+      while ((next = node->parent))
+        {
+          if (next->right == node)
+            node = next;
+          else
+            {
+              eassert (next->left == node);
+              node = next;
+              next = node->right;
+              if (node->begin <= iter->end && next)
+                {
+                  itree_inherit_offset (iter->otick, next);
+                  return next;
+                }
+            }
+          }
+      return NULL;
+
+    case ITREE_POST_ORDER:
+      next = node->parent;
+      if (!next || next->right == node)
+        return next;
+      eassert (next->left == node);
+      node = next;
+      next = node->right;
+      if (!(node->begin <= iter->end && next))
+        return node;
+      node = next;
+      itree_inherit_offset (iter->otick, node);
+      while (((next = node->left)
+              && (itree_inherit_offset (iter->otick, next),
+                  iter->begin <= next->limit))
+             || (node->begin <= iter->end
+                 && (next = node->right)
+                 && (itree_inherit_offset (iter->otick, next), true)))
+        node = next;
+      return node;
+
+    default:
+    emacs_abort ();
+    }
+}
+
+static struct itree_node *
+itree_iterator_first_node (struct itree_tree *tree,
+                           struct itree_iterator *iter)
+{
+  struct itree_node *node = tree->root;
+  if (node)
+    {
+      struct itree_node dummy;
+      dummy.left = NULL;
+      dummy.parent = NULL;
+      dummy.right = NULL;
+      itree_inherit_offset (iter->otick, node);
+      switch (iter->order)
+        {
+        case ITREE_ASCENDING:
+          dummy.right = node;
+          dummy.begin = PTRDIFF_MIN;
+          node = itree_iter_next_in_subtree (&dummy, iter);
+          break;
+
+        case ITREE_DESCENDING:
+          dummy.left = node;
+          node = itree_iter_next_in_subtree (&dummy, iter);
+          break;
+
+        case ITREE_PRE_ORDER:
+          break;
+
+        case ITREE_POST_ORDER:
+          dummy.parent = &dummy;
+          dummy.left = &dummy;
+          dummy.right = node;
+          dummy.begin = PTRDIFF_MIN;
+          node = itree_iter_next_in_subtree (&dummy, iter);
+          break;
+        default:
+          emacs_abort ();
+        }
+    }
+  return node;
+}
+
+/* Start a iterator enumerating all intervals in [BEGIN,END) in the
+   given ORDER.  Only one iterator per tree can be running at any time.  */
+
+struct itree_iterator *
+itree_iterator_start (struct itree_tree *tree, ptrdiff_t begin,
+		      ptrdiff_t end, enum itree_order order,
+		      const char *file, int line)
+{
+  eassert (iter);
+  if (iter->running)
+    {
+      fprintf (stderr,
+	       "Detected nested iteration!\nOuter: %s:%d\nInner: %s:%d\n",
+	       iter->file, iter->line, file, line);
+      emacs_abort ();
+    }
+  uintmax_t otick= tree->otick;
+  iter->begin = begin;
+  iter->end = end;
+  iter->otick = otick;
+  iter->order = order;
+  itree_stack_clear (iter->stack);
+  if (begin <= end && tree->root != NULL)
+    itree_stack_push_flagged (iter->stack, tree->root, false);
+  iter->file = file;
+  iter->line = line;
+  iter->running = true;
+  /* itree_stack_ensure_space (iter->stack,
+			       2 * itree_max_height (tree)); */
+  iter->node = itree_iterator_first_node (tree, iter);
+  return iter;
+}
+
+static struct itree_node *
+itree_iter_next (struct itree_iterator *iter)
+{
+  struct itree_node *node = iter->node;
+  while (node
+         && !itree_node_intersects (node, iter->begin, iter->end))
+    {
+      node = itree_iter_next_in_subtree (node, iter);
+    }
+  iter->node = node ? itree_iter_next_in_subtree (node, iter) : NULL;
+  return node;
+}
+
 /* Return the next node of the iterator in the order given when it was
    started; or NULL if there are no more nodes. */
 
@@ -1425,12 +1608,33 @@ itree_iterator_next (struct itree_iterator *g)
 	      if (itree_node_intersects (node, g->begin, g->end))
 		itree_stack_push_flagged (g->stack, node, true);
 	      break;
+	    case ITREE_POST_ORDER:
+	      if (itree_node_intersects (node, g->begin, g->end))
+		itree_stack_push_flagged (g->stack, node, true);
+	      if (right != null && node->begin <= g->end)
+		itree_stack_push_flagged (g->stack, right, false);
+	      if (left != null && g->begin <= left->limit + left->offset)
+		itree_stack_push_flagged (g->stack, left, false);
+	      break;
 	    }
 	}
       /* Node may have been invalidated by itree_iterator_narrow
 	 after it was pushed: Check if it still intersects. */
     } while (node && ! itree_node_intersects (node, g->begin, g->end));
 
+  struct itree_node *old_node = g->node;
+  struct itree_node *other_node = itree_iter_next (g);
+  if (other_node != node)
+    {
+      fprintf (stderr, "WOW!! %ld..%ld vs %ld..%ld\n",
+               other_node ? other_node->begin : -1,
+               other_node ? other_node->end : -1,
+               node ? node->begin : -1,
+               node ? node->end : -1);
+      fprintf (stderr, "ON=%lx N=%lx OlN=%lx\n", other_node, node,
+               old_node);
+      emacs_abort ();
+    }
   return node;
 }
 
diff --git a/src/itree.h b/src/itree.h
index 10ee0897c3..dc44823322 100644
--- a/src/itree.h
+++ b/src/itree.h
@@ -104,6 +104,7 @@ #define ITREE_H
     ITREE_ASCENDING,
     ITREE_DESCENDING,
     ITREE_PRE_ORDER,
+    ITREE_POST_ORDER,
   };
 
 extern void init_itree (void);

commit 51589f81323aa5010573ecfa5c3be95416a57df3
Author: Andrea Monaco <andrea.monaco@autistici.org>
Date:   Tue Nov 15 20:07:18 2022 +0100

    New Rmail summary "by thread"
    
    * lisp/mail/rmailsum.el (rmail-summary-subjects-hash-table)
    (rmail-summary-message-parents-vector)
    (rmail-summary-message-ids-hash-table): New variables.
    (rmail-summary-fill-message-ids-hash-table)
    (rmail-summary--split-header-field)
    (rmail-summary-fill-message-parents-vector)
    (rmail-summary-direct-descendants)
    (rmail-summary--walk-thread-message-recursively)
    (rmail-summary-by-thread): New functions.
    
    * etc/NEWS: Announce the new Rmail features.

diff --git a/etc/NEWS b/etc/NEWS
index 47fc9f1e8e..4c7af3c276 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2156,13 +2156,20 @@ The older form still works but is undocumented.
 
 ---
 *** Rmail partial summaries can now be applied one on top of the other.
-You can now narrow the filtering of messages by the summary's criteria
-(recipients, topic, senders, etc.) by making a summary of the already
-summarized messages.  For example, invoking 'rmail-summary-by-senders',
-followed by 'rmail-summary-by-topic' will produce a summary where both
-the senders and the topic are according to your selection.  The new
-user option 'rmail-summary-apply-filters-consecutively' controls
-whether the stacking of the filters is in effect.
+You can now narrow the set of messages selected by Rmail summary's
+criteria (recipients, topic, senders, etc.) by making a summary of the
+already summarized messages.  For example, invoking
+'rmail-summary-by-senders', followed by 'rmail-summary-by-topic' will
+produce a summary where both the senders and the topic are according
+to your selection.  The new user option
+'rmail-summary-progressively-narrow' controls whether the stacking of
+the filters is in effect; customize it to a non-nil value to enable
+this feature.
+
+---
+*** New Rmail summary: by thread.
+The new command 'rmail-summary-by-thread' produces a summary of
+messages that belong to a single thread of discussion.
 
 ** EIEIO
 
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index d72464cb81..93fc0f5d2b 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -72,6 +72,18 @@ rmail-summary-currently-displayed-msgs
 `rmail-summary-populate-displayed-messages'.")
 (put 'rmail-summary-currently-displayed-msgs 'permanent-local t)
 
+(defvar rmail-summary-message-ids-hash-table nil
+  "Hash table linking Message IDs of messages with their indices.")
+
+(defvar rmail-summary-subjects-hash-table nil
+  "Hash table linking subjects with index of the first message with that subject.")
+
+(defvar rmail-summary-message-parents-vector nil
+  "Vector that holds a list of indices of parents for each message.
+Message A is parent to message B if the id of A appear in the
+References or In-reply-to fields of B, or if A is the first
+message with the same subject as B.  First element is ignored.")
+
 (defvar rmail-summary-font-lock-keywords
   '(("^ *[0-9]+D.*" . font-lock-string-face)			; Deleted.
     ("^ *[0-9]+-.*" . font-lock-type-face)			; Unread.
@@ -303,6 +315,52 @@ rmail-summary-populate-displayed-messages
 		t)
 	  (forward-line 1))))))
 
+(defun rmail-summary-fill-message-ids-hash-table ()
+  "Fill `rmail-summary-message-ids-hash-table'."
+  (with-current-buffer rmail-buffer
+    (setq rmail-summary-message-ids-hash-table (make-hash-table :test 'equal :size 1024))
+    (let ((msgnum 1))
+      (while (<= msgnum rmail-total-messages)
+	(let ((id (rmail-get-header "Message-ID" msgnum)))
+	  (puthash id (cons (cons id msgnum) (gethash id rmail-summary-message-ids-hash-table))
+		   rmail-summary-message-ids-hash-table))
+	(setq msgnum (1+ msgnum))))))
+
+(defun rmail-summary--split-header-field (name &optional msgnum)
+  (let ((header (rmail-get-header name msgnum)))
+    (if header
+	(split-string header "[ \f\t\n\r\v,;]+"))))
+
+(defun rmail-summary-fill-message-parents-vector ()
+  "Fill `rmail-summary-message-parents-vector'."
+  (with-current-buffer rmail-buffer
+    (rmail-summary-fill-message-ids-hash-table)
+    (setq rmail-summary-subjects-hash-table
+          (make-hash-table :test 'equal :size 1024))
+    (setq rmail-summary-message-parents-vector
+          (make-vector (1+ rmail-total-messages) nil))
+    (let ((msgnum 1))
+      (while (<= msgnum rmail-total-messages)
+	(let* ((parents nil)
+	       (subject (rmail-simplified-subject msgnum))
+	       (subj-cell (gethash subject rmail-summary-subjects-hash-table))
+	       (subj-par (assoc subject subj-cell))
+	       (refs (rmail-summary--split-header-field "References" msgnum))
+	       (reply-to (rmail-summary--split-header-field "In-reply-to"
+                                                            msgnum)))
+	  (if subj-par
+	      (setq parents (cons (cdr subj-par) parents))
+	    (puthash subject (cons (cons subject msgnum) subj-cell)
+		     rmail-summary-subjects-hash-table))
+	  (dolist (id (append refs reply-to))
+	    (let ((ent
+                   (assoc id
+                          (gethash id rmail-summary-message-ids-hash-table))))
+	      (if ent
+		  (setq parents (cons (cdr ent) parents)))))
+	  (aset rmail-summary-message-parents-vector msgnum parents)
+	  (setq msgnum (1+ msgnum)))))))
+
 (defun rmail-summary-invert ()
   "Invert the criteria of the current summary.
 That is, show the messages that are not displayed, and hide
@@ -330,6 +388,63 @@ rmail-summary
   (interactive)
   (rmail-new-summary "All" '(rmail-summary) nil))
 
+(defun rmail-summary-direct-descendants (msgnum encountered-msgs)
+  "Find all direct descendants of MSGNUM, ignoring ENCOUNTERED-MSGS.
+Assumes `rmail-summary-message-parents-vector' is filled.  Ignores messages
+already ticked in ENCOUNTERED-MSGS."
+  (let (desc
+	(msg 1))
+    (while (<= msg rmail-total-messages)
+      (when (and
+	     (eq nil (aref encountered-msgs msg))
+	     (memq msgnum (aref rmail-summary-message-parents-vector msg)))
+	(setq desc (cons msg desc)))
+      (setq msg (1+ msg)))
+    desc))
+
+(defun rmail-summary--walk-thread-message-recursively (msgnum encountered-msgs)
+  "Add parents and descendants of message MSGNUM to ENCOUNTERED-MSGS, recursively."
+  (unless (eq (aref encountered-msgs msgnum) t)
+    (aset encountered-msgs msgnum t)
+    (let ((walk-thread-msg
+           (lambda (msg)
+             (rmail-summary--walk-thread-message-recursively
+              msg encountered-msgs))))
+      (mapcar walk-thread-msg
+              (aref rmail-summary-message-parents-vector msgnum))
+      (mapcar walk-thread-msg
+              (rmail-summary-direct-descendants msgnum encountered-msgs)))))
+
+;;;###autoload
+(defun rmail-summary-by-thread (&optional msgnum)
+  "Display a summary of messages in the same discussion thread as MSGNUM.
+Interactively, prompt for MSGNUM, defaulting to the current message.
+Threads are based on the \"Subject\", \"References\" and \"In-reply-to\"
+headers of the messages."
+  (interactive
+   (let* ((msg rmail-current-message)
+	  (prompt (concat "Show thread containing message number")))
+     (list (read-number prompt msg))))
+  (with-current-buffer rmail-buffer
+    (unless msgnum
+      (setq msgnum rmail-current-message))
+    (unless (and rmail-summary-message-parents-vector
+		 (= (length rmail-summary-message-parents-vector)
+		    (1+ rmail-total-messages)))
+      (rmail-summary-fill-message-parents-vector))
+    (let ((enc-msgs (make-bool-vector (1+ rmail-total-messages) nil)))
+      (rmail-summary--walk-thread-message-recursively msgnum enc-msgs)
+      (rmail-new-summary (format "thread containing message %d" msgnum)
+			 (list 'rmail-summary-by-thread msgnum)
+			 (if (and rmail-summary-intersect-consecutive-filters
+				  (rmail-summary--exists-1))
+			     (lambda (msg msgnum)
+			       (and (eq (aref rmail-summary-currently-displayed-msgs msg)
+					t)
+				    (eq (aref enc-msgs msg) t)))
+			   (lambda (msg msgnum) (eq (aref enc-msgs msg) t)))
+			 msgnum))))
+
 ;;;###autoload
 (defun rmail-summary-by-labels (labels)
   "Display a summary of all messages with one or more LABELS.

commit f320663239a14aceee01868c465a4461e3a69954
Author: Andrea Monaco <andrea.monaco@autistici.org>
Date:   Mon Nov 7 15:13:13 2022 +0100

    Improve progressive summaries in Rmail
    
    * lisp/mail/rmailsum.el (rmail-summary-progressively-narrow):
    Renamed from 'rmail-summary-apply-filters-consecutively'.  Doc
    fix.
    (rmail-summary-invert): Renamed from 'rmail-summary-negate'.  Doc
    fix.
    (rmail-summary-currently-displayed-msgs): Doc fix.
    (rmail-summary--exists-1): New function.
    (rmail-summary-by-labels, rmail-summary-by-recipients)
    (rmail-summary-by-regexp, rmail-summary-by-topic)
    (rmail-summary-by-senders): Call 'rmail-summary-exists' to verify
    that the summary is usable.

diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 0144a34e5e..d72464cb81 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -50,21 +50,26 @@ rmail-summary-line-count-flag
   :type 'boolean
   :group 'rmail-summary)
 
-(defcustom rmail-summary-apply-filters-consecutively nil
-  "If non-nil, Rmail summary commands apply filtering on top existing filtering.
-When this variable is non-nil, `rmail-summary-by-*' commands work on the
-current summary, and so their filtering can be stacked one on top of another.
-This allows gradual narrowing of the selection of the messages."
+(defcustom rmail-summary-progressively-narrow nil
+  "Non-nil means progressively narrow the set of messages produced by summary.
+This allows to apply the summary criteria on top one another,
+thus progressively narrowing the selection of the messages produced
+by each summary criteria.
+For example, applying `rmail-summary-by-senders' on top
+of `rmail-summary-by-topic' produces a summary of messages
+with the specified Subjects that were sent from specified
+sending addresses.
+This way, the user can apply one summary on top of another,
+and keep narrowing the resulting list of messages."
   :type 'boolean
   :version "29.1"
   :group 'rmail-summary)
 
 (defvar rmail-summary-currently-displayed-msgs nil
-  "String made of `y' and `n'.
-The character at position i tells wether message i is shown in the
-summary or not.  First character is ignored.
-Used when applying `rmail-summary-by-*' commands consecutively.  Filled
-by `rmail-summary-fill-displayed-messages'.")
+  "Boolean vector that tells which messages are displayed in the summary.
+First element is ignored.  Used when applying rmail-summary-by-*
+commands consecutively.  Filled by
+`rmail-summary-populate-displayed-messages'.")
 (put 'rmail-summary-currently-displayed-msgs 'permanent-local t)
 
 (defvar rmail-summary-font-lock-keywords
@@ -284,33 +289,40 @@ rmail-summary-mode-map
 (defun rmail-update-summary (&rest _)
   (apply (car rmail-summary-redo) (cdr rmail-summary-redo)))
 
-(defun rmail-summary-fill-displayed-messages ()
-  "Fill the rmail-summary-currently-displayed-msgs string."
+(defun rmail-summary-populate-displayed-messages ()
+  "Populate the `rmail-summary-currently-displayed-msgs' vector."
   (with-current-buffer rmail-buffer
-    (with-current-buffer rmail-summary-buffer
-      (setq rmail-summary-currently-displayed-msgs
-	    (make-string (1+ rmail-total-messages) ?n))
-      (goto-char (point-min))
-      (while (not (eobp))
-	(aset rmail-summary-currently-displayed-msgs
-	      (string-to-number (thing-at-point 'line))
-	      ?y)
-	(forward-line 1)))))
-
-(defun rmail-summary-negate ()
-  "Toggle display of messages that match the summary and those which do not."
+    (let ((totmsgs rmail-total-messages))
+      (with-current-buffer rmail-summary-buffer
+	(setq rmail-summary-currently-displayed-msgs
+	      (make-bool-vector (1+ totmsgs) nil))
+	(goto-char (point-min))
+	(while (not (eobp))
+	  (aset rmail-summary-currently-displayed-msgs
+		(string-to-number (thing-at-point 'line))
+		t)
+	  (forward-line 1))))))
+
+(defun rmail-summary-invert ()
+  "Invert the criteria of the current summary.
+That is, show the messages that are not displayed, and hide
+the messages that are displayed."
   (interactive)
-  (rmail-summary-fill-displayed-messages)
-  (rmail-new-summary "Negate"
+  (rmail-summary-populate-displayed-messages)
+  (rmail-new-summary "Invert"
 		     '(rmail-summary-by-regexp ".*")
 		     (lambda (msg)
 		       (if
-			   (= (aref rmail-summary-currently-displayed-msgs msg)
-			      ?n)
-			   (progn
-			     (aset rmail-summary-currently-displayed-msgs msg ?y) t)
-			 (progn
-			   (aset rmail-summary-currently-displayed-msgs msg ?n) nil)))))
+			   (eq (aref rmail-summary-currently-displayed-msgs msg)
+			       nil)
+			   (aset rmail-summary-currently-displayed-msgs msg t)
+			 (aset rmail-summary-currently-displayed-msgs msg nil)))))
+
+(defun rmail-summary--exists-1 ()
+  "Like `rmail-summary-exists', but works in both main and summary buffers."
+  (with-current-buffer rmail-buffer
+    (and rmail-summary-buffer (buffer-name rmail-summary-buffer)
+	 rmail-summary-buffer)))
 
 ;;;###autoload
 (defun rmail-summary ()
@@ -327,14 +339,16 @@ rmail-summary-by-labels
       (setq labels (or rmail-last-multi-labels
 		       (error "No label specified"))))
   (setq rmail-last-multi-labels labels)
-  (if rmail-summary-apply-filters-consecutively
-      (rmail-summary-fill-displayed-messages))
+  (if (and rmail-summary-progressively-narrow
+	   (rmail-summary--exists-1))
+      (rmail-summary-populate-displayed-messages))
   (rmail-new-summary (concat "labels " labels)
 		     (list 'rmail-summary-by-labels labels)
-		     (if rmail-summary-apply-filters-consecutively
+		     (if (and rmail-summary-progressively-narrow
+			      (rmail-summary--exists-1))
 			 (lambda (msg l)
-			   (and (= (aref rmail-summary-currently-displayed-msgs msg)
-				   ?y)
+			   (and (eq (aref rmail-summary-currently-displayed-msgs msg)
+				    t)
 				(rmail-message-labels-p msg l)))
 		       'rmail-message-labels-p)
 		     (concat " \\("
@@ -349,15 +363,17 @@ rmail-summary-by-recipients
  only look in the To and From fields.
 RECIPIENTS is a regular expression."
   (interactive "sRecipients to summarize by: \nP")
-  (if rmail-summary-apply-filters-consecutively
-      (rmail-summary-fill-displayed-messages))
+  (if (and rmail-summary-progressively-narrow
+	   (rmail-summary--exists-1))
+      (rmail-summary-populate-displayed-messages))
   (rmail-new-summary
    (concat "recipients " recipients)
    (list 'rmail-summary-by-recipients recipients primary-only)
-   (if rmail-summary-apply-filters-consecutively
+   (if (and rmail-summary-progressively-narrow
+	    (rmail-summary--exists-1))
        (lambda (msg r &optional po)
-	 (and (= (aref rmail-summary-currently-displayed-msgs msg)
-		 ?y)
+	 (and (eq (aref rmail-summary-currently-displayed-msgs msg)
+		  t)
 	      (rmail-message-recipients-p msg r po)))
      'rmail-message-recipients-p)
    recipients primary-only))
@@ -388,14 +404,16 @@ rmail-summary-by-regexp
       (setq regexp (or rmail-last-regexp
 			 (error "No regexp specified"))))
   (setq rmail-last-regexp regexp)
-  (if rmail-summary-apply-filters-consecutively
-      (rmail-summary-fill-displayed-messages))
+  (if (and rmail-summary-progressively-narrow
+	   (rmail-summary--exists-1))
+      (rmail-summary-populate-displayed-messages))
   (rmail-new-summary (concat "regexp " regexp)
 		     (list 'rmail-summary-by-regexp regexp)
-		     (if rmail-summary-apply-filters-consecutively
+		     (if (and rmail-summary-progressively-narrow
+			      (rmail-summary--exists-1))
 			 (lambda (msg r)
-			   (and (= (aref rmail-summary-currently-displayed-msgs msg)
-				   ?y)
+			   (and (eq (aref rmail-summary-currently-displayed-msgs msg)
+				    t)
 				(rmail-message-regexp-p msg r)))
 		       'rmail-message-regexp-p)
                      regexp))
@@ -443,15 +461,17 @@ rmail-summary-by-topic
 			  (if subject ", default current subject" "")
 			  "): ")))
      (list (read-string prompt nil nil subject) current-prefix-arg)))
-  (if rmail-summary-apply-filters-consecutively
-      (rmail-summary-fill-displayed-messages))
+  (if (and rmail-summary-progressively-narrow
+	   (rmail-summary--exists-1))
+      (rmail-summary-populate-displayed-messages))
   (rmail-new-summary
    (concat "about " subject)
    (list 'rmail-summary-by-topic subject whole-message)
-   (if rmail-summary-apply-filters-consecutively
+   (if (and rmail-summary-progressively-narrow
+	    (rmail-summary--exists-1))
        (lambda (msg s &optional wm)
-	 (and (= (aref rmail-summary-currently-displayed-msgs msg)
-		 ?y)
+	 (and (eq (aref rmail-summary-currently-displayed-msgs msg)
+		  t)
 	      (rmail-message-subject-p msg s wm)))
      'rmail-message-subject-p)
    subject whole-message))
@@ -477,15 +497,17 @@ rmail-summary-by-senders
 			  (if sender ", default this message's sender" "")
 			  "): ")))
      (list (read-string prompt nil nil sender))))
-  (if rmail-summary-apply-filters-consecutively
-      (rmail-summary-fill-displayed-messages))
+  (if (and rmail-summary-progressively-narrow
+	   (rmail-summary--exists-1))
+      (rmail-summary-populate-displayed-messages))
   (rmail-new-summary
    (concat "senders " senders)
    (list 'rmail-summary-by-senders senders)
-   (if rmail-summary-apply-filters-consecutively
+   (if (and rmail-summary-progressively-narrow
+	    (rmail-summary--exists-1))
        (lambda (msg s)
-	 (and (= (aref rmail-summary-currently-displayed-msgs msg)
-		 ?y)
+	 (and (eq (aref rmail-summary-currently-displayed-msgs msg)
+		  t)
 	      (rmail-message-senders-p msg s)))
      'rmail-message-senders-p)
    senders))

commit 62e37ecc4020b3a5b18cfdcff9a7cb259fd8145a
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Nov 17 15:03:40 2022 +0200

    Fix documentation of recent treesit changes
    
    * src/treesit.c (Ftreesit_parser_notifiers)
    (Ftreesit_parser_add_notifier, Ftreesit_parser_remove_notifier):
    Doc string fixes.
    
    * doc/lispref/parsing.texi (Accessing Node Information): Fix
    wording and punctuation.
    (Using Parser): Improve indexing and wording.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index d73057321e..feb92345ff 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -224,33 +224,36 @@ Language Definitions
 @end example
 
 @heading Exploring the syntax tree
+@cindex explore tree-sitter syntax tree
+@cindex inspection of tree-sitter parse tree nodes
 
-To aid understanding the syntax of a language and debugging, Emacs
-provides a ``explore'' mode, which displays the syntax tree of the
-source in the current buffer in real time.  Emacs also comes with a
-``inspect mode'', which displays information of the nodes at point in
-the mode-line.
+To aid in understanding the syntax of a language and in debugging of
+Lisp program that use the syntax tree, Emacs provides an ``explore''
+mode, which displays the syntax tree of the source in the current
+buffer in real time.  Emacs also comes with an ``inspect mode'', which
+displays information of the nodes at point in the mode-line.
 
 @deffn Command treesit-explore-mode
 This mode pops up a window displaying the syntax tree of the source in
-the current buffer.  Emacs highlights nodes in the syntax tree if
-their corresponding text in the source buffer is selected.  Clicking
+the current buffer.  Selecting text in the source buffer highlights
+the corresponding nodes in the syntax tree display.  Clicking
 on nodes in the syntax tree highlights the corresponding text in the
 source buffer.
 @end deffn
 
 @deffn Command treesit-inspect-mode
 This minor mode displays on the mode-line the node that @emph{starts}
-at point.  The mode-line will display
+at point.  For example, the mode-line can display
 
 @example
 @var{parent} @var{field}: (@var{node} (@var{child} (@dots{})))
 @end example
 
-where @var{node}, @var{child}, etc, are nodes which begin at point.
+@noindent
+where @var{node}, @var{child}, etc., are nodes which begin at point.
 @var{parent} is the parent of @var{node}.  @var{node} is displayed in
-bold typeface.  @var{field-name}s are field names of @var{node} and
-@var{child}, etc.
+a bold typeface.  @var{field-name}s are field names of @var{node} and
+of @var{child}, etc.
 
 If no node starts at point, i.e., point is in the middle of a node,
 then the mode line displays the earliest node that spans point, and
@@ -478,43 +481,44 @@ Using Parser
 the root node of the generated syntax tree.
 @end defun
 
-@cindex parse-tree update callback, tree-sitter
-@cindex parse-tree after-change notifer, tree-sitter
-@cindex tree-sitter parse-tree update callback
-@cindex tree-sitter parse-tree after-change notifer
 @heading Be notified by changes to the parse tree
-
-A Lisp program might want to be notified of affected text of a
-incremental parse.  For example, inserting a closing comment token
-converts text before that closing comment token into comments.  Even
-though those text are not directly edited, they are changed
+@cindex update callback, for tree-sitter parse-tree
+@cindex after-change notifier, for tree-sitter parse-tree
+@cindex tree-sitter parse-tree, update and after-change callback
+@cindex notifiers, tree-sitter
+
+A Lisp program might want to be notified of text affected by
+incremental parsing.  For example, inserting a comment-closing token
+converts text before that token into a comment.  Even
+though the text is not directly edited, it is deemed to be ``changed''
 nevertheless.
 
 Emacs lets a Lisp program to register callback functions
-(@dfn{notifiers}) for this kind of changes.  A notifier function takes
-2 arguments: @var{ranges} and @var{parser}.  @var{ranges} is a list of
-cons of the form @w{@code{(@var{start} . @var{end})}}, where
-@var{start} and @var{end} marks the start and end position of a range.
-@var{parser} is the parser issuing the notification.
+(a.k.a.@: @dfn{notifiers}) for this kind of changes.  A notifier
+function takes two arguments: @var{ranges} and @var{parser}.
+@var{ranges} is a list of cons cells of the form @w{@code{(@var{start}
+. @var{end})}}, where @var{start} and @var{end} mark the start and the
+end positions of a range.  @var{parser} is the parser issuing the
+notification.
 
 Every time a parser reparses a buffer, it compares the old and new
 parse-tree, computes the ranges in which nodes have changed, and
 passes the ranges to notifier functions.
 
 @defun treesit-parser-add-notifier parser function
-This function adds @var{function} to @var{parser}'s after-change
-notifier functions list.  @var{function} must be a function symbol,
-rather than a lambda function.
+This function adds @var{function} to @var{parser}'s list of
+after-change notifier functions.  @var{function} must be a function
+symbol, not a lambda function (@pxref{Anonymous Functions}).
 @end defun
 
 @defun treesit-parser-remove-notifier parser function
-This function removes @var{function} from @var{parser}'s after-change
-notifier functions list.  @var{function} must be a function symbol,
-rather than a lambda function.
+This function removes @var{function} from the list of @var{parser}'s
+after-change notifier functions.  @var{function} must be a function
+symbol, rather than a lambda function.
 @end defun
 
 @defun treesit-parser-notifiers parser
-This function returns @var{parser}'s notifier function list.
+This function returns the list of @var{parser}'s notifier functions.
 @end defun
 
 @node Retrieving Nodes
@@ -932,8 +936,8 @@ Accessing Node Information
 
 @cindex tree-sitter outdated node
 @cindex outdated node, tree-sitter
-A node can be ``outdated'': If its parser has reparse at least once
-after the node was created, the node is outdated.
+A node can be ``outdated'', if its parser has reparsed at least once
+after the node was created.
 
 @cindex tree-sitter node that has error
 @cindex has error, tree-sitter node
@@ -951,8 +955,8 @@ Accessing Node Information
 Named nodes have ``types'' (@pxref{tree-sitter node type, node type}).
 For example, a named node can be a @code{string_literal} node, where
 @code{string_literal} is its type.  The type of an anonymous node is
-just the text that node represents, e.g., the type of a @samp{,} node
-is just @samp{,}.
+just the text that the node represents; e.g., the type of a @samp{,}
+node 480is just @samp{,}.
 
 This function returns @var{node}'s type as a string.
 @end defun
diff --git a/src/treesit.c b/src/treesit.c
index a05efaf5db..53b1e0d8dc 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1504,7 +1504,7 @@ DEFUN ("treesit-parser-included-ranges",
 DEFUN ("treesit-parser-notifiers", Ftreesit_parser_notifiers,
        Streesit_parser_notifiers,
        1, 1, 0,
-       doc: /* Return the after-change notifier functions for PARSER.  */)
+       doc: /* Return the list of after-change notifier functions for PARSER.  */)
   (Lisp_Object parser)
 {
   treesit_check_parser (parser);
@@ -1520,10 +1520,10 @@ DEFUN ("treesit-parser-notifiers", Ftreesit_parser_notifiers,
 DEFUN ("treesit-parser-add-notifier", Ftreesit_parser_add_notifier,
        Streesit_parser_add_notifier,
        2, 2, 0,
-       doc: /* Add FUNCTION to PARSER's after-change notifiers list.
+       doc: /* Add FUNCTION to the list of PARSER's after-change notifiers.
 FUNCTION must be a function symbol, rather than a lambda form.
 FUNCTION should take 2 arguments, RANGES and PARSER.  RANGES is a list
-of cons of the form (START . END), where START and END are buffer
+of cons cells of the form (START . END), where START and END are buffer
 positions.  PARSER is the parser issuing the notification.  */)
   (Lisp_Object parser, Lisp_Object function)
 {
@@ -1540,8 +1540,8 @@ DEFUN ("treesit-parser-add-notifier", Ftreesit_parser_add_notifier,
 DEFUN ("treesit-parser-remove-notifier", Ftreesit_parser_remove_notifier,
        Streesit_parser_remove_notifier,
        2, 2, 0,
-       doc: /* Remove FUNCTION from PARSER's after-change notifiers
-list.  FUNCTION must be a function symbol, rather than a lambda form.
+       doc: /* Remove FUNCTION from the list of PARSER's after-change notifiers.
+  FUNCTION must be a function symbol, rather than a lambda form.
 FUNCTION should take 2 arguments, RANGES and PARSER.  RANGES is a list
 of cons of the form (START . END), where START and END are buffer
 positions.  PARSER is the parser issuing the notification.   */)

commit ca3cc92e14a6bdaf6fb817fff9e633f30d461359
Author: Alan Mackenzie <acm@muc.de>
Date:   Thu Nov 17 10:34:41 2022 +0000

    CC Mode: Make implicit int types following specifiers fontify correctly
    
    This fixes bug #59267.  It applies to C Mode only, and refers to constructs
    like "register count;" which are implicitly of int type.
    
    * lisp/progmodes/cc-engine.el (c-forward-type): Use the new regexp
    c-maybe-typeless-specifier-re in place of c-opt-type-modifier-prefix-key.  Add
    an extra arm to the main cond form to handle the construct, and another to
    handle "extern "C" foo_t my_foo;".
    (c-forward-decl-or-cast-1): Adapt to handle the result no-id from
    c-forward-type.
    
    * lisp/progmodes/cc-langs.el (c-maybe-typeless-specifier-re): New lang
    const/var.

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index df8387905f..8813ec4686 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -9036,7 +9036,8 @@ c-forward-type
   ;;   o - 'found if it's a type that matches one in `c-found-types';
   ;;   o - 'maybe if it's an identifier that might be a type;
   ;;   o - 'decltype if it's a decltype(variable) declaration; - or
-  ;;   o - 'no-id if "auto" precluded parsing a type identifier.
+  ;;   o - 'no-id if "auto" precluded parsing a type identifier (C++)
+  ;;      or the type int was implicit (C).
   ;;   o -  nil if it can't be a type (the point isn't moved then).
   ;;
   ;; The point is assumed to be at the beginning of a token.
@@ -9060,10 +9061,11 @@ c-forward-type
 
     ;; Skip leading type modifiers.  If any are found we know it's a
     ;; prefix of a type.
-    (when c-opt-type-modifier-prefix-key ; e.g. "const" "volatile", but NOT "typedef"
-      (while (looking-at c-opt-type-modifier-prefix-key)
-	(when (looking-at c-no-type-key)
-	  (setq res 'no-id))
+    (when c-maybe-typeless-specifier-re
+      (while (looking-at c-maybe-typeless-specifier-re)
+	(save-match-data
+	  (when (looking-at c-no-type-key)
+	    (setq res 'no-id)))
 	(goto-char (match-end 1))
 	(c-forward-syntactic-ws)
 	(or (eq res 'no-id)
@@ -9128,6 +9130,9 @@ c-forward-type
        (not (eq res 'no-id))
        (progn
 	 (setq pos nil)
+	 (while (and c-opt-cpp-prefix
+		     (looking-at c-noise-macro-with-parens-name-re))
+	   (c-forward-noise-clause))
 	 (if (looking-at c-identifier-start)
 	     (save-excursion
 	       (setq id-start (point)
@@ -9187,6 +9192,18 @@ c-forward-type
 	    (goto-char (match-end 1))
 	    (c-forward-syntactic-ws)))))
 
+     ((and (eq name-res t)
+	   (eq res 'prefix)
+	   (c-major-mode-is 'c-mode)
+	   (save-excursion
+	     (goto-char id-end)
+	     (and (not (looking-at c-symbol-start))
+		  (not (looking-at c-type-decl-prefix-key)))))
+      ;; A C specifier followed by an implicit int, e.g.
+      ;; "register count;"
+      (goto-char id-start)
+      (setq res 'no-id))
+
      (name-res
       (cond ((eq name-res t)
 	     ;; A normal identifier.
@@ -9224,7 +9241,11 @@ c-forward-type
 	    (t
 	     ;; Otherwise it's an operator identifier, which is not a type.
 	     (goto-char start)
-	     (setq res nil)))))
+	     (setq res nil))))
+
+     ((eq res 'prefix)
+      ;; Deal with "extern "C" foo_t my_foo;"
+      (setq res nil)))
 
     (when (not (memq res '(nil no-id)))
       ;; Skip trailing type modifiers.  If any are found we know it's
@@ -10012,9 +10033,11 @@ c-fdoc-shift-type-backward
 	       got-suffix-after-parens id-start
 	       paren-depth 0))
 
-     (if (setq at-type (if (eq backup-at-type 'prefix)
-			   t
-			 backup-at-type))
+     (if (not (memq
+	       (setq at-type (if (eq backup-at-type 'prefix)
+				 t
+			       backup-at-type))
+	       '(nil no-id)))
 	 (setq type-start backup-type-start
 	       id-start backup-id-start)
        (setq type-start start-pos
@@ -11219,7 +11242,8 @@ c-forward-decl-or-cast-1
 
       ;; Record the type's coordinates in `c-record-type-identifiers' for
       ;; later fontification.
-      (when (and c-record-type-identifiers at-type ;; (not (eq at-type t))
+      (when (and c-record-type-identifiers
+		 (not (memq at-type '(nil no-id)))
 		 ;; There seems no reason to exclude a token from
 		 ;; fontification just because it's "a known type that can't
 		 ;; be a name or other expression".  2013-09-18.
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 291af038b7..94c84a6a70 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -3869,6 +3869,14 @@ c-type-decl-prefix-keywords-key
 		     t)
 	 "\\>")))
 
+(c-lang-defconst c-maybe-typeless-specifier-re
+  "Regexp matching keywords which might, but needn't, declare variables with
+no explicit type given, or nil in languages without such specifiers."
+  t (c-lang-const c-opt-type-modifier-prefix-key)
+  c (c-lang-const c-type-decl-prefix-keywords-key))
+(c-lang-defvar c-maybe-typeless-specifier-re
+  (c-lang-const c-maybe-typeless-specifier-re))
+
 (c-lang-defconst c-type-decl-prefix-key
   "Regexp matching any declarator operator that might precede the
 identifier in a declaration, e.g. the \"*\" in \"char *argv\".  This

commit 5df1fd19baddb811ab358b6f1358d4b6fad434a2
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Nov 17 12:34:06 2022 +0200

    ; * lisp/progmodes/elisp-mode.el (eval-defun): Doc fix.

diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index 5b3e0146fa..6bdaa7a37a 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -1690,15 +1690,21 @@ elisp--eval-defun
     elisp--eval-defun-result))
 
 (defun eval-defun (edebug-it)
-  "Evaluate EDEBUG-IT or the top-level form containing point.
+  "Evaluate top-level form around point and instrument it if EDEBUG-IT is non-nil.
+Interactively, EDEBUG-IT is the prefix argument.
+If `edebug-all-defs' is non-nil, that inverts the meaning of EDEBUG-IT
+and the prefix argument: this function will instrument the form
+unless EDEBUG-IT is non-nil.  The command `edebug-all-defs' toggles
+the value of the variable `edebug-all-defs'.
+
 If point isn't in a top-level form, evaluate the first top-level
 form after point.  If there is no top-level form after point,
-eval the first preceeding top-level form.
+evaluate the first preceeding top-level form.
 
 If the current defun is actually a call to `defvar' or `defcustom',
 evaluating it this way resets the variable using its initial value
 expression (using the defcustom's :set function if there is one), even
-if the variable already has some other value.  \(Normally `defvar' and
+if the variable already has some other value.  (Normally `defvar' and
 `defcustom' do not alter the value if there already is one.)  In an
 analogous way, evaluating a `defface' overrides any customizations of
 the face, so that it becomes defined exactly as the `defface' expression
@@ -1707,8 +1713,6 @@ eval-defun
 If `eval-expression-debug-on-error' is non-nil, which is the default,
 this command arranges for all errors to enter the debugger.
 
-With a prefix argument, instrument the code for Edebug.
-
 If acting on a `defun' for FUNCTION, and the function was
 instrumented, `Edebug: FUNCTION' is printed in the echo area.  If not
 instrumented, just FUNCTION is printed.

commit 8a6c5be683a283d12cc795f091d52d6d75e2e5e8
Author: Jan Stranik <jan@stranik.org>
Date:   Fri Oct 28 16:13:42 2022 -0400

    Support multi-line C++11 strings in Ebrowse
    
    * lib-src/ebrowse.c (yylex): Support C++11 multi-line strings.
    (bug#58847)

diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 641570da02..d3af926b63 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -1574,6 +1574,67 @@ yylex (void)
 
         end_string:
           return end_char == '\'' ? CCHAR : CSTRING;
+	case 'R':
+	  if (GET (c) == '"')
+	    {
+	      /* C++11 rstrings.  */
+
+#define RSTRING_EOF_CHECK						\
+	      do {							\
+		if (c == '\0')						\
+		  {							\
+		    yyerror ("unterminated c++11 rstring", NULL);	\
+		    UNGET ();						\
+		    return CSTRING;					\
+		  }							\
+	      } while (0)
+
+	    char *rstring_prefix_start = in;
+
+	    while (GET (c) != '(')
+	      {
+		RSTRING_EOF_CHECK;
+		if (c == '"')
+		  {
+		    yyerror ("malformed c++11 rstring", NULL);
+		    return CSTRING;
+		  }
+	      }
+	    char *rstring_prefix_end = in - 1;
+	    while (TRUE)
+	      {
+		switch (GET (c))
+		  {
+		  default:
+		    RSTRING_EOF_CHECK;
+		    break;
+		  case '\n':
+		    INCREMENT_LINENO;
+		    break;
+		  case ')':
+		    {
+		      char *in_saved = in;
+		      char *prefix = rstring_prefix_start;
+		      while (prefix != rstring_prefix_end && GET (c) == *prefix)
+			{
+			  RSTRING_EOF_CHECK;
+			  prefix++;
+			}
+		      if (prefix == rstring_prefix_end)
+			{
+			  if (GET (c) == '"')
+			    return CSTRING;
+			  RSTRING_EOF_CHECK;
+			}
+		      in = in_saved;
+		    }
+		  }
+	      }
+	    }
+
+          UNGET ();
+          /* Fall through to identifiers and keywords.  */
+	  FALLTHROUGH;
 
         case 'a': case 'b': case 'c': case 'd': case 'e': case 'f': case 'g':
         case 'h': case 'i': case 'j': case 'k': case 'l': case 'm': case 'n':
@@ -1581,7 +1642,7 @@ yylex (void)
         case 'v': case 'w': case 'x': case 'y': case 'z':
         case 'A': case 'B': case 'C': case 'D': case 'E': case 'F': case 'G':
         case 'H': case 'I': case 'J': case 'K': case 'L': case 'M': case 'N':
-        case 'O': case 'P': case 'Q': case 'R': case 'S': case 'T': case 'U':
+        case 'O': case 'P': case 'Q': case 'S': case 'T': case 'U':
         case 'V': case 'W': case 'X': case 'Y': case 'Z': case '_':
           {
             /* Identifier and keywords.  */

commit 67d08daa97019ae11f5a85fc40cf95138e4837dc
Author: Laurence Warne <laurencewarne@gmail.com>
Date:   Sun Nov 13 19:53:17 2022 +0000

    Make VSIZE and RSS human-readable in Proced buffers
    
    * lisp/proced.el (proced-format-memory): New function.
    (proced-grammar-alist): Use proced-format-memory to format
    VSIZE and RSS.  (Bug#59272)

diff --git a/lisp/proced.el b/lisp/proced.el
index a774f2dd1e..a6f1a71778 100644
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@ -140,8 +140,8 @@ proced-grammar-alist
     (nice    "Ni"      "%3d" 3 proced-< t (nice pid) (t t nil))
     (thcount "THCount" "%d" right proced-< t (thcount pid) (nil t t))
     (start   "Start"   proced-format-start 6 proced-time-lessp nil (start pid) (t t nil))
-    (vsize   "VSize"   "%d" right proced-< t (vsize pid) (nil t t))
-    (rss     "RSS"     "%d" right proced-< t (rss pid) (nil t t))
+    (vsize   "VSize"   proced-format-memory right proced-< t (vsize pid) (nil t t))
+    (rss     "RSS"     proced-format-memory right proced-< t (rss pid) (nil t t))
     (etime   "ETime"   proced-format-time right proced-time-lessp t (etime pid) (nil t t))
     (pcpu    "%CPU"    "%.1f" right proced-< t (pcpu pid) (nil t t))
     (pmem    "%Mem"    "%.1f" right proced-< t (pmem pid) (nil t t))
@@ -1425,6 +1425,10 @@ proced-format-args
 Replace newline characters by \"^J\" (two characters)."
   (string-replace "\n" "^J" args))
 
+(defun proced-format-memory (kilobytes)
+  "Format KILOBYTES in a human readable format."
+  (funcall byte-count-to-string-function (* 1024 kilobytes)))
+
 (defun proced-format (process-alist format)
   "Display PROCESS-ALIST using FORMAT."
   (if (symbolp format)

commit b6a7b42b199d4e96312bf8147d36dddbcf14f4ea
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Nov 17 11:47:34 2022 +0200

    * lisp/progmodes/eglot.el (eglot-server-programs): Remove Intelephense.

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index ac9269e0e5..c2d7fc309d 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -194,7 +194,6 @@ eglot-server-programs
                                 ((php-mode phps-mode)
                                  . ,(eglot-alternatives
                                      '(("phpactor" "language-server")
-                                       ("intelephense" "--stdio")
                                        ("php" "vendor/felixfbecker/language-server/bin/php-language-server.php"))))
                                 ((c++-mode c-mode) . ,(eglot-alternatives
                                                        '("clangd" "ccls")))

commit 954a5e79dc8670e93ee72b3f835ec82e847dc23d
Author: USAMI Kenta <zonuexe+tadsan@zonu.me>
Date:   Fri Nov 11 22:57:06 2022 +0900

    Add Eglot alternatives for PHP language servers
    
    * lisp/progmodes/eglot.el (eglot-server-programs): Add alternatives
    for PHP.

diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 3d090a652a..ac9269e0e5 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -192,8 +192,10 @@ eglot-server-programs
                                  . ("typescript-language-server" "--stdio"))
                                 (sh-mode . ("bash-language-server" "start"))
                                 ((php-mode phps-mode)
-                                 . ("php" "vendor/felixfbecker/\
-language-server/bin/php-language-server.php"))
+                                 . ,(eglot-alternatives
+                                     '(("phpactor" "language-server")
+                                       ("intelephense" "--stdio")
+                                       ("php" "vendor/felixfbecker/language-server/bin/php-language-server.php"))))
                                 ((c++-mode c-mode) . ,(eglot-alternatives
                                                        '("clangd" "ccls")))
                                 (((caml-mode :language-id "ocaml")

commit c8b9922e26a42db46411d1dea4e78089adf6743e
Author: Olivier Certner <olce.emacs@certner.fr>
Date:   Thu Nov 10 18:57:27 2022 +0100

    ediff: Merges with ancestor: Fix computation of hunks and proposed merge
    
    Hunks were not computed correctly because the diff3 command was
    invoked with arguments in an incorrect order.  The correct order is
    the local file first, the base (or "ancestor") second and the other
    file third.  This erroneous behavior had two consequences.  First, the
    output of diff3 would change, since it tries to merge chunks according
    to maximal matches between the second and first files, and the second
    and third files.  Second, ediff, more precisely, `ediff-do-merge',
    would consequently try to merge the reverse of the changes from the
    base to the other file.
    
    * lisp/vc/ediff-diff.el (ediff-setup-diff-regions3): In the arguments
    to `ediff-exec-process', swap the other file with the ancestor (only
    when merging with an ancestor).
    
    (ediff-extract-diffs3): Match the hunk data for the ancestor and the
    other file correctly.  The local variable `three-way-comp' indicates
    this is a merge with ancestors when it is nil.
    
    (Bug#59182)

diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index 07b853817d..24647de576 100644
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -942,6 +942,9 @@ ediff-extract-diffs3
 	(c-prev-pt nil)
 	(anc-prev 1)
 	diff-list shift-A shift-B shift-C
+        (A-idx "1")
+        (B-idx (if three-way-comp "2" "3"))
+        (C-idx (if three-way-comp "3" "2"))
 	)
 
     ;; diff list contains word numbers or points, depending on word-mode
@@ -979,23 +982,23 @@ ediff-extract-diffs3
        (let ((agreement (buffer-substring (match-beginning 1) (match-end 1))))
 	 ;; if the files A and B are the same and not 3way-comparison,
 	 ;; ignore the difference
-	 (if (or three-way-comp (not (string-equal agreement "3")))
-	     (let* ((a-begin (car (ediff-get-diff3-group "1")))
-		    (a-end  (nth 1 (ediff-get-diff3-group "1")))
-		    (b-begin (car (ediff-get-diff3-group "2")))
-		    (b-end (nth 1 (ediff-get-diff3-group "2")))
-		    (c-or-anc-begin (car (ediff-get-diff3-group "3")))
-		    (c-or-anc-end (nth 1 (ediff-get-diff3-group "3")))
+	 (if (or three-way-comp (not (string-equal agreement C-idx)))
+	     (let* ((a-begin (car (ediff-get-diff3-group A-idx)))
+		    (a-end  (nth 1 (ediff-get-diff3-group A-idx)))
+		    (b-begin (car (ediff-get-diff3-group B-idx)))
+		    (b-end (nth 1 (ediff-get-diff3-group B-idx)))
+		    (c-or-anc-begin (car (ediff-get-diff3-group C-idx)))
+		    (c-or-anc-end (nth 1 (ediff-get-diff3-group C-idx)))
 		    (state-of-merge
-		     (cond ((string-equal agreement "1") 'prefer-A)
-			   ((string-equal agreement "2") 'prefer-B)
+		     (cond ((string-equal agreement A-idx) 'prefer-A)
+			   ((string-equal agreement B-idx) 'prefer-B)
 			   (t ediff-default-variant)))
 		    (state-of-diff-merge
 		     (if (memq state-of-merge '(default-A prefer-A)) 'B 'A))
 		    (state-of-diff-comparison
-		     (cond ((string-equal agreement "1") 'A)
-			   ((string-equal agreement "2") 'B)
-			   ((string-equal agreement "3") 'C)))
+		     (cond ((string-equal agreement A-idx) 'A)
+			   ((string-equal agreement B-idx) 'B)
+			   ((string-equal agreement C-idx) 'C)))
 		    state-of-ancestor
 		    c-begin c-end
 		    a-begin-pt a-end-pt
@@ -1108,8 +1111,12 @@ ediff-setup-diff-regions3
 	    (get-buffer-create (ediff-unique-buffer-name "*ediff-diff" "*"))))
 
   (message "Computing differences ...")
-  (ediff-exec-process ediff-diff3-program ediff-diff-buffer 'synchronize
-		      ediff-actual-diff3-options file-A file-B file-C)
+  (apply #'ediff-exec-process ediff-diff3-program ediff-diff-buffer 'synchronize
+	 ediff-actual-diff3-options
+         (cons file-A (if ediff-merge-with-ancestor-job
+                          ;; Ancestor must be the middle file
+                          (list file-C file-B)
+                          (list file-B file-C))))
 
   (ediff-prepare-error-list ediff-diff3-ok-lines-regexp ediff-diff-buffer)
   ;;(message "Computing differences ... done")

commit a0ee57c80dea105ab08aad3c0cdce11e43b5fa29
Author: Brian Leung <leungbk@posteo.net>
Date:   Tue Nov 8 23:18:23 2022 -0800

    shell: Add repeat-map for shell-{forward,backward}-prompt
    
    * lisp/shell.el (shell-repeat-map): New defvar.  (Bug#59144)

diff --git a/lisp/shell.el b/lisp/shell.el
index 641f274045..7c3c925ab8 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -393,6 +393,14 @@ shell-mode-map
       'complete-expand)
     map))
 
+(defvar-keymap shell-repeat-map
+  :doc "Keymap to repeat shell key sequences.  Used in `repeat-mode'."
+  "C-f" #'shell-forward-command
+  "C-b" #'shell-backward-command)
+
+(put #'shell-forward-command 'repeat-map 'shell-repeat-map)
+(put #'shell-backward-command 'repeat-map 'shell-repeat-map)
+
 (defcustom shell-mode-hook '()
   "Hook for customizing Shell mode."
   :type 'hook

commit bd21696ff0c52f27a03f6dc538207da8710ed4c5
Author: Brian Leung <leungbk@posteo.net>
Date:   Tue Nov 8 23:16:16 2022 -0800

    esh-mode: Add repeat-map for eshell-{forward,backward}-argument
    
    * lisp/eshell/esh-mode.el (eshell-command-repeat-map): New defvar.
    (Bug#59144)

diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 92523fd99e..4357a0e29a 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -280,6 +280,14 @@ eshell-command-map
   "C-w" #'backward-kill-word
   "C-y" #'eshell-repeat-argument)
 
+(defvar-keymap eshell-command-repeat-map
+  :doc "Keymap to repeat eshell-command key sequences.  Used in `repeat-mode'."
+  "C-f" #'eshell-forward-argument
+  "C-b" #'eshell-backward-argument)
+
+(put #'eshell-forward-argument 'repeat-map 'eshell-command-repeat-map)
+(put #'eshell-backward-argument 'repeat-map 'eshell-command-repeat-map)
+
 ;;; User Functions:
 
 (defun eshell-kill-buffer-function ()

commit d9d8ea61422797f3f7340716fef704ffe1203dec
Author: Brian Leung <leungbk@posteo.net>
Date:   Tue Nov 8 22:11:15 2022 -0800

    em-prompt: Add repeat-map for eshell-{next,previous}-prompt
    
    * lisp/eshell/em-prompt.el (eshell-prompt-repeat-map): New keymap.
    (Bug#59144)

diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index a1a91e7d63..a8744de1db 100644
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -100,6 +100,14 @@ eshell-prompt-mode-map
   "C-c C-n" #'eshell-next-prompt
   "C-c C-p" #'eshell-previous-prompt)
 
+(defvar-keymap eshell-prompt-repeat-map
+  :doc "Keymap to repeat eshell-prompt key sequences.  Used in `repeat-mode'."
+  "C-n" #'eshell-next-prompt
+  "C-p" #'eshell-previous-prompt)
+
+(put #'eshell-next-prompt 'repeat-map 'eshell-prompt-repeat-map)
+(put #'eshell-previous-prompt 'repeat-map 'eshell-prompt-repeat-map)
+
 ;;; Functions:
 
 (define-minor-mode eshell-prompt-mode

commit 84472c3363e4e80ec68e38eb798e8c4c15dc208e
Author: Brian Leung <leungbk@posteo.net>
Date:   Tue Nov 8 22:03:29 2022 -0800

    comint: Add repeat-map for comint-{next,previous}-prompt
    
    * lisp/comint.el (comint-repeat-map): New keymap.  (Bug#59144)

diff --git a/lisp/comint.el b/lisp/comint.el
index 07ced8d321..93b97cb22b 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -604,6 +604,14 @@ comint-mode-map
 				       menu-bar-final-items))
     map))
 
+(defvar-keymap comint-repeat-map
+  :doc "Keymap to repeat comint key sequences.  Used in `repeat-mode'."
+  "C-n" #'comint-next-prompt
+  "C-p" #'comint-previous-prompt)
+
+(put #'comint-next-prompt 'repeat-map 'comint-repeat-map)
+(put #'comint-previous-prompt 'repeat-map 'comint-repeat-map)
+
 ;; Fixme: Is this still relevant?
 (defvar comint-ptyp t
   "Non-nil if communications via pty; false if by pipe.  Buffer local.

commit 667857211072a0d80192e49cf9788ccdbfa856c5
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Nov 17 11:21:01 2022 +0200

    Fix display of mode line when the right divider is used
    
    * src/xdisp.c (init_iterator): For the mode-line, adjust
    last_visible_x due to the right divider and the 'box' attribute,
    if any, of the mode-line face.
    (display_min_width): Update current_x after producing the stretch
    glyph, to mimic PRODUCE_GLYPHS.
    (display_mode_line): Widen the last glyph to account for adding
    the right box line to it.  (Bug#5930)

diff --git a/src/xdisp.c b/src/xdisp.c
index f6a279636a..3b4f0b3956 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3342,7 +3342,8 @@ init_iterator (struct it *it, struct window *w,
     {
       /* Mode lines, menu bar in terminal frames.  */
       it->first_visible_x = 0;
-      it->last_visible_x = body_width = WINDOW_PIXEL_WIDTH (w);
+      it->last_visible_x =
+	WINDOW_PIXEL_WIDTH (w) - WINDOW_RIGHT_DIVIDER_WIDTH (w);
     }
   else
     {
@@ -3410,8 +3411,13 @@ init_iterator (struct it *it, struct window *w,
       face = FACE_FROM_ID_OR_NULL (it->f, remapped_base_face_id);
       if (face && face->box != FACE_NO_BOX)
 	{
+	  int box_thickness = face->box_vertical_line_width;
 	  it->face_box_p = true;
 	  it->start_of_box_run_p = true;
+	  /* Make sure we will have enough horizontal space to add the
+	     right box line at the end.  */
+	  if (box_thickness > 0)
+	    it->last_visible_x -= box_thickness;
 	}
     }
 
@@ -5324,6 +5330,8 @@ display_min_width (struct it *it, ptrdiff_t bufpos,
 	  /* Insert the stretch glyph.  */
 	  it->object = list3 (Qspace, QCwidth, w);
 	  produce_stretch_glyph (it);
+	  if (it->area == TEXT_AREA)
+	    it->current_x += it->pixel_width;
 	  it->min_width_property = Qnil;
 	}
     }
@@ -26718,7 +26726,17 @@ display_mode_line (struct window *w, enum face_id face_id, Lisp_Object format)
     {
       struct glyph *last = (it.glyph_row->glyphs[TEXT_AREA]
 			    + it.glyph_row->used[TEXT_AREA] - 1);
+      int box_thickness = face->box_vertical_line_width;
       last->right_box_line_p = true;
+      /* Add back the space for the right box line we subtracted in
+	 init_iterator, since the right_box_line_p flag will make the
+	 glyph wider.  We actually add only as much space as is
+	 available for the last glyph of the modeline and whatever
+	 space is left beyond it, since that glyph could be only
+	 partially visible */
+      if (box_thickness > 0)
+	last->pixel_width += max (0, (box_thickness
+				      - (it.current_x - it.last_visible_x)));
     }
 
   return it.glyph_row->height;

commit 61b9f2c3179aa454963493e1923307e875e2322a
Author: Juanma Barranquero <lekktu@gmail.com>
Date:   Thu Nov 17 09:55:02 2022 +0100

    * lisp/emacs-lisp/shortdoc.el (sequence): Don't use cl-lib (bug#59319)

diff --git a/lisp/emacs-lisp/shortdoc.el b/lisp/emacs-lisp/shortdoc.el
index dbac03432c..022bf1e736 100644
--- a/lisp/emacs-lisp/shortdoc.el
+++ b/lisp/emacs-lisp/shortdoc.el
@@ -833,7 +833,7 @@ sequence
   (seq-set-equal-p
    :eval (seq-set-equal-p '(1 2 3) '(3 1 2)))
   (seq-some
-   :eval (seq-some #'cl-evenp '(1 2 3)))
+   :eval (seq-some #'floatp '(1 2.0 3)))
   "Building Sequences"
   (seq-concatenate
    :eval (seq-concatenate 'vector '(1 2) '(c d)))
@@ -898,14 +898,14 @@ sequence
   (seq-filter
    :eval (seq-filter #'numberp '(a b 3 4 f 6)))
   (seq-keep
-   :eval (seq-keep #'cl-digit-char-p '(?6 ?a ?7)))
+   :eval (seq-keep #'car-safe '((1 2) 3 t (a . b))))
   (seq-remove
    :eval (seq-remove #'numberp '(1 2 c d 5)))
   (seq-remove-at-position
    :eval (seq-remove-at-position '(a b c d e) 3)
    :eval (seq-remove-at-position [a b c d e] 0))
   (seq-group-by
-   :eval (seq-group-by #'cl-plusp '(-1 2 3 -4 -5 6)))
+   :eval (seq-group-by #'natnump '(-1 2 3 -4 -5 6)))
   (seq-union
    :eval (seq-union '(1 2 3) '(3 5)))
   (seq-difference
@@ -921,7 +921,7 @@ sequence
   (seq-split
    :eval (seq-split [0 1 2 3 5] 2))
   (seq-take-while
-   :eval (seq-take-while #'cl-evenp [2 4 9 6 5]))
+   :eval (seq-take-while #'integerp [1 2 3.0 4]))
   (seq-uniq
    :eval (seq-uniq '(a b d b a c))))
 

commit c04b17d5cb83efd92a4864a68cd1a50a791bb500
Merge: 93036209fa 0636e1066b
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Thu Nov 17 09:41:05 2022 +0100

    Merge from origin/emacs-28
    
    0636e1066b ; Don't unnecessarily use non-ASCII characters in Texinfo
    
    # Conflicts:
    #       doc/emacs/custom.texi

commit 93036209fae87dc620b27b2ce2e0146e6252113c
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Thu Nov 17 09:31:46 2022 +0100

    ; Fix typos (duplicate words)

diff --git a/ChangeLog.3 b/ChangeLog.3
index d90b261da7..b76431fbbd 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -4043,7 +4043,7 @@
 
 	* doc/emacs/maintaining.texi (Basic VC Editing): Mention Dired buffer.
 
-	* doc/emacs/text.texi (Outline Mode): Replace S-TAB with with S-<TAB>.
+	* doc/emacs/text.texi (Outline Mode): Replace S-TAB with S-<TAB>.
 
 	* etc/NEWS: Add some missing +++/--- and move some related items closer.
 
@@ -27204,7 +27204,7 @@
 
 2021-04-25  Andrea Corallo  <akrl@sdf.org>
 
-	Merge branch 'feature/native-comp' into into trunk
+	Merge branch 'feature/native-comp' into trunk
 
 2021-04-25  Lars Ingebrigtsen  <larsi@gnus.org>
 
@@ -34265,7 +34265,7 @@
 	Use `length=' and family where possible in native comp code
 
 	* lisp/emacs-lisp/comp-cstr.el (comp-intersect-typesets)
-	(comp-cstr-imm): Use Use `length=' and family where possible.
+	(comp-cstr-imm): Use `length=' and family where possible.
 	* lisp/emacs-lisp/comp.el (comp-add-cond-cstrs-target-block)
 	(comp-compute-dominator-frontiers)
 	(batch-byte-native-compile-for-bootstrap): Likewise.
@@ -43613,7 +43613,7 @@
 	RFC2047-encode invalid Subject/From headers (bug#45925).  This
 	will make them be displayed more consistently in the Summary
 	buffer (but still "wrong" sometimes, since there's not that much
-	we can guess at at this stage, charset wise).
+	we can guess at this stage, charset wise).
 	(nnml-parse-head): Use it.
 
 2021-01-22  Michael Albinus  <michael.albinus@gmx.de>
@@ -54142,7 +54142,7 @@
 	Tweak the face of unknown backend indicators in flymake
 
 	* lisp/progmodes/flymake.el (flymake--mode-line-format): Don't put
-	a face on the the "?" unknown backend indicator, because that
+	a face on the "?" unknown backend indicator, because that
 	looks odd in inactive windows (bug#44689).
 
 2020-11-24  Paul W. Rankin  <pwr@skeletons.cc>
@@ -67774,7 +67774,7 @@
 
 2020-09-05  Lars Ingebrigtsen  <larsi@gnus.org>
 
-	Revert "Display name with with spaces, but keep symbol name underneath"
+	Revert "Display name with spaces, but keep symbol name underneath"
 
 	This reverts commit e0c77bb62c1c950a82ea0517646d989dc5c1fe27.
 
@@ -67854,7 +67854,7 @@
 
 2020-09-05  ej-32u  <ej32u@protonmail.com>  (tiny change)
 
-	Display name with with spaces, but keep symbol name underneath
+	Display name with spaces, but keep symbol name underneath
 
 	* lisp/cus-edit.el (custom-unlispify-menu-entry): Display the
 	pretty name, but keep the real symbol name as the value (bug#41905).
@@ -78012,7 +78012,7 @@
 	cd4f75bb86 Rename default function to next-error-buffer-unnavigated-c...
 	1dff0a8949 * lisp/image-mode.el (image-toggle-display-image): Fix fit...
 	a71d1787f1 * doc/misc/tramp.texi (Predefined connection information):...
-	079b0dc430 Delete, don't kill, dir dir fragments in icomplete-fido-ba...
+	079b0dc430 Delete, don't kill, dir fragments in icomplete-fido-ba...
 	6cdecc2659 Revert markup change in with-coding-priority docs
 	22f4fba8a9 * lisp/emulation/cua-rect.el (cua--rectangle-region-insert...
 	6b9eac6759 * lisp/simple.el (shell-command-on-region): Fix docstring.
@@ -91466,7 +91466,7 @@
 
 	introduce CASE_CALL_NARGS macro and add various ops
 
-	symbol_function set fset fget fget Bsubstring
+	symbol_function set fset fget Bsubstring
 
 2020-01-01  Andrea Corallo  <andrea_corallo@yahoo.it>
 
@@ -95039,7 +95039,7 @@
 
 2020-06-13  João Távora  <joaotavora@gmail.com>
 
-	Delete, don't kill, dir dir fragments in icomplete-fido-backward-updir
+	Delete, don't kill, dir fragments in icomplete-fido-backward-updir
 
 	Reported by: Andrew Schwartzmeyer <andrew@schwartzmeyer.com>
 
@@ -194580,7 +194580,7 @@
 
 2017-07-09  R. Bernstein  <rocky@gnu.org>
 
-	Add realgud faces faces to whiteboard...
+	Add realgud faces to whiteboard...
 
 	Adjust wheatgrass to use underline for enabled/disabled breakpoints
 
@@ -214158,7 +214158,7 @@
 	refactor systhread.h
 
 	This refactors systhread.h to move the notion of a "lisp mutex"
-	into thread.c.  This lets us make make the global lock and
+	into thread.c.  This lets us make the global lock and
 	post_acquire_global_lock static.
 
 2012-08-17  Tom Tromey  <tromey@redhat.com>
@@ -226854,7 +226854,7 @@
 
 2016-04-30  Lars Ingebrigtsen  <larsi@gnus.org>
 
-	Document mode mode line variables
+	Document mode line variables
 
 	* doc/lispref/modes.texi (Mode Line Variables): Document
 	`mode-line-front-space, `mode-line-misc-info',
diff --git a/doc/misc/ChangeLog.1 b/doc/misc/ChangeLog.1
index 48637ab608..c54fc42036 100644
--- a/doc/misc/ChangeLog.1
+++ b/doc/misc/ChangeLog.1
@@ -10409,7 +10409,7 @@
 	* sc.texi (Emacs 18 MUAs):
 	* speedbar.texi (Top):
 	* url.texi (History):
-	Delete duplicate duplicate words.
+	Delete duplicate words.
 
 2005-07-16  Johan Bockgård  <bojohan@users.sourceforge.net>  (tiny change)
 
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index 96873a3f9a..e6ddcf11df 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -1126,7 +1126,7 @@ Control Flow
 satisfied.
 
 @item for @var{var} in @var{list}@dots{} @{ @var{commands} @}
-Iterate over each element of of @var{list}, storing the element in
+Iterate over each element of @var{list}, storing the element in
 @var{var} and evaluating @var{commands}.  If @var{list} is not a list,
 treat it as a list of one element.  If you specify multiple
 @var{lists}, this will iterate over each of them in turn.
diff --git a/doc/misc/eudc.texi b/doc/misc/eudc.texi
index 7293f48f41..0e1ff67c1f 100644
--- a/doc/misc/eudc.texi
+++ b/doc/misc/eudc.texi
@@ -224,7 +224,7 @@ mailabbrev
 use for their startup configuration file.  @code{mailabbrev} processes
 @samp{alias}, and @samp{source} statements in the @file{mailrc} file.
 @samp{alias} statements can define simple aliases and distribution
-lists, and and can be nested in that the alias expansion can contain
+lists, and can be nested in that the alias expansion can contain
 references to other alias definitions.  Forward references, that is
 references to aliases before they are actually defined, are possible,
 too.
diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 6a6beb7a1f..cfad4f4e07 100644
--- a/doc/misc/message.texi
+++ b/doc/misc/message.texi
@@ -1005,7 +1005,7 @@ Security
 key corresponds to the opening combination for the safe.)
 
 Thus, you need to perform the following steps for e-mail encryption,
-typically outside Emacs.  See, for example, the
+typically outside Emacs.  See, for example,
 @uref{https://www.gnupg.org/gph/en/manual.html, The GNU Privacy
 Handbook} for details covering the standard @acronym{OpenPGP} with
 @acronym{GnuPG}.
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 3c164b1282..9df9a4b652 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -5763,7 +5763,7 @@ that Calc formulas can operate on them.
 **** org-ctags.el (Paul Sexton)
 
      Targets like =<<my target>>= can now be found by Emacs' etag
-     functionality, and Org-mode links can be used to to link to
+     functionality, and Org-mode links can be used to link to
      etags, also in non-Org-mode files.  For details, see the file
      /org-ctags.el/.
 
@@ -6120,7 +6120,7 @@ that Calc formulas can operate on them.
     code that is actually evaluated comprises the code block contents,
     augmented with the extra code which assigns the referenced data to
     variables. It is now possible to preview expanded contents, and
-    also to expand code during during tangling. This expansion takes
+    also to expand code during tangling. This expansion takes
     into account all header arguments, and variables.
 
     A new keybinding `C-c M-b p' bound to `org-babel-expand-src-block'
@@ -6235,7 +6235,7 @@ that Calc formulas can operate on them.
 
 **** Localized clock tables
 
-     Clock tables now support a new new =:lang= parameter, allowing
+     Clock tables now support a new =:lang= parameter, allowing
      the user to customize the localization of the table headers.  See
      the variable =org-clock-clocktable-language-setup= which controls
      available translated strings.
diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16
index ef59698317..5b2244dec0 100644
--- a/lisp/ChangeLog.16
+++ b/lisp/ChangeLog.16
@@ -22838,15 +22838,14 @@
 2011-05-10  Jim Meyering  <meyering@redhat.com>
 
 	Fix doubled-word typos.
-	* international/quail.el (quail-insert-kbd-layout): and and -> and.
-	* kermit.el: and and -> and.
-	* net/ldap.el (ldap-search-internal): to to -> to.
-	* progmodes/vhdl-mode.el (vhdl-offsets-alist): Likewise.
-	* progmodes/js.el (js-mode): and and -> and.
-	* textmodes/artist.el (artist-move-to-xy): at at -> at.
-	(artist-draw-region-trim-line-endings): if if -> if.
-	And Safetyc -> Safety.
-	* textmodes/reftex-dcr.el (reftex-view-crossref): at at -> at a.
+	* international/quail.el (quail-insert-kbd-layout):
+	* kermit.el:
+	* net/ldap.el (ldap-search-internal):
+	* progmodes/vhdl-mode.el (vhdl-offsets-alist):
+	* progmodes/js.el (js-mode):
+	* textmodes/artist.el (artist-move-to-xy):
+	(artist-draw-region-trim-line-endings):
+	* textmodes/reftex-dcr.el (reftex-view-crossref): Fix typos.
 
 2011-05-10  Glenn Morris  <rgm@gnu.org>
 	    Stefan Monnier  <monnier@iro.umontreal.ca>
diff --git a/lisp/cedet/ChangeLog.1 b/lisp/cedet/ChangeLog.1
index aa54bdd9b0..5fe2e0e6de 100644
--- a/lisp/cedet/ChangeLog.1
+++ b/lisp/cedet/ChangeLog.1
@@ -1915,10 +1915,9 @@
 2011-05-10  Jim Meyering  <meyering@redhat.com>
 
 	Fix doubled-word typos.
-	* ede/pmake.el (ede-proj-makefile-garbage-patterns): the the -> the
+	* ede/pmake.el (ede-proj-makefile-garbage-patterns):
 	* semantic/complete.el (semantic-complete-read-tag-local-members):
-	Likewise.
-	* ede.el (ede-auto-add-method): then then -> then
+	* ede.el (ede-auto-add-method): Fix typos.
 
 2011-04-23  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -3098,7 +3097,7 @@
 	* ede/proj-prog.el (project-run-target): New method.
 
 	* ede/proj-obj.el (ede-cc-linker): Rename from ede-gcc-linker.
-	(ede-g++-linker): Change Change link lines.
+	(ede-g++-linker): Change link lines.
 
 	* ede/pmake.el (ede-pmake-insert-variable-shared):
 	When searching for old variables, go to the end of the buffer and
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 863e895efd..113718fba3 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -4358,6 +4358,6 @@ native-compile-prune-cache
 
 (provide 'comp)
 
-;; LocalWords: limplified limplified limplification limplify Limple LIMPLE libgccjit elc eln
+;; LocalWords: limplified limplification limplify Limple LIMPLE libgccjit elc eln
 
 ;;; comp.el ends here
diff --git a/lisp/gnus/nnvirtual.el b/lisp/gnus/nnvirtual.el
index e150cbf2b4..eec0347bcf 100644
--- a/lisp/gnus/nnvirtual.el
+++ b/lisp/gnus/nnvirtual.el
@@ -172,7 +172,7 @@ nnvirtual-retrieve-headers
 	      (with-current-buffer nntp-server-buffer
 		(erase-buffer)
 		(insert-buffer-substring vbuf)
-		;; FIX FIX FIX, we should be able to sort faster than
+                ;; FIXME: we should be able to sort faster than
 		;; this if needed, since each cgroup is sorted, we just
 		;; need to merge
 		(sort-numeric-fields 1 (point-min) (point-max))
diff --git a/lisp/mh-e/ChangeLog.2 b/lisp/mh-e/ChangeLog.2
index 5f2dd299f8..fd597f0c00 100644
--- a/lisp/mh-e/ChangeLog.2
+++ b/lisp/mh-e/ChangeLog.2
@@ -360,8 +360,8 @@
 2011-05-10  Jim Meyering  <meyering@redhat.com>
 
 	Fix doubled-word typos.
-	* mh-alias.el (mh-alias-minibuffer-confirm-address): if if -> if it
-	* mh-scan.el (mh-scan-destination-width): in in -> in
+	* mh-alias.el (mh-alias-minibuffer-confirm-address):
+	* mh-scan.el (mh-scan-destination-width): Fix typos.
 
 2011-04-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el
index a1d1d284ed..252eab0f3b 100644
--- a/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@ -179,7 +179,7 @@ 'tramp-compat-progress-reporter-update
     (lambda (reporter &optional value _suffix)
       (progress-reporter-update reporter value))))
 
-;; `ignore-error' is new in Emacs Emacs 27.1.
+;; `ignore-error' is new in Emacs 27.1.
 (defmacro tramp-compat-ignore-error (condition &rest body)
   "Execute BODY; if the error CONDITION occurs, return nil.
 Otherwise, return result of last form in BODY.
diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1
index 4e1c44d2bc..bcc109583c 100644
--- a/lisp/org/ChangeLog.1
+++ b/lisp/org/ChangeLog.1
@@ -20112,10 +20112,10 @@
 2011-05-10  Jim Meyering  <meyering@redhat.com>
 
 	Fix doubled-word typos.
-	* org-agenda.el (org-agenda-entry-types): the the -> the
-	* org-table.el (org-table-get-remote-range): or or -> or
-	* org-wl.el (org-wl-folder-type): the the -> the
-	* org.el (org-goto, org-inside-LaTeX-fragment-p): Likewise.
+	* org-agenda.el (org-agenda-entry-types):
+	* org-table.el (org-table-get-remote-range):
+	* org-wl.el (org-wl-folder-type):
+	* org.el (org-goto, org-inside-LaTeX-fragment-p): Fix typos.
 
 2011-03-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 9139699b5b..df8387905f 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -6963,7 +6963,7 @@ c-trim-found-types
 ;; At each buffer change, the syntax-table properties are removed in a
 ;; before-change function and reapplied, when needed, in an
 ;; after-change function.  It is far more important that the
-;; properties get removed when they they are spurious than that they
+;; properties get removed when they are spurious than that they
 ;; be present when wanted.
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (defun c-clear-<-pair-props (&optional pos)
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el
index 397c8e0937..3d090a652a 100644
--- a/lisp/progmodes/eglot.el
+++ b/lisp/progmodes/eglot.el
@@ -9,7 +9,7 @@
 ;; Keywords: convenience, languages
 ;; Package-Requires: ((emacs "26.3") (jsonrpc "1.0.14") (flymake "1.2.1") (project "0.3.0") (xref "1.0.1") (eldoc "1.11.0") (seq "2.23"))
 
-;; This is is a GNU ELPA :core package.  Avoid adding functionality
+;; This is a GNU ELPA :core package.  Avoid adding functionality
 ;; that is not available in the version of Emacs recorded above or any
 ;; of the package dependencies.
 
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 294cf47087..adb984c3e5 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1133,7 +1133,7 @@ flymake-mode
     (add-hook 'kill-buffer-hook 'flymake-kill-buffer-hook nil t)
     (add-hook 'eldoc-documentation-functions 'flymake-eldoc-function t t)
 
-    ;; If Flymake happened to be already already ON, we must cleanup
+    ;; If Flymake happened to be already ON, we must cleanup
     ;; existing diagnostic overlays, lest we forget them by blindly
     ;; reinitializing `flymake--state' in the next line.
     ;; See https://github.com/joaotavora/eglot/issues/223.
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index ba1cea18d4..1b18ae5ec5 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -7899,7 +7899,7 @@
 	* buffer.c (scroll-up-aggressively, scroll-down-aggressively):
 	* keymap.c (Fminor_mode_key_binding):
 	* macterm.c (mac-emulate-three-button-mouse):
-	Delete duplicate duplicate words.
+	Delete duplicate words.
 
 2005-07-18  Ken Raeburn  <raeburn@gnu.org>
 
diff --git a/src/ChangeLog.13 b/src/ChangeLog.13
index 6eb54dfb2c..d832ab9112 100644
--- a/src/ChangeLog.13
+++ b/src/ChangeLog.13
@@ -1459,11 +1459,11 @@
 	(frame_default_tool_bar_height): Extern.
 	* gtkutil.c (xg_frame_set_char_size): Pass Qxg_frame_set_char_size
 	to adjust_frame_size.
-	* nsfns.m (Fx_create_frame): Pass Pass Qx_create_frame_1 and
+	* nsfns.m (Fx_create_frame): Pass Qx_create_frame_1 and
 	Qx_create_frame_2 to adjust_frame_size.
 	* w32fns.c (x_change_tool_bar_height): Call adjust_frame_size with
 	inhibit 1 when we have not redisplayed the tool bar yet.
-	(Fx_create_frame): Pass Pass Qx_create_frame_1 and
+	(Fx_create_frame): Pass Qx_create_frame_1 and
 	Qx_create_frame_2 to adjust_frame_size.
 	* w32menu.c (set_frame_menubar): Simplify adjust_frame_size
 	call.
@@ -1476,7 +1476,7 @@
 	frame size accordingly.
 	* xfns.c (x_change_tool_bar_height): Call adjust_frame_size with
 	inhibit 1 when we have not redisplayed the tool bar yet.
-	(Fx_create_frame): Pass Pass Qx_create_frame_1 and
+	(Fx_create_frame): Pass Qx_create_frame_1 and
 	Qx_create_frame_2 to adjust_frame_size.
 
 2015-01-12  Paul Eggert  <eggert@cs.ucla.edu>
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5
index c74e44d7a2..408a934ce2 100644
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -2316,7 +2316,7 @@
 
 1995-02-15  Paul Reilly  <pmr@geech.gnu.ai.mit.edu>
 
-	* s/dgux.h (LIB_MOTIF): Add -lgen to provide provide the symbols
+	* s/dgux.h (LIB_MOTIF): Add -lgen to provide the symbols
 	`regcmp' and `regex'.
 
 1995-02-15  Richard Stallman  <rms@pogo.gnu.ai.mit.edu>
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index ef2472a0f3..2594ced5f6 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -1272,7 +1272,7 @@
 
 	* xdisp.c (display_line): Set charpos of first glyph in blank
 	lines not corresponding to any text to -1, even if no glyphs are
-	filled in in that line.
+	filled in on that line.
 
 1999-11-01  Gerd Moellmann  <gerd@gnu.org>
 
diff --git a/src/itree.c b/src/itree.c
index da0242905c..3b219d958a 100644
--- a/src/itree.c
+++ b/src/itree.c
@@ -111,7 +111,7 @@ Copyright (C) 2017-2022  Free Software Foundation, Inc.
    In order to avoid this, we introduce yet another node attribute,
    called OFFSET.
 
-   The OFFSET of some some subtree, represented by its root, is the
+   The OFFSET of some subtree, represented by its root, is the
    amount of shift that needs to be applied to its BEGIN, END and
    LIMIT values, in order to get to the actual buffer positions.
    Coming back to the example, all we would need to do in this case,
diff --git a/src/xterm.c b/src/xterm.c
index 55252d2201..b17a7edba6 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -30072,7 +30072,7 @@ #define NUM_ARGV 10
       XrmPutLineResource (&xrdb, "Emacs.dialog.*.font: 9x15");
 
     /* Do not destroy the font struct returned above with XFreeFont;
-       that also destroys the font, leading to to X protocol errors at
+       that also destroys the font, leading to X protocol errors at
        XtCloseDisplay.  Just free the font info structure.
        (Bug#18403) */
     XFreeFontInfo (NULL, query_result, 1);

commit 32f36db4f89deb453f401c3d66cbb02c61f2c838
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Wed Nov 16 13:42:40 2022 +0100

    Prefer defvar-keymap in window.el
    
    * lisp/window.el (other-window-repeat-map)
    (resize-window-repeat-map): Prefer defvar-keymap.

diff --git a/lisp/window.el b/lisp/window.el
index 905803b19e..d466f2975d 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1,7 +1,6 @@
 ;;; window.el --- GNU Emacs window commands aside from those written in C  -*- lexical-binding:t -*-
 
-;; Copyright (C) 1985, 1989, 1992-1994, 2000-2022 Free Software
-;; Foundation, Inc.
+;; Copyright (C) 1985-2022 Free Software Foundation, Inc.
 
 ;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal
@@ -10562,27 +10561,25 @@ ctl-x-4-map
 (define-key ctl-x-4-map "1" 'same-window-prefix)
 (define-key ctl-x-4-map "4" 'other-window-prefix)
 
-(defvar other-window-repeat-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "o" 'other-window)
-    (define-key map "O" (lambda ()
-                          (interactive)
-                          (setq repeat-map 'other-window-repeat-map)
-                          (other-window -1)))
-    map)
-  "Keymap to repeat `other-window' key sequences.  Used in `repeat-mode'.")
+(defvar-keymap other-window-repeat-map
+  :doc "Keymap to repeat `other-window' key sequences.
+Used in `repeat-mode'."
+  "o" #'other-window
+  "O" (lambda ()
+        (interactive)
+        (setq repeat-map 'other-window-repeat-map)
+        (other-window -1)))
 (put 'other-window 'repeat-map 'other-window-repeat-map)
 
-(defvar resize-window-repeat-map
-  (let ((map (make-sparse-keymap)))
-    ;; Standard keys:
-    (define-key map "^" 'enlarge-window)
-    (define-key map "}" 'enlarge-window-horizontally)
-    (define-key map "{" 'shrink-window-horizontally)
-    ;; Additional keys:
-    (define-key map "v" 'shrink-window)
-    map)
-  "Keymap to repeat window resizing commands.  Used in `repeat-mode'.")
+(defvar-keymap resize-window-repeat-map
+  :doc "Keymap to repeat window resizing commands.
+Used in `repeat-mode'."
+  ;; Standard keys:
+  "^" #'enlarge-window
+  "}" #'enlarge-window-horizontally
+  "{" #'shrink-window-horizontally
+  ;; Additional keys:
+  "v" #'shrink-window)
 (put 'enlarge-window 'repeat-map 'resize-window-repeat-map)
 (put 'enlarge-window-horizontally 'repeat-map 'resize-window-repeat-map)
 (put 'shrink-window-horizontally 'repeat-map 'resize-window-repeat-map)

commit 902649a170ab651cffe2bbb421e1331b23c7ed01
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Nov 16 15:13:05 2022 -0800

    Fix treesit-search-forward not matching leaf nodes
    
    * src/treesit.c: Match against NODE at start of the loop.

diff --git a/src/treesit.c b/src/treesit.c
index 1e1238eefd..a05efaf5db 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2654,8 +2654,17 @@ treesit_search_forward (TSNode *start, Lisp_Object pred, Lisp_Object parser,
 
      (while node (setq node (treesit-search-forward node)))
   */
+  bool initial = true;
   while (true)
     {
+      if (!initial /* We don't match START.  */
+	  && treesit_traverse_match_predicate (node, pred, parser))
+	{
+	  *start = node;
+	  return true;
+	}
+      initial = false;
+
       TSNode next = treesit_traverse_sibling_helper (node, forward, named);
       while (ts_node_is_null (next))
 	{

commit 7bc615fd23c1304f8682f2443db235fbc37bfde9
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Nov 16 14:33:48 2022 -0800

    Tweaks on c-ts-mode fontification rules
    
    Changes:
    1. Remove some :override flags
    2. Fontify "!" in font-lock-negation-char-face
    3. Use some new faces like font-lock-escape-face and
       font-lock-property-face
    4. Move all type fontification into 'type' feature.  Previously some
       are in 'definition' feature.
    5. Simplify definition feature, and fontify identifiers in definitions
       recursively.
    6. Change 'statement' feature to 'label'
    7. New feature 'assignment'
    8. Remove some rules from 'expression' feature
    
    * lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings): See
    above.
    (c-ts-mode--fontify-declarator): New function.
    (c-ts-mode): Update feature-list.

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index d4f25f7845..b951031d81 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -190,12 +190,11 @@ c-ts-mode--font-lock-settings
 MODE is either `c' or `cpp'."
   (treesit-font-lock-rules
    :language mode
-   :override t
    :feature 'comment
    `((comment) @font-lock-comment-face
      (comment) @contextual)
+
    :language mode
-   :override t
    :feature 'preprocessor
    `((preproc_directive) @font-lock-preprocessor-face
 
@@ -214,40 +213,43 @@ c-ts-mode--font-lock-settings
      (preproc_defined) @font-lock-preprocessor-face
      (preproc_defined (identifier) @font-lock-variable-name-face)
      [,@c-ts-mode--preproc-keywords] @font-lock-preprocessor-face)
+
    :language mode
-   :override t
    :feature 'constant
    `((true) @font-lock-constant-face
      (false) @font-lock-constant-face
      (null) @font-lock-constant-face
      ,@(when (eq mode 'cpp)
          '((this) @font-lock-constant-face)))
+
    :language mode
-   :override t
    :feature 'keyword
    `([,@(c-ts-mode--keywords mode)] @font-lock-keyword-face
      ,@(when (eq mode 'cpp)
          '((auto) @font-lock-keyword-face)))
+
    :language mode
-   :override t
    :feature 'operator
-   `([,@c-ts-mode--operators] @font-lock-builtin-face)
-   :language mode
    :override t
+   `([,@c-ts-mode--operators] @font-lock-operator-face
+     "!" @font-lock-negation-char-face)
+
+   :language mode
    :feature 'string
    `((string_literal) @font-lock-string-face
-     ((string_literal)) @contextual
      (system_lib_string) @font-lock-string-face
-     (escape_sequence) @font-lock-string-face)
+     (escape_sequence) @font-lock-escape-face)
+
    :language mode
-   :override t
    :feature 'literal
    `((number_literal) @font-lock-constant-face
      (char_literal) @font-lock-constant-face)
+
    :language mode
-   :override t
    :feature 'type
    `((primitive_type) @font-lock-type-face
+     (type_identifier) @font-lock-type-face
+     (sized_type_specifier) @font-lock-type-face
      ,@(when (eq mode 'cpp)
          '((type_qualifier) @font-lock-type-face
 
@@ -255,91 +257,92 @@ c-ts-mode--font-lock-settings
             scope: (namespace_identifier) @font-lock-type-face)
 
            (operator_cast) type: (type_identifier) @font-lock-type-face)))
+
    :language mode
-   :override t
    :feature 'definition
+   ;; Highlights identifiers in declarations.
    `((declaration
-      declarator: (identifier) @font-lock-variable-name-face)
-
-     (declaration
-      type: (type_identifier) @font-lock-type-face)
+      declarator: (_) @font-lock-variable-name-face)
 
      (field_declaration
-      declarator: (field_identifier) @font-lock-variable-name-face)
-
-     (field_declaration
-      type: (type_identifier) @font-lock-type-face)
-
-     (parameter_declaration
-      type: (type_identifier) @font-lock-type-face)
+      declarator: (_) @c-ts-mode--fontify-struct-declarator)
 
      (function_definition
-      type: (type_identifier) @font-lock-type-face)
+      declarator: (_) @c-ts-mode--fontify-struct-declarator)
 
-     (function_declarator
-      declarator: (identifier) @font-lock-function-name-face)
-
-     (array_declarator
-      declarator: (identifier) @font-lock-variable-name-face)
-
-     (init_declarator
-      declarator: (identifier) @font-lock-variable-name-face)
-
-     (struct_specifier
-      name: (type_identifier) @font-lock-type-face)
-
-     (sized_type_specifier) @font-lock-type-face
-
-     (enum_specifier
-      name: (type_identifier) @font-lock-type-face)
+     ;; Should we highlight identifiers in the parameter list?
+     ;; (parameter_declaration
+     ;;  declarator: (_) @c-ts-mode--fontify-struct-declarator)
 
      (enumerator
-      name: (identifier) @font-lock-variable-name-face)
-
-     (parameter_declaration
-      type: (_) @font-lock-type-face
-      declarator: (identifier) @font-lock-variable-name-face)
-
-     (pointer_declarator
-      declarator: (identifier) @font-lock-variable-name-face)
+      name: (identifier) @font-lock-variable-name-face))
 
-     (pointer_declarator
-      declarator: (field_identifier) @font-lock-variable-name-face))
    :language mode
-   :override t
-   :feature 'expression
+   :feature 'assignment
+   ;; TODO: Recursively highlight identifiers in parenthesized
+   ;; expressions, see `c-ts-mode--fontify-struct-declarator' for
+   ;; inspiration.
    '((assignment_expression
       left: (identifier) @font-lock-variable-name-face)
+     (assignment_expression
+      left: (field_expression field: (_) @font-lock-property-face))
+     (assignment_expression
+      left: (pointer_expression
+             (identifier) @font-lock-variable-name-face))
+     (assignment_expression
+      left: (subscript_expression
+             (identifier) @font-lock-variable-name-face)))
 
-     (call_expression
+   :language mode
+   :feature 'expression
+   '((call_expression
       function: (identifier) @font-lock-function-name-face)
-
-     (field_expression
-      field: (field_identifier) @font-lock-variable-name-face)
-
      (field_expression
       argument: (identifier) @font-lock-variable-name-face
-      field: (field_identifier) @font-lock-variable-name-face)
-
+      field: (field_identifier) @font-lock-property-face)
      (pointer_expression
-      argument: (identifier) @font-lock-variable-name-face))
+      (identifier) @font-lock-variable-name-face))
+
    :language mode
-   :override t
-   :feature 'statement
+   :feature 'label
    '((expression_statement (identifier) @font-lock-variable-name-face)
      (labeled_statement
       label: (statement_identifier) @font-lock-type-face))
+
    :language mode
-   :override t
    :feature 'error
    '((ERROR) @font-lock-warning-face)
+
    :language mode
    :feature 'emacs-devel
-   :override 't
    '(((call_expression function: (identifier) @fn)
       @c-ts-mode--fontify-defun
       (:match "^DEFUN$" @fn)))))
 
+(defun c-ts-mode--fontify-declarator (node override start end &rest args)
+  "Fontify a declarator (whatever under the \"declarator\" field).
+For NODE, OVERRIDE, START, END, and ARGS, see
+`treesit-font-lock-rules'."
+  (pcase (treesit-node-type node)
+    ((or "attributed_declarator" "parenthesized_declarator")
+     (apply #'c-ts-mode--fontify-declarator
+            (treesit-node-child node 0 t) override start end args))
+    ("pointer_declarator"
+     (apply #'c-ts-mode--fontify-declarator
+            (treesit-node-child node -1) override start end args))
+    ((or "function_declarator" "array_declarator" "init_declarator")
+     (apply #'c-ts-mode--fontify-declarator
+            (treesit-node-child-by-field-name node "declarator")
+            override start end args))
+    ((or "identifier" "field_identifier")
+     (treesit-fontify-with-override
+      (max (treesit-node-start node) start)
+      (min (treesit-node-end node) end)
+      (pcase (treesit-node-type (treesit-node-parent node))
+        ("function_declarator" 'font-lock-function-name-face)
+        (_ 'font-lock-variable-name-face))
+      override))))
+
 (defun c-ts-mode--fontify-defun (node override start end &rest _)
   "Correctly fontify the DEFUN macro.
 For NODE, OVERRIDE, START, and END, see
@@ -468,9 +471,9 @@ c-ts-mode--base-mode
   (setq-local which-func-functions nil)
 
   (setq-local treesit-font-lock-feature-list
-              '((comment preprocessor operator constant string literal keyword)
-                (type definition expression statement)
-                (error))))
+              '((comment preprocessor constant string literal keyword)
+                (type definition label assignment)
+                (expression error operator))))
 
 ;;;###autoload
 (define-derived-mode c-ts-mode c-ts-mode--base-mode "C"

commit 7f57d80846b5f674c49a717d6fc086c14f506415
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Nov 16 10:00:42 2022 -0800

    Fix c-ts-mode-imenu
    
    * lisp/progmodes/c-ts-mode.el (c-ts-mode--imenu-1): If cannot find
    its name, ignore the node.
    (c-ts-mode--imenu): Don't include a category if it's empty.

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 950ef1f65e..d4f25f7845 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -388,42 +388,41 @@ c-ts-mode--imenu-1
   (let* ((ts-node (car node))
          (subtrees (mapcan #'c-ts-mode--imenu-1 (cdr node)))
          (name (when ts-node
-                 (or (treesit-node-text
-                      (pcase (treesit-node-type ts-node)
-                        ("function_definition"
-                         (treesit-node-child-by-field-name
-                          (treesit-node-child-by-field-name
-                           ts-node "declarator")
-                          "declarator"))
-                        ("declaration"
-                         (let ((child (treesit-node-child ts-node -1 t)))
-                           (pcase (treesit-node-type child)
-                             ("identifier" child)
-                             (_ (treesit-node-child-by-field-name
-                                 child "declarator")))))
-                        ("struct_specifier"
-                         (treesit-node-child-by-field-name
-                          ts-node "name")))
-                      t)
-                     "Unnamed node")))
+                 (treesit-node-text
+                  (pcase (treesit-node-type ts-node)
+                    ("function_definition"
+                     (treesit-node-child-by-field-name
+                      (treesit-node-child-by-field-name
+                       ts-node "declarator")
+                      "declarator"))
+                    ("declaration"
+                     (let ((child (treesit-node-child ts-node -1 t)))
+                       (pcase (treesit-node-type child)
+                         ("identifier" child)
+                         (_ (treesit-node-child-by-field-name
+                             child "declarator")))))
+                    ("struct_specifier"
+                     (treesit-node-child-by-field-name
+                      ts-node "name"))))))
          (marker (when ts-node
                    (set-marker (make-marker)
                                (treesit-node-start ts-node)))))
-    ;; A struct_specifier could be inside a parameter list, another
-    ;; struct definition, a variable declaration, a function
-    ;; declaration.  In those cases we don't include it.
     (cond
+     ;; A struct_specifier could be inside a parameter list, another
+     ;; struct definition, a variable declaration, a function
+     ;; declaration.  In those cases we don't include it.
      ((string-match-p
        (rx (or "parameter_declaration" "field_declaration"
                "declaration" "function_definition"))
        (or (treesit-node-type (treesit-node-parent ts-node))
            ""))
       nil)
+     ;; Ignore function local variable declarations.
      ((and (equal (treesit-node-type ts-node) "declaration")
            (not (equal (treesit-node-type (treesit-node-parent ts-node))
                        "translation_unit")))
       nil)
-     ((null ts-node) subtrees)
+     ((or (null ts-node) (null name)) subtrees)
      (subtrees
       `((,name ,(cons name marker) ,@subtrees)))
      (t
@@ -437,10 +436,14 @@ c-ts-mode--imenu
          (var-tree (treesit-induce-sparse-tree
                     node "^declaration$"))
          (struct-tree (treesit-induce-sparse-tree
-                       node "^struct_specifier$")))
-    `(("Struct" . ,(c-ts-mode--imenu-1 struct-tree))
-      ("Variable" . ,(c-ts-mode--imenu-1 var-tree))
-      ("Function" . ,(c-ts-mode--imenu-1 func-tree)))))
+                       node "^struct_specifier$"))
+         (func-index (c-ts-mode--imenu-1 func-tree))
+         (var-index (c-ts-mode--imenu-1 var-tree))
+         (struct-index (c-ts-mode--imenu-1 struct-tree)))
+    (append
+     (when struct-index `(("Struct" . ,struct-index)))
+     (when var-index `(("Variable" . ,var-index)))
+     (when func-index `(("Function" . ,func-index))))))
 
 ;;;###autoload
 (define-derived-mode c-ts-mode--base-mode prog-mode "C"

commit 639821d49ab9497908d8d3bcd472aed558c251e1
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Nov 15 21:54:30 2022 -0800

    Allow checking for outdated nodes in tree-sitter
    
    Now you can run (treesit-node-check node 'outdated).
    
    * doc/lispref/parsing.texi (Accessing Node Information): Update
    manual.
    * src/treesit.c (Ftreesit_node_check): Add new property 'outdated'.
    * test/src/treesit-tests.el (treesit-node-check): Add tests.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 2ea229ec90..d73057321e 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -930,6 +930,11 @@ Accessing Node Information
 A node can be ``extra'': such nodes represent things like comments,
 which can appear anywhere in the text.
 
+@cindex tree-sitter outdated node
+@cindex outdated node, tree-sitter
+A node can be ``outdated'': If its parser has reparse at least once
+after the node was created, the node is outdated.
+
 @cindex tree-sitter node that has error
 @cindex has error, tree-sitter node
 A node ``has error'' if the text it spans contains a syntax error.  It
@@ -938,14 +943,16 @@ Accessing Node Information
 
 @defun treesit-node-check node property
 This function checks if @var{node} has the specified @var{property}.
-@var{property} can be @code{named}, @code{missing}, @code{extra}, or
-@code{has-error}.
+@var{property} can be @code{named}, @code{missing}, @code{extra},
+@code{outdated}, or @code{has-error}.
 @end defun
 
 @defun treesit-node-type node
 Named nodes have ``types'' (@pxref{tree-sitter node type, node type}).
 For example, a named node can be a @code{string_literal} node, where
-@code{string_literal} is its type.
+@code{string_literal} is its type.  The type of an anonymous node is
+just the text that node represents, e.g., the type of a @samp{,} node
+is just @samp{,}.
 
 This function returns @var{node}'s type as a string.
 @end defun
diff --git a/src/treesit.c b/src/treesit.c
index 0b9f0e98d9..1e1238eefd 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1723,7 +1723,7 @@ DEFUN ("treesit-node-check",
        Ftreesit_node_check, Streesit_node_check, 2, 2, 0,
        doc: /* Return non-nil if NODE has PROPERTY, nil otherwise.
 
-PROPERTY could be `named', `missing', `extra', or `has-error'.
+PROPERTY could be `named', `missing', `extra', `outdated', or `has-error'.
 
 Named nodes correspond to named rules in the language definition,
 whereas "anonymous" nodes correspond to string literals in the
@@ -1735,17 +1735,25 @@ DEFUN ("treesit-node-check",
 Extra nodes represent things like comments, which are not required the
 language definition, but can appear anywhere.
 
+A node is "outdated" if the parser has reparsed at least once after
+the node was created.
+
 A node "has error" if itself is a syntax error or contains any syntax
 errors.  */)
   (Lisp_Object node, Lisp_Object property)
 {
   if (NILP (node)) return Qnil;
-  treesit_check_node (node);
+  CHECK_TS_NODE (node);
   CHECK_SYMBOL (property);
   treesit_initialize ();
 
   TSNode treesit_node = XTS_NODE (node)->node;
   bool result;
+
+  if (EQ (property, Qoutdated))
+    return treesit_node_uptodate_p (node) ? Qnil : Qt;
+
+  treesit_check_node (node);
   if (EQ (property, Qnamed))
     result = ts_node_is_named (treesit_node);
   else if (EQ (property, Qmissing))
@@ -1756,7 +1764,7 @@ DEFUN ("treesit-node-check",
     result = ts_node_has_error (treesit_node);
   else
     signal_error ("Expecting `named', `missing', `extra', "
-		  "or `has-error', but got",
+		  "`outdated', or `has-error', but got",
 		  property);
   return result ? Qt : Qnil;
 }
@@ -2918,6 +2926,7 @@ syms_of_treesit (void)
   DEFSYM (Qnamed, "named");
   DEFSYM (Qmissing, "missing");
   DEFSYM (Qextra, "extra");
+  DEFSYM (Qoutdated, "outdated");
   DEFSYM (Qhas_error, "has-error");
 
   DEFSYM (Qnot_found, "not-found");
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index 9b8e3466f2..2a3f43916a 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -516,8 +516,11 @@ treesit-node-check
     (should (treesit-node-check comment-node 'extra))
     (should (treesit-node-check array-node 'has-error))
     (should-error (treesit-node-check array-node 'xxx))
-    ;; TODO: Test for `missing'.
-    ))
+    (should (treesit-node-check (treesit-node-child array-node -1)
+                                'missing))
+    (goto-char (point-max))
+    (insert "]")
+    (should (treesit-node-check array-node 'outdated))))
 
 (ert-deftest treesit-misc ()
   "Misc helper functions."

commit 75b65b3f67eb9a4e5722780cb915b880e667d674
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Nov 15 21:30:13 2022 -0800

    ; Add documentation for tree-sitter parser after-change notifiers
    
    * doc/lispref/parsing.texi (Using Parser): Update manual.
    * lisp/treesit.el (treesit): Add shordocs.
    * src/treesit.c: Augment docstrings.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 0f4a004ee9..2ea229ec90 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -478,6 +478,45 @@ Using Parser
 the root node of the generated syntax tree.
 @end defun
 
+@cindex parse-tree update callback, tree-sitter
+@cindex parse-tree after-change notifer, tree-sitter
+@cindex tree-sitter parse-tree update callback
+@cindex tree-sitter parse-tree after-change notifer
+@heading Be notified by changes to the parse tree
+
+A Lisp program might want to be notified of affected text of a
+incremental parse.  For example, inserting a closing comment token
+converts text before that closing comment token into comments.  Even
+though those text are not directly edited, they are changed
+nevertheless.
+
+Emacs lets a Lisp program to register callback functions
+(@dfn{notifiers}) for this kind of changes.  A notifier function takes
+2 arguments: @var{ranges} and @var{parser}.  @var{ranges} is a list of
+cons of the form @w{@code{(@var{start} . @var{end})}}, where
+@var{start} and @var{end} marks the start and end position of a range.
+@var{parser} is the parser issuing the notification.
+
+Every time a parser reparses a buffer, it compares the old and new
+parse-tree, computes the ranges in which nodes have changed, and
+passes the ranges to notifier functions.
+
+@defun treesit-parser-add-notifier parser function
+This function adds @var{function} to @var{parser}'s after-change
+notifier functions list.  @var{function} must be a function symbol,
+rather than a lambda function.
+@end defun
+
+@defun treesit-parser-remove-notifier parser function
+This function removes @var{function} from @var{parser}'s after-change
+notifier functions list.  @var{function} must be a function symbol,
+rather than a lambda function.
+@end defun
+
+@defun treesit-parser-notifiers parser
+This function returns @var{parser}'s notifier function list.
+@end defun
+
 @node Retrieving Nodes
 @section Retrieving Nodes
 @cindex retrieve node, tree-sitter
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 561d29284c..1284afe84b 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -2033,6 +2033,11 @@ treesit
   (treesit-parser-language
    :no-eval (treesit-parser-language parser)
    :eg-result c)
+  (treesit-parser-add-notifier)
+  (treesit-parser-remove-notifier)
+  (treesit-parser-notifiers
+   :no-eval (treesit-parser-notifiers parser)
+   :eg-result (function1 function2 function3))
 
 
   "Parser ranges"
diff --git a/src/treesit.c b/src/treesit.c
index e24cabf4d0..0b9f0e98d9 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1504,7 +1504,7 @@ DEFUN ("treesit-parser-included-ranges",
 DEFUN ("treesit-parser-notifiers", Ftreesit_parser_notifiers,
        Streesit_parser_notifiers,
        1, 1, 0,
-       doc: /* Return the after-change functions for PARSER.  */)
+       doc: /* Return the after-change notifier functions for PARSER.  */)
   (Lisp_Object parser)
 {
   treesit_check_parser (parser);
@@ -1520,7 +1520,11 @@ DEFUN ("treesit-parser-notifiers", Ftreesit_parser_notifiers,
 DEFUN ("treesit-parser-add-notifier", Ftreesit_parser_add_notifier,
        Streesit_parser_add_notifier,
        2, 2, 0,
-       doc: /* Add FUNCTION to PARSER's after-change notifiers.  */)
+       doc: /* Add FUNCTION to PARSER's after-change notifiers list.
+FUNCTION must be a function symbol, rather than a lambda form.
+FUNCTION should take 2 arguments, RANGES and PARSER.  RANGES is a list
+of cons of the form (START . END), where START and END are buffer
+positions.  PARSER is the parser issuing the notification.  */)
   (Lisp_Object parser, Lisp_Object function)
 {
   treesit_check_parser (parser);
@@ -1536,7 +1540,11 @@ DEFUN ("treesit-parser-add-notifier", Ftreesit_parser_add_notifier,
 DEFUN ("treesit-parser-remove-notifier", Ftreesit_parser_remove_notifier,
        Streesit_parser_remove_notifier,
        2, 2, 0,
-       doc: /* Remove FUNCTION from PARSER's after-change notifiers.  */)
+       doc: /* Remove FUNCTION from PARSER's after-change notifiers
+list.  FUNCTION must be a function symbol, rather than a lambda form.
+FUNCTION should take 2 arguments, RANGES and PARSER.  RANGES is a list
+of cons of the form (START . END), where START and END are buffer
+positions.  PARSER is the parser issuing the notification.   */)
   (Lisp_Object parser, Lisp_Object function)
 {
   treesit_check_parser (parser);

commit 306e49285a04c02f0a575a7d7b2f82eeb032c86b
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Nov 15 20:29:07 2022 -0800

    Add treesit-explore-mode
    
    This mode is basically the tree-sitter playground[1] in Emacs:
    displays the syntax tree with the source side-by-side, kept in sync in
    real-time.
    
    [1] https://tree-sitter.github.io/tree-sitter/playground
    
    * doc/lispref/parsing.texi (Language Definitions): Mention in manual.
    * lisp/treesit.el (treesit--explorer-buffer)
    (treesit--explorer-source-buffer)
    (treesit--explorer-language)
    (treesit--explorer-refresh-timer)
    (treesit--explorer-highlight-overlay)
    (treesit--explorer-last-node): New variables.
    * lisp/treesit.el (treesit--explorer--nodes-to-highlight)
    (treesit--explorer-refresh)
    (treesit--explorer-post-command)
    (treesit--explorer-jump)
    (treesit--explorer-highlight-node)
    (treesit--explorer-draw-node): New functions.
    (treesit--explorer-tree-mode)
    (treesit-explore-mode): New modes.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 9fcf488da1..0f4a004ee9 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -223,6 +223,22 @@ Language Definitions
 @end group
 @end example
 
+@heading Exploring the syntax tree
+
+To aid understanding the syntax of a language and debugging, Emacs
+provides a ``explore'' mode, which displays the syntax tree of the
+source in the current buffer in real time.  Emacs also comes with a
+``inspect mode'', which displays information of the nodes at point in
+the mode-line.
+
+@deffn Command treesit-explore-mode
+This mode pops up a window displaying the syntax tree of the source in
+the current buffer.  Emacs highlights nodes in the syntax tree if
+their corresponding text in the source buffer is selected.  Clicking
+on nodes in the syntax tree highlights the corresponding text in the
+source buffer.
+@end deffn
+
 @deffn Command treesit-inspect-mode
 This minor mode displays on the mode-line the node that @emph{starts}
 at point.  The mode-line will display
diff --git a/lisp/treesit.el b/lisp/treesit.el
index ef43391080..561d29284c 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1678,6 +1678,285 @@ treesit-query-validate
              (forward-char start)))
          (pop-to-buffer buf))))))
 
+;;; Explorer
+
+(defvar-local treesit--explorer-buffer nil
+  "Buffer used to display the syntax tree.")
+
+(defvar-local treesit--explorer-source-buffer nil
+  "Source buffer corresponding to the playground buffer.")
+
+(defvar-local treesit--explorer-language nil
+  "The language used in the playground.")
+
+(defvar-local treesit--explorer-refresh-timer nil
+  "Timer for refreshing the syntax tree buffer.")
+
+(defvar-local treesit--explorer-highlight-overlay nil
+  "Overlay used to highlight in syntax tree and source buffer.")
+
+(defvar-local treesit--explorer-last-node nil
+  "Last top-level node used to generate syntax tree.")
+
+(defvar treesit-explore-mode)
+
+(defun treesit--explorer--nodes-to-highlight (language)
+  "Return nodes for LANGUAGE covered in region.
+This function tries to return the largest node possible.  So it
+will return a single large node rather than a bunch of small
+nodes.  If it end up returning multiple small nodes, it only
+returns the first and last node, and omits the ones in between."
+  (let* ((beg (region-beginning))
+         (end (region-end))
+         (node (treesit-node-on beg end language))
+         (node (or (treesit-parent-while
+                    node
+                    (lambda (n)
+                      (<= beg (treesit-node-start n)
+                          (treesit-node-end n) end)))
+                   node)))
+    ;; If NODE is completely contained in the region, return NODE,
+    ;; otherwise return its children that are in the region.
+    (if (<= beg (treesit-node-start node)
+            (treesit-node-end node) end)
+        (list node)
+      (list (treesit-node-at beg)
+            (treesit-search-forward
+             (treesit-node-at end)
+             (lambda (n)
+               (<= (treesit-node-end n) end))
+             t t)))))
+
+(defun treesit--explorer-refresh ()
+  "Update the syntax tree buffer."
+  (when (and treesit-explore-mode
+             (buffer-live-p treesit--explorer-buffer))
+    (let* ((root (treesit-node-on
+                  (window-start) (window-end) treesit--explorer-language))
+           ;; Only highlight the current top-level construct.
+           ;; Highlighting the whole buffer is slow and unnecessary.
+           (top-level (treesit-node-first-child-for-pos
+                       root (if (eolp)
+                                (max (point-min) (1- (point)))
+                              (point))
+                       t))
+           ;; Only highlight node when region is active, if we
+           ;; highlight node at point the syntax tree is too jumpy.
+           (nodes-hl
+            (when (region-active-p)
+              (treesit--explorer--nodes-to-highlight
+               treesit--explorer-language)))
+           ;; If we didn't edit the buffer nor change the top-level
+           ;; node, don't redraw the whole syntax tree.
+           (highlight-only (treesit-node-eq
+                            top-level treesit--explorer-last-node))
+           (source-buffer (current-buffer)))
+      (setq-local treesit--explorer-last-node top-level)
+      (with-current-buffer treesit--explorer-buffer
+        (let ((inhibit-read-only t))
+          (setq-local treesit--explorer-source-buffer source-buffer)
+          ;; Redraw the syntax tree or just rehighlight the focused
+          ;; node.
+          (when (and top-level (not highlight-only))
+            (erase-buffer)
+            (treesit--explorer-draw-node top-level))
+          (when-let ((pos (treesit--explorer-highlight-node nodes-hl))
+                     (window (get-buffer-window
+                              treesit--explorer-buffer)))
+            (if highlight-only
+                (goto-char pos)
+              ;; If HIGHLIGHT-ONLY is nil, we erased the buffer and
+              ;; re-inserted text, scroll down from the very top until
+              ;; we can see the highlighted node.
+              (goto-char (point-min))
+              (while (and (null (pos-visible-in-window-p pos window))
+                          (= (forward-line 4) 0))
+                (set-window-start window (point))))
+            (set-window-point window pos)))))))
+
+(defun treesit--explorer-post-command (&rest _)
+  "Post-command function that runs in the source buffer."
+  (when treesit-explore-mode
+    (when treesit--explorer-highlight-overlay
+      (delete-overlay treesit--explorer-highlight-overlay))
+    (when treesit--explorer-refresh-timer
+      (cancel-timer treesit--explorer-refresh-timer))
+    (setq-local treesit--explorer-refresh-timer
+                (run-with-timer 0.1 nil #'treesit--explorer-refresh))))
+
+(defun treesit--explorer-jump (button)
+  "Mark the original text corresponding to BUTTON."
+  (interactive)
+  (when (and (derived-mode-p 'treesit--explorer-tree-mode)
+             (buffer-live-p treesit--explorer-source-buffer))
+    (with-current-buffer treesit--explorer-source-buffer
+      (let ((start (button-get button 'node-start))
+            (end (button-get button 'node-end)))
+        (when treesit--explorer-highlight-overlay
+          (delete-overlay treesit--explorer-highlight-overlay))
+        (setq-local treesit--explorer-highlight-overlay
+                    (make-overlay start end nil t nil))
+        (overlay-put treesit--explorer-highlight-overlay
+                     'face 'highlight)))))
+
+(defun treesit--explorer-highlight-node (nodes)
+  "Highlight nodes in NODES in the syntax tree buffer.
+Return the start of the syntax tree text corresponding to NODE."
+  (when treesit--explorer-highlight-overlay
+    (delete-overlay treesit--explorer-highlight-overlay))
+  (let ((start-node (car nodes))
+        (end-node (car (last nodes)))
+        start end)
+    (when (and start-node end-node)
+      (cl-loop for ov in (overlays-in (point-min) (point-max))
+               while (or (null start) (null end))
+               if (treesit-node-eq start-node
+                                   (overlay-get ov 'treesit-node))
+               do (setq start (overlay-start ov))
+               if (treesit-node-eq end-node (overlay-get ov 'treesit-node))
+               do (setq end (overlay-end ov)))
+      (when (and start end)
+        (setq-local treesit--explorer-highlight-overlay
+                    (make-overlay start end))
+        (overlay-put treesit--explorer-highlight-overlay
+                     'face 'highlight)
+        start))))
+
+(defun treesit--explorer-draw-node (node)
+  "Draw the syntax tree of NODE.
+If NODE and NODE-HIGHLIGHT are the same node, highlight it.
+
+When this function is called, point should be at an empty line,
+when appropriate indent in front of point.  When this function
+returns, it leaves point at the end of the last line of NODE.
+
+Return the start position of NODE-HIGHLIGHT in the buffer, if any."
+  (let* ((type (treesit-node-type node))
+         (field-name (treesit-node-field-name node))
+         (children (treesit-node-children node))
+         (named (treesit-node-check node 'named))
+         ;; Column number of the start of the field-name, aka start of
+         ;; the whole node.
+         (before-field-column (current-column))
+         ;; Column number after the field-name.
+         after-field-column
+         ;; Column number after the type.
+         after-type-column
+         ;; Are all children suitable for inline?
+         (all-children-inline
+          (eq 0 (apply #'+ (mapcar #'treesit-node-child-count children))))
+         ;; If the child is the first child, we can inline, if the
+         ;; previous child is suitable for inline, this child can
+         ;; inline, if the previous child is not suitable for inline,
+         ;; this child cannot inline.
+         (can-inline t)
+         ;; The beg and end of this node.
+         beg end)
+    (when treesit--explorer-highlight-overlay
+      (delete-overlay treesit--explorer-highlight-overlay))
+
+    (setq beg (point))
+    ;; Draw field name.  If all children are suitable for inline, we
+    ;; draw everything in one line, other wise draw field name and the
+    ;; rest of the node in two lines.
+    (when field-name
+      (insert field-name ": ")
+      (when (and children (not all-children-inline))
+        (insert "\n")
+        (indent-to-column (1+ before-field-column))))
+    (setq after-field-column (current-column))
+
+    ;; Draw type.
+    (if named
+        (progn
+          (insert "(")
+          (insert-text-button
+           type 'action #'treesit--explorer-jump
+           'follow-link t
+           'node-start (treesit-node-start node)
+           'node-end (treesit-node-end node)))
+      (pcase type
+        ("\n" (insert "\\n"))
+        ("\t" (insert "\\t"))
+        (" " (insert "SPC"))
+        (_ (insert type))))
+    (setq after-type-column (current-column))
+
+    ;; Draw children.
+    (dolist (child children)
+      ;; If a child doesn't have children, it is suitable for inline.
+      (let ((draw-inline (eq 0 (treesit-node-child-count child)))
+            (children-indent (1+ after-field-column)))
+        (while
+            ;; This form returns t if it wants to run another
+            ;; iteration, returns nil if it wants to stop.
+            (if (and draw-inline can-inline)
+                ;; Draw children on the same line.
+                (let ((inline-beg (point)))
+                  (insert " ")
+                  (treesit--explorer-draw-node child)
+                  ;; If we exceeds window width, draw on the next line.
+                  (if (< (current-column) (window-width))
+                      nil
+                    (delete-region inline-beg (point))
+                    (setq draw-inline nil
+                          children-indent (1+ after-type-column))
+                    t))
+              ;; Draw children on the new line.
+              (insert "\n")
+              (indent-to-column children-indent)
+              (treesit--explorer-draw-node child)
+              nil))
+        (setq can-inline draw-inline)))
+
+    ;; Done drawing children, draw the ending paren.
+    (when named (insert ")"))
+    (setq end (point))
+
+    ;; Associate the text with NODE, so we can later find a piece of
+    ;; text by a node.
+    (let ((ov (make-overlay beg end)))
+      (overlay-put ov 'treesit-node node)
+      (overlay-put ov 'evaporate t)
+      (when (not named)
+        (overlay-put ov 'face 'shadow)))))
+
+(define-derived-mode treesit--explorer-tree-mode special-mode
+  "TS Explorer"
+  "Mode for displaying syntax trees for `treesit-explore-mode'."
+  nil)
+
+(define-minor-mode treesit-explore-mode
+  "Enable exploring the current buffer's syntax tree.
+Pops up a window showing the syntax tree of the source in the
+current buffer in real time.  The corresponding node enclosing
+the text in the active region is highlighted in the explorer
+window."
+  :lighter " TSplay"
+  (if treesit-explore-mode
+      (progn
+        (unless (buffer-live-p treesit--explorer-buffer)
+          (setq-local treesit--explorer-buffer
+                      (get-buffer-create
+                       (format "*tree-sitter playground for %s*"
+                               (buffer-name))))
+          (setq-local treesit--explorer-language
+                      (intern (completing-read
+                               "Language: "
+                               (mapcar #'treesit-parser-language
+                                       (treesit-parser-list)))))
+          (with-current-buffer treesit--explorer-buffer
+            (treesit--explorer-tree-mode)))
+        (display-buffer treesit--explorer-buffer
+                        (cons nil '((inhibit-same-window . t))))
+        (treesit--explorer-refresh)
+        (add-hook 'post-command-hook
+                  #'treesit--explorer-post-command 0 t)
+        (setq-local treesit--explorer-last-node nil))
+    (remove-hook 'post-command-hook
+                 #'treesit--explorer-post-command t)
+    (kill-buffer treesit--explorer-buffer)))
+
 ;;; Etc
 
 (declare-function find-library-name "find-func.el")

commit 0636e1066bbafcd8219d9a8e09301c77f875d78b (refs/remotes/origin/emacs-28)
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Wed Nov 16 16:27:10 2022 +0200

    ; Don't unnecessarily use non-ASCII characters in Texinfo
    
    * doc/emacs/custom.texi (Init Rebinding, Examining, Keymaps):
    Use Texinfo directives instead of literal non-ASCII characters.

diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 65970ce412..5d92f7835f 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -792,12 +792,12 @@ Examining
 displays something like this:
 
 @example
-fill-column is a variable defined in ‘C source code’.
+fill-column is a variable defined in @quoteleft{}C source code@quoteright{}.
 Its value is 70
 
   Automatically becomes buffer-local when set.
   This variable is safe as a file local variable if its value
-  satisfies the predicate ‘integerp’.
+  satisfies the predicate @quoteleft{}integerp@quoteright{}.
   Probably introduced at or before Emacs version 18.
 
 Documentation:
@@ -1602,7 +1602,7 @@ Keymaps
 or lower case; @acronym{ASCII} or non-@acronym{ASCII}) are reserved
 for users.  Emacs itself will never bind those key sequences, and
 Emacs extensions should avoid binding them.  In other words, users can
-bind key sequences like @kbd{C-c a} or @kbd{C-c ç} and rely on these
+bind key sequences like @kbd{C-c a} or @kbd{C-c @,{c}} and rely on these
 never being shadowed by other Emacs bindings.
 
 @node Prefix Keymaps
@@ -1880,10 +1880,10 @@ Init Rebinding
 (global-set-key (kbd "C-c h") "hello")
 @end example
 
-  But to bind it to the string @samp{olá} instead:
+  But to bind it to the string @samp{ol@'a} instead:
 
 @example
-(global-set-key (kbd "C-c h") (kbd "olá"))
+(global-set-key (kbd "C-c h") (kbd "ol@'a"))
 @end example
 
   To bind a key sequence including @key{TAB}, @key{RET}, @key{ESC}, or

commit d1ef0243eb6e7cd9720236eb0e900fe7163b3c2b
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Nov 15 10:14:47 2022 -0800

    Add emacs-devel-specific font-lock rules to c-ts-mode
    
    This rule corrects the fontification for DEFUN macros.
    
    * lisp/progmodes/c-ts-mode.el (c-ts-mode--font-lock-settings):
    Additional font-lock rules.
    (c-ts-mode--fontify-defun): New function.

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 8d18c23da9..950ef1f65e 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -332,7 +332,54 @@ c-ts-mode--font-lock-settings
    :language mode
    :override t
    :feature 'error
-   '((ERROR) @font-lock-warning-face)))
+   '((ERROR) @font-lock-warning-face)
+   :language mode
+   :feature 'emacs-devel
+   :override 't
+   '(((call_expression function: (identifier) @fn)
+      @c-ts-mode--fontify-defun
+      (:match "^DEFUN$" @fn)))))
+
+(defun c-ts-mode--fontify-defun (node override start end &rest _)
+  "Correctly fontify the DEFUN macro.
+For NODE, OVERRIDE, START, and END, see
+`treesit-font-lock-rules'.  The captured NODE is a
+call_expression where DEFUN is the function.
+
+This function corrects the fontification on the colon in
+\"doc:\", and the parameter list."
+  (let* ((parent (treesit-node-parent node))
+         ;; ARG-LIST-1 and 2 are like this:
+         ;;
+         ;; DEFUN (ARG-LIST-1)
+         ;; (ARG-LIST-2)
+         (arg-list-1 (treesit-node-children
+                      (treesit-node-child-by-field-name
+                       node "arguments")))
+         ;; ARG-LIST-2 is the
+         (arg-list-2 (treesit-node-children
+                      (treesit-node-child-by-field-name
+                       parent "arguments") t)))
+    ;; Fix the colon.
+    (dolist (node arg-list-1)
+      (when (equal (treesit-node-text node t) ":")
+        (treesit-fontify-with-override
+         (treesit-node-start node) (treesit-node-end node)
+         'default override)))
+    ;; Fix the parameter list.
+    (while arg-list-2
+      (let ((type (and arg-list-2 (pop arg-list-2)))
+            (arg (and arg-list-2 (pop arg-list-2))))
+        (when type
+          (treesit-fontify-with-override
+           (max start (treesit-node-start type))
+           (min end (treesit-node-end type))
+           'font-lock-type-face t))
+        (when arg
+          (treesit-fontify-with-override
+           (max start(treesit-node-start arg))
+           (min end (treesit-node-end arg))
+           'default t))))))
 
 (defun c-ts-mode--imenu-1 (node)
   "Helper for `c-ts-mode--imenu'.

commit 162c3da7a0ae4cb5e1b0e34731621ec13ac01e43
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Nov 15 09:24:08 2022 -0800

    ; * src/treesit.c: Minor stylistic changes.

diff --git a/src/treesit.c b/src/treesit.c
index a59b8e2735..e24cabf4d0 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -854,7 +854,7 @@ treesit_call_after_change_functions (TSTree *old_tree, TSTree *new_tree,
   uint32_t len;
   TSRange *ranges = ts_tree_get_changed_ranges (old_tree, new_tree, &len);
   struct buffer *buf = XBUFFER (XTS_PARSER (parser)->buffer);
-  Lisp_Object lisp_ranges = treesit_make_ranges(ranges, len, buf);
+  Lisp_Object lisp_ranges = treesit_make_ranges (ranges, len, buf);
   xfree (ranges);
 
   specpdl_ref count = SPECPDL_INDEX ();
@@ -863,7 +863,7 @@ treesit_call_after_change_functions (TSTree *old_tree, TSTree *new_tree,
      for each of them.  */
   Lisp_Object functions = XTS_PARSER (parser)->after_change_functions;
   FOR_EACH_TAIL (functions)
-    safe_call2(XCAR (functions), lisp_ranges, parser);
+    safe_call2 (XCAR (functions), lisp_ranges, parser);
 
   unbind_to (count, Qnil);
 }
@@ -901,7 +901,7 @@ treesit_ensure_parsed (Lisp_Object parser)
 
   if (tree != NULL)
     {
-      treesit_call_after_change_functions(tree, new_tree, parser);
+      treesit_call_after_change_functions (tree, new_tree, parser);
       ts_tree_delete (tree);
     }
 
@@ -1366,9 +1366,8 @@ treesit_check_range_argument (Lisp_Object ranges)
 /* Generate a list of ranges in Lisp from RANGES.  This function
    doens't take ownership of RANGES.  BUFFER is used to convert
    between tree-sitter buffer offset and buffer position.  */
-static Lisp_Object
-treesit_make_ranges (const TSRange *ranges, uint32_t len,
-		     struct buffer *buffer)
+static Lisp_Object treesit_make_ranges (const TSRange *ranges, uint32_t len,
+					struct buffer *buffer)
 {
   Lisp_Object list = Qnil;
   for (int idx = 0; idx < len; idx++)
@@ -1386,7 +1385,6 @@ treesit_make_ranges (const TSRange *ranges, uint32_t len,
       list = Fcons (lisp_range, list);
     }
   return Fnreverse (list);
-
 }
 
 DEFUN ("treesit-parser-set-included-ranges",
@@ -1503,8 +1501,7 @@ DEFUN ("treesit-parser-included-ranges",
   return treesit_make_ranges (ranges, len, buffer);
 }
 
-DEFUN ("treesit-parser-notifiers",
-       Ftreesit_parser_notifiers,
+DEFUN ("treesit-parser-notifiers", Ftreesit_parser_notifiers,
        Streesit_parser_notifiers,
        1, 1, 0,
        doc: /* Return the after-change functions for PARSER.  */)
@@ -1520,8 +1517,7 @@ DEFUN ("treesit-parser-notifiers",
   return return_list;
 }
 
-DEFUN ("treesit-parser-add-notifier",
-       Ftreesit_parser_add_notifier,
+DEFUN ("treesit-parser-add-notifier", Ftreesit_parser_add_notifier,
        Streesit_parser_add_notifier,
        2, 2, 0,
        doc: /* Add FUNCTION to PARSER's after-change notifiers.  */)
@@ -1537,8 +1533,7 @@ DEFUN ("treesit-parser-add-notifier",
   return Qnil;
 }
 
-DEFUN ("treesit-parser-remove-notifier",
-       Ftreesit_parser_remove_notifier,
+DEFUN ("treesit-parser-remove-notifier", Ftreesit_parser_remove_notifier,
        Streesit_parser_remove_notifier,
        2, 2, 0,
        doc: /* Remove FUNCTION from PARSER's after-change notifiers.  */)

commit ab70ab19be64902123b0e2c08191d5ebf70feb62
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Tue Nov 15 16:54:41 2022 +0200

    Fix the MS-Windows build due to use of a new TS function
    
    * src/treesit.c (ts_tree_get_changed_ranges) [WINDOWSNT]: Define,
    load from the library, and call through a function pointer.

diff --git a/src/treesit.c b/src/treesit.c
index 858148b849..a59b8e2735 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -42,7 +42,6 @@ Copyright (C) 2021-2022 Free Software Foundation, Inc.
 #undef ts_node_field_name_for_child
 #undef ts_node_first_child_for_byte
 #undef ts_node_first_named_child_for_byte
-#undef ts_node_has_changes
 #undef ts_node_has_error
 #undef ts_node_is_extra
 #undef ts_node_is_missing
@@ -84,6 +83,7 @@ Copyright (C) 2021-2022 Free Software Foundation, Inc.
 #undef ts_tree_cursor_new
 #undef ts_tree_delete
 #undef ts_tree_edit
+#undef ts_tree_get_changed_ranges
 #undef ts_tree_root_node
 
 DEF_DLL_FN (uint32_t, ts_language_version, (const TSLanguage *));
@@ -98,7 +98,6 @@ DEF_DLL_FN (bool, ts_node_eq, (TSNode, TSNode));
 DEF_DLL_FN (const char *, ts_node_field_name_for_child, (TSNode, uint32_t));
 DEF_DLL_FN (TSNode, ts_node_first_child_for_byte, (TSNode, uint32_t));
 DEF_DLL_FN (TSNode, ts_node_first_named_child_for_byte, (TSNode, uint32_t));
-DEF_DLL_FN (bool, ts_node_has_changes, (TSNode));
 DEF_DLL_FN (bool, ts_node_has_error, (TSNode));
 DEF_DLL_FN (bool, ts_node_is_extra, (TSNode));
 DEF_DLL_FN (bool, ts_node_is_missing, (TSNode));
@@ -151,6 +150,8 @@ DEF_DLL_FN (bool, ts_tree_cursor_goto_parent, (TSTreeCursor *));
 DEF_DLL_FN (TSTreeCursor, ts_tree_cursor_new, (TSNode));
 DEF_DLL_FN (void, ts_tree_delete, (TSTree *));
 DEF_DLL_FN (void, ts_tree_edit, (TSTree *, const TSInputEdit *));
+DEF_DLL_FN (TSRange *, ts_tree_get_changed_ranges,
+	    (const TSTree *, const TSTree *, uint32_t *));
 DEF_DLL_FN (TSNode, ts_tree_root_node, (const TSTree *));
 
 static bool
@@ -171,7 +172,6 @@ init_treesit_functions (void)
   LOAD_DLL_FN (library, ts_node_field_name_for_child);
   LOAD_DLL_FN (library, ts_node_first_child_for_byte);
   LOAD_DLL_FN (library, ts_node_first_named_child_for_byte);
-  LOAD_DLL_FN (library, ts_node_has_changes);
   LOAD_DLL_FN (library, ts_node_has_error);
   LOAD_DLL_FN (library, ts_node_is_extra);
   LOAD_DLL_FN (library, ts_node_is_missing);
@@ -213,6 +213,7 @@ init_treesit_functions (void)
   LOAD_DLL_FN (library, ts_tree_cursor_new);
   LOAD_DLL_FN (library, ts_tree_delete);
   LOAD_DLL_FN (library, ts_tree_edit);
+  LOAD_DLL_FN (library, ts_tree_get_changed_ranges);
   LOAD_DLL_FN (library, ts_tree_root_node);
 
   return true;
@@ -228,7 +229,6 @@ #define ts_node_eq fn_ts_node_eq
 #define ts_node_field_name_for_child fn_ts_node_field_name_for_child
 #define ts_node_first_child_for_byte fn_ts_node_first_child_for_byte
 #define ts_node_first_named_child_for_byte fn_ts_node_first_named_child_for_byte
-#define ts_node_has_changes fn_ts_node_has_changes
 #define ts_node_has_error fn_ts_node_has_error
 #define ts_node_is_extra fn_ts_node_is_extra
 #define ts_node_is_missing fn_ts_node_is_missing
@@ -270,6 +270,7 @@ #define ts_tree_cursor_goto_parent fn_ts_tree_cursor_goto_parent
 #define ts_tree_cursor_new fn_ts_tree_cursor_new
 #define ts_tree_delete fn_ts_tree_delete
 #define ts_tree_edit fn_ts_tree_edit
+#define ts_tree_get_changed_ranges fn_ts_tree_get_changed_ranges
 #define ts_tree_root_node fn_ts_tree_root_node
 
 #endif	/* WINDOWSNT */

commit 8175497ccac1b3afc2208260be91423e2bca2d25
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Nov 15 02:39:03 2022 -0800

    ; Enable highlighting error in c-ts-mode--base-mode
    
    I expect this to be turned off by default. but turn this on for
    demonstration for now.
    
    * lisp/progmodes/c-ts-mode.el (c-ts-mode--base-mode): Enable error.

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index bb0db0e1e7..8d18c23da9 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -420,7 +420,7 @@ c-ts-mode--base-mode
   (setq-local treesit-font-lock-feature-list
               '((comment preprocessor operator constant string literal keyword)
                 (type definition expression statement)
-                ())))
+                (error))))
 
 ;;;###autoload
 (define-derived-mode c-ts-mode c-ts-mode--base-mode "C"

commit 63f8a838eccf201d6290d0dc8f83881f41785afb
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Nov 15 02:30:50 2022 -0800

    Make tree-sitter fontification automatically update
    
    Now nodes that are affected and changed during re-parse will be
    correctly refontified.  Nodes can change even if it corresponding text
    wasn't edited: additional text can complete the parse tree and resolve
    error nodes, for example.
    
    * lisp/progmodes/python.el (python-mode): Create Python parser before
    calling treesit-major-mode-setup.
    * lisp/treesit.el (treesit--font-lock-notifier): New function.
    (treesit-major-mode-setup): Register fontifier with every existing
    parser.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 7919484e09..ad4665eb19 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -6548,6 +6548,7 @@ python-mode
   (cond
    ;; Tree-sitter.
    ((treesit-ready-p 'python-mode 'python)
+    (treesit-parser-create 'python)
     (setq-local treesit-font-lock-feature-list
                 '(( comment string function-name class-name)
                   ( keyword builtin constant type)
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 31a31dda41..ef43391080 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -838,6 +838,14 @@ treesit-font-lock-fontify-region
                              face (treesit-node-type node)))))))))))
   `(jit-lock-bounds ,start . ,end))
 
+(defun treesit--font-lock-notifier (ranges parser)
+  "Ensures updated parts of the parse-tree is refontified.
+RANGES is a list of (BEG . END) ranges, PARSER is the tree-sitter
+parser notifying of the change."
+  (with-current-buffer (treesit-parser-buffer parser)
+    (dolist (range ranges)
+      (put-text-property (car range) (cdr range) 'fontified nil))))
+
 ;;; Indent
 
 (define-error 'treesit-indent-error
@@ -1527,7 +1535,10 @@ treesit-major-mode-setup
 If `treesit-simple-indent-rules' is non-nil, setup indentation.
 
 If `treesit-defun-type-regexp' is non-nil, setup
-`beginning/end-of-defun' functions."
+`beginning/end-of-defun' functions.
+
+Make sure necessary parsers are created for the current buffer
+before calling this function."
   ;; Font-lock.
   (when treesit-font-lock-settings
     ;; `font-lock-mode' wouldn't setup properly if
@@ -1537,7 +1548,10 @@ treesit-major-mode-setup
                    (font-lock-fontify-syntactically-function
                     . treesit-font-lock-fontify-region)))
     (font-lock-mode 1)
-    (treesit-font-lock-recompute-features))
+    (treesit-font-lock-recompute-features)
+    (dolist (parser (treesit-parser-list))
+      (treesit-parser-add-notifier
+       parser #'treesit--font-lock-notifier)))
   ;; Indent.
   (when treesit-simple-indent-rules
     (setq-local treesit-simple-indent-rules

commit e0760599b045a7ef3828ae4b624246b6beec2e75
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Nov 15 02:22:41 2022 -0800

    Remove the contextual hack in tree-sitter fontification
    
    We now have a better facility that can replace the contextual
    hack. The C part is in the previous commit, and the Lisp part work
    will be in the next commit.
    
    * doc/lispref/modes.texi (Parser-based Font Lock): Update manual.
    * lisp/progmodes/js.el (js--treesit-font-lock-settings)
    * lisp/progmodes/python.el (python--treesit-settings)
    * lisp/progmodes/ts-mode.el (ts-mode--font-lock-settings): Stop marking
    contextual nodes.
    * lisp/treesit.el (treesit-font-lock-contextual-post-process): Remove
    function.
    (treesit-font-lock-fontify-region): Remove code processing contextual
    nodes.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index f61848c948..71687b0783 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -4064,26 +4064,6 @@ Parser-based Font Lock
 ignored.
 @end defun
 
-Contextual entities, like multi-line strings, or @code{/* */} style
-comments, need special care, because change in these entities might
-cause change in a large portion of the buffer.  For example, inserting
-the closing comment delimiter @code{*/} will change all the text
-between it and the opening delimiter to comment face.  Such entities
-should be captured in a special name @code{contextual}, so Emacs can
-correctly update their fontification.  Here is an example for
-comments:
-
-@example
-@group
-(treesit-font-lock-rules
- :language 'javascript
- :feature 'comment
- :override t
- '((comment) @@font-lock-comment-face)
-   (comment) @@contextual))
-@end group
-@end example
-
 @defvar treesit-font-lock-feature-list
 This is a list of lists of feature symbols.  Each element of the list
 is a list that represents a decoration level.
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index ac2b6a27b7..fd3737f8b6 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3455,8 +3455,7 @@ js--treesit-font-lock-settings
    :language 'javascript
    :override t
    :feature 'comment
-   `((comment) @font-lock-comment-face
-     (comment) @contextual)
+   `((comment) @font-lock-comment-face)
 
    :language 'javascript
    :override t
@@ -3478,9 +3477,7 @@ js--treesit-font-lock-settings
    :feature 'string
    `((regex pattern: (regex_pattern)) @font-lock-string-face
      (string) @font-lock-string-face
-     (string) @contextual
      (template_string) @js--fontify-template-string
-     (template_string) @contextual
      (template_substitution ["${" "}"] @font-lock-builtin-face))
 
    :language 'javascript
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index a5d02d0fcb..7919484e09 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1047,8 +1047,7 @@ python--treesit-settings
    :language 'python
    :override t
    ;; TODO Document on why we do this.
-   '((string :anchor "\"" @python--treesit-fontify-string)
-     (string) @contextual)
+   '((string :anchor "\"" @python--treesit-fontify-string))
 
    :feature 'string-interpolation
    :language 'python
diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el
index c5a6f5fc60..c826302c7a 100644
--- a/lisp/progmodes/ts-mode.el
+++ b/lisp/progmodes/ts-mode.el
@@ -104,8 +104,7 @@ ts-mode--font-lock-settings
    :language 'tsx
    :override t
    :feature 'comment
-   `((comment) @font-lock-comment-face
-     (comment) @contextual)
+   `((comment) @font-lock-comment-face)
 
    :language 'tsx
    :override t
@@ -127,9 +126,7 @@ ts-mode--font-lock-settings
    :feature 'string
    `((regex pattern: (regex_pattern)) @font-lock-string-face
      (string) @font-lock-string-face
-     (string) @contextual
      (template_string) @js--fontify-template-string
-     (template_string) @contextual
      (template_substitution ["${" "}"] @font-lock-builtin-face))
 
    :language 'tsx
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 1070b66f70..31a31dda41 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -777,53 +777,6 @@ treesit--set-nonsticky
         (remove-text-properties start end '(rear-nonsticky nil))
       (put-text-property start end 'rear-nonsticky new-prop))))
 
-;; This post-processing tries to deal with the following scenario:
-;; User inserts "/*" in a buffer under C mode, then goes down the
-;; buffer and inserts "*/".  Before the user inserts "*/", tree-sitter
-;; cannot construct a comment node and the parse tree is incomplete,
-;; and we can't fontify the comment.  But once the user inserts the
-;; "*/", the parse-tree is complete and we want to refontify the whole
-;; comment, and possibly text after comment (the "/*" could damage the
-;; parse tree enough that makes tree-sitter unable to produce
-;; reasonable information for text after it).
-;;
-;; So we set jit-lock-context-unfontify-pos to comment start, and
-;; jit-lock-context will refontify text after that position in a
-;; timer.  Refontifying those text will end up calling this function
-;; again, and we don't want to fall into infinite recursion.  So we
-;; mark the end of the comment with a text property, to be able to
-;; distinguish between initial and follow-up invocation of this
-;; function.
-(defun treesit-font-lock-contextual-post-process
-    (node start end &optional verbose)
-  "Post-process contextual syntax NODE for fontification between START and END.
-NODE is a comment or string node, START and END specify the region
-being fontified.
-
-If VERBOSE is non-nil, print debugging information."
-  (let* ((node-start (treesit-node-start node))
-         (node-end (treesit-node-end node))
-         (node-end-1 (max (point-min) (1- node-end)))
-         (prop-sym 'treesit-context-refontify-in-progress))
-    (when verbose
-      (message "Contextual: region: %s-%s, node: %s-%s"
-               start end node-start node-end))
-    (when (and (< node-start start) (<= node-end end))
-      (if (get-text-property node-end-1 prop-sym)
-          ;; We are called from a refontification by jit-lock-context,
-          ;; caused by a previous call to this function.
-          (progn (when verbose
-                   (message "Contextual: in progress"))
-                 (remove-text-properties
-                  node-end-1 node-end `(,prop-sym nil))
-                 (treesit--set-nonsticky node-end-1 node-end prop-sym t))
-        ;; We are called from a normal fontification.
-        (when verbose
-          (message "Contextual: initial"))
-        (setq jit-lock-context-unfontify-pos node-start)
-        (put-text-property node-end-1 node-end prop-sym t)
-        (treesit--set-nonsticky node-end-1 node-end prop-sym)))))
-
 ;; Some details worth explaining:
 ;;
 ;; 1. When we apply face to a node, we clip the face into the
@@ -870,10 +823,6 @@ treesit-font-lock-fontify-region
                 (when (and (< start node-end)
                            (< node-start end))
                   (cond
-                   ((eq face 'contextual)
-                    (treesit-font-lock-contextual-post-process
-                     node start end
-                     (or loudly treesit--font-lock-verbose)))
                    ((facep face)
                     (treesit-fontify-with-override
                      (max node-start start) (min node-end end)

commit 34e50dc4a23505dce0499f120477e2e1a1327432
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Nov 15 02:16:11 2022 -0800

    Allow tree-sitter to notify parse-tree changes
    
    * src/treesit.c (treesit_call_after_change_functions): New function.
    (treesit_ensure_parsed): Call treesit_call_after_change_functions
    right after re-parse.
    (make_treesit_parser): Initialize after_change_functions.
    (Ftreesit_parser_notifiers)
    (Ftreesit_parser_add_notifier)
    (Ftreesit_parser_remove_notifier): New functions.
    * src/treesit.h (Lisp_TS_Parser): New field after_change_functions.

diff --git a/src/treesit.c b/src/treesit.c
index a70a199cfe..858148b849 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -843,6 +843,30 @@ treesit_check_buffer_size (struct buffer *buffer)
 	      make_fixnum (buffer_size));
 }
 
+static Lisp_Object
+treesit_make_ranges (const TSRange *, uint32_t, struct buffer *);
+
+static void
+treesit_call_after_change_functions (TSTree *old_tree, TSTree *new_tree,
+				     Lisp_Object parser)
+{
+  uint32_t len;
+  TSRange *ranges = ts_tree_get_changed_ranges (old_tree, new_tree, &len);
+  struct buffer *buf = XBUFFER (XTS_PARSER (parser)->buffer);
+  Lisp_Object lisp_ranges = treesit_make_ranges(ranges, len, buf);
+  xfree (ranges);
+
+  specpdl_ref count = SPECPDL_INDEX ();
+
+  /* let's trust the after change functions and not clone a new ranges
+     for each of them.  */
+  Lisp_Object functions = XTS_PARSER (parser)->after_change_functions;
+  FOR_EACH_TAIL (functions)
+    safe_call2(XCAR (functions), lisp_ranges, parser);
+
+  unbind_to (count, Qnil);
+}
+
 /* Parse the buffer.  We don't parse until we have to.  When we have
    to, we call this function to parse and update the tree.  */
 static void
@@ -875,7 +899,11 @@ treesit_ensure_parsed (Lisp_Object parser)
     }
 
   if (tree != NULL)
-    ts_tree_delete (tree);
+    {
+      treesit_call_after_change_functions(tree, new_tree, parser);
+      ts_tree_delete (tree);
+    }
+
   XTS_PARSER (parser)->tree = new_tree;
   XTS_PARSER (parser)->need_reparse = false;
 }
@@ -945,6 +973,7 @@ make_treesit_parser (Lisp_Object buffer, TSParser *parser,
 				       buffer, PVEC_TS_PARSER);
 
   lisp_parser->language_symbol = language_symbol;
+  lisp_parser->after_change_functions = Qnil;
   lisp_parser->buffer = buffer;
   lisp_parser->parser = parser;
   lisp_parser->tree = tree;
@@ -1473,6 +1502,57 @@ DEFUN ("treesit-parser-included-ranges",
   return treesit_make_ranges (ranges, len, buffer);
 }
 
+DEFUN ("treesit-parser-notifiers",
+       Ftreesit_parser_notifiers,
+       Streesit_parser_notifiers,
+       1, 1, 0,
+       doc: /* Return the after-change functions for PARSER.  */)
+  (Lisp_Object parser)
+{
+  treesit_check_parser (parser);
+
+  Lisp_Object return_list = Qnil;
+  Lisp_Object tail = XTS_PARSER (parser)->after_change_functions;
+  FOR_EACH_TAIL (tail)
+    return_list = Fcons (XCAR (tail), return_list);
+
+  return return_list;
+}
+
+DEFUN ("treesit-parser-add-notifier",
+       Ftreesit_parser_add_notifier,
+       Streesit_parser_add_notifier,
+       2, 2, 0,
+       doc: /* Add FUNCTION to PARSER's after-change notifiers.  */)
+  (Lisp_Object parser, Lisp_Object function)
+{
+  treesit_check_parser (parser);
+  /* For simplicity we don't accept lambda functions.  */
+  CHECK_SYMBOL (function);
+
+  Lisp_Object functions = XTS_PARSER (parser)->after_change_functions;
+  if (!Fmemq (function, functions))
+    XTS_PARSER (parser)->after_change_functions = Fcons (function, functions);
+  return Qnil;
+}
+
+DEFUN ("treesit-parser-remove-notifier",
+       Ftreesit_parser_remove_notifier,
+       Streesit_parser_remove_notifier,
+       2, 2, 0,
+       doc: /* Remove FUNCTION from PARSER's after-change notifiers.  */)
+  (Lisp_Object parser, Lisp_Object function)
+{
+  treesit_check_parser (parser);
+  /* For simplicity we don't accept lambda functions.  */
+  CHECK_SYMBOL (function);
+
+  Lisp_Object functions = XTS_PARSER (parser)->after_change_functions;
+  if (Fmemq (function, functions))
+    XTS_PARSER (parser)->after_change_functions = Fdelq (function, functions);
+  return Qnil;
+}
+
 /*** Node API  */
 
 /* Check that OBJ is a positive integer and signal an error if
@@ -2934,6 +3014,10 @@ syms_of_treesit (void)
   defsubr (&Streesit_parser_set_included_ranges);
   defsubr (&Streesit_parser_included_ranges);
 
+  defsubr (&Streesit_parser_notifiers);
+  defsubr (&Streesit_parser_add_notifier);
+  defsubr (&Streesit_parser_remove_notifier);
+
   defsubr (&Streesit_node_type);
   defsubr (&Streesit_node_start);
   defsubr (&Streesit_node_end);
diff --git a/src/treesit.h b/src/treesit.h
index 169d8819d7..2d2a91cd36 100644
--- a/src/treesit.h
+++ b/src/treesit.h
@@ -33,6 +33,10 @@ #define EMACS_TREESIT_H
   /* A symbol representing the language this parser uses.  See the
      manual for more explanation.  */
   Lisp_Object language_symbol;
+  /* A list of functions to call after re-parse.  Every function is
+     called with the changed ranges and the parser.  The changed
+     ranges is a list of (BEG . END).  */
+  Lisp_Object after_change_functions;
   /* The buffer associated with this parser.  */
   Lisp_Object buffer;
   /* The pointer to the tree-sitter parser.  Never NULL.  */

commit 06db8015ea05cc17efb16684de23533ee315be61
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Nov 15 00:31:42 2022 -0800

    Extract out treesit_make_ranges
    
    * src/treesit.c (treesit_make_ranges): New function.
    (Ftreesit_parser_included_ranges): Use treesit_make_ranges.

diff --git a/src/treesit.c b/src/treesit.c
index 602554daa0..a70a199cfe 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1333,6 +1333,32 @@ treesit_check_range_argument (Lisp_Object ranges)
   CHECK_LIST_END (tail, ranges);
 }
 
+/* Generate a list of ranges in Lisp from RANGES.  This function
+   doens't take ownership of RANGES.  BUFFER is used to convert
+   between tree-sitter buffer offset and buffer position.  */
+static Lisp_Object
+treesit_make_ranges (const TSRange *ranges, uint32_t len,
+		     struct buffer *buffer)
+{
+  Lisp_Object list = Qnil;
+  for (int idx = 0; idx < len; idx++)
+    {
+      TSRange range = ranges[idx];
+      uint32_t beg_byte = range.start_byte + BUF_BEGV_BYTE (buffer);
+      uint32_t end_byte = range.end_byte + BUF_BEGV_BYTE (buffer);
+      eassert (BUF_BEGV_BYTE (buffer) <= beg_byte);
+      eassert (beg_byte <= end_byte);
+      eassert (end_byte <= BUF_ZV_BYTE (buffer));
+
+      Lisp_Object lisp_range
+	= Fcons (make_fixnum (buf_bytepos_to_charpos (buffer, beg_byte)),
+		 make_fixnum (buf_bytepos_to_charpos (buffer, end_byte)));
+      list = Fcons (lisp_range, list);
+    }
+  return Fnreverse (list);
+
+}
+
 DEFUN ("treesit-parser-set-included-ranges",
        Ftreesit_parser_set_included_ranges,
        Streesit_parser_set_included_ranges,
@@ -1444,23 +1470,7 @@ DEFUN ("treesit-parser-included-ranges",
   treesit_ensure_position_synced (parser);
 
   struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
-
-  Lisp_Object list = Qnil;
-  for (int idx = 0; idx < len; idx++)
-    {
-      TSRange range = ranges[idx];
-      uint32_t beg_byte = range.start_byte + BUF_BEGV_BYTE (buffer);
-      uint32_t end_byte = range.end_byte + BUF_BEGV_BYTE (buffer);
-      eassert (BUF_BEGV_BYTE (buffer) <= beg_byte);
-      eassert (beg_byte <= end_byte);
-      eassert (end_byte <= BUF_ZV_BYTE (buffer));
-
-      Lisp_Object lisp_range
-	= Fcons (make_fixnum (buf_bytepos_to_charpos (buffer, beg_byte)),
-		 make_fixnum (buf_bytepos_to_charpos (buffer, end_byte)));
-      list = Fcons (lisp_range, list);
-    }
-  return Fnreverse (list);
+  return treesit_make_ranges (ranges, len, buffer);
 }
 
 /*** Node API  */

commit ecb216fd93dc959bda283d27d759b253ee0e2798
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Nov 14 10:34:27 2022 -0800

    Don't highlight syntax error in c-ts-mode
    
    * lisp/progmodes/c-ts-mode.el (c-ts-mode--base-mode): Remove error
    feature.

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 8d18c23da9..bb0db0e1e7 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -420,7 +420,7 @@ c-ts-mode--base-mode
   (setq-local treesit-font-lock-feature-list
               '((comment preprocessor operator constant string literal keyword)
                 (type definition expression statement)
-                (error))))
+                ())))
 
 ;;;###autoload
 (define-derived-mode c-ts-mode c-ts-mode--base-mode "C"

commit 0d195584f20bba1c1de165fbc4162417737755c4
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Nov 14 01:23:45 2022 -0800

    ; Remove some tree-sitter tests
    
    * test/src/treesit-tests.el (treesit-parser-supplemental): Remove
    treesit-set-ranges, and treesit-get-ranges, as these functions are
    removed.

diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index 9447b46f4e..9b8e3466f2 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -418,11 +418,7 @@ treesit-parser-supplemental
         (setq root-node (treesit-parser-root-node
                          parser))
         (setq doc-node (treesit-node-child root-node 0)))
-      ;; `treesit-set-ranges', `treesit-get-ranges'.
-      (treesit-set-ranges 'json
-                          '((1 . 2)))
-      (should (equal (treesit-get-ranges 'json)
-                     '((1 . 2)))))))
+      )))
 
 (ert-deftest treesit-node-supplemental ()
   "Supplemental node functions."

commit 829c7e3566ed425c0204067c654a58970af6d4fe
Author: Theodor Thornhill <theo@thornhill.no>
Date:   Mon Nov 14 08:03:11 2022 +0100

    Fix some inconsistencies in *-ts-modes
    
    (c-ts-mode--base-mode): Extract comment-* so that we can separate
    between C and C++.
    (c-ts-mode, c++-ts-mode): Set comment-* variables.
    
    * lisp/progmodes/css-ts-mode.el (css-ts-mode): Add electric-indent.
    
    * lisp/progmodes/java-ts-mode.el
    (java-ts-mode--imenu): Add categories.  Only display categories that
    exist in the file.
    (java-ts-mode): Add electric-indent.
    
    * lisp/progmodes/json-ts-mode.el
    (json-ts-mode): Add electric-indent.
    
    * lisp/progmodes/ts-mode.el
    (ts-mode--font-lock-settings): Whitespace cleanup.
    (ts-mode): Add electric-indent.

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 5617ea7d7c..8d18c23da9 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -33,6 +33,7 @@
 
 (defcustom c-ts-mode-indent-offset 2
   "Number of spaces for each indentation step in `c-ts-mode'."
+  :version "29.1"
   :type 'integer
   :safe 'integerp
   :group 'c)
@@ -44,6 +45,7 @@ c-ts-mode-indent-style
 one of the supplied styles doesn't suffice a function could be
 set instead.  This function is expected return a list that
 follows the form of `treesit-simple-indent-rules'."
+  :version "29.1"
   :type '(choice (symbol :tag "Gnu" 'gnu)
                  (symbol :tag "K&R" 'k&r)
                  (symbol :tag "Linux" 'linux)
@@ -396,14 +398,8 @@ c-ts-mode--imenu
 ;;;###autoload
 (define-derived-mode c-ts-mode--base-mode prog-mode "C"
   "Major mode for editing C, powered by tree-sitter."
-  :group 'c
   :syntax-table c-ts-mode--syntax-table
 
-  ;; Comments.
-  (setq-local comment-start "// ")
-  (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
-  (setq-local comment-end "")
-
   ;; Navigation.
   (setq-local treesit-defun-type-regexp
               (rx (or "specifier"
@@ -415,7 +411,7 @@ c-ts-mode--base-mode
 
   ;; Electric
   (setq-local electric-indent-chars
-	      (append "{}():;," electric-indent-chars))
+              (append "{}():;," electric-indent-chars))
 
   ;; Imenu.
   (setq-local imenu-create-index-function #'c-ts-mode--imenu)
@@ -436,6 +432,11 @@ c-ts-mode
 
   (treesit-parser-create 'c)
 
+  ;; Comments.
+  (setq-local comment-start "/* ")
+  (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
+  (setq-local comment-end " */")
+
   (setq-local treesit-simple-indent-rules
               (c-ts-mode--set-indent-style 'c))
 
@@ -452,6 +453,11 @@ c++-ts-mode
   (unless (treesit-ready-p nil 'cpp)
     (error "Tree-sitter for C++ isn't available"))
 
+  ;; Comments.
+  (setq-local comment-start "// ")
+  (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
+  (setq-local comment-end "")
+
   (treesit-parser-create 'cpp)
 
   (setq-local treesit-simple-indent-rules
diff --git a/lisp/progmodes/css-ts-mode.el b/lisp/progmodes/css-ts-mode.el
index e22bf99c6c..d0f104eac3 100644
--- a/lisp/progmodes/css-ts-mode.el
+++ b/lisp/progmodes/css-ts-mode.el
@@ -34,6 +34,7 @@
 
 (defcustom css-ts-mode-indent-offset 2
   "Number of spaces for each indentation step in `ts-mode'."
+  :version "29.1"
   :type 'integer
   :safe 'integerp
   :group 'css)
@@ -114,6 +115,10 @@ css-ts-mode
   ;; Indent.
   (setq-local treesit-simple-indent-rules css-ts-mode--indent-rules)
 
+  ;; Electric
+  (setq-local electric-indent-chars
+              (append "{}():;," electric-indent-chars))
+
   ;; Navigation.
   (setq-local treesit-defun-type-regexp "rule_set")
   ;; Font-lock.
diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index 5ec7da9f5c..ee75753027 100644
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -29,10 +29,10 @@
 ;;; Code:
 
 (require 'treesit)
-(require 'rx)
 
 (defcustom java-ts-mode-indent-offset 4
   "Number of spaces for each indentation step in `java-ts-mode'."
+  :version "29.1"
   :type 'integer
   :safe 'integerp
   :group 'java)
@@ -241,18 +241,38 @@ java-ts-mode--imenu-1
 (defun java-ts-mode--imenu ()
   "Return Imenu alist for the current buffer."
   (let* ((node (treesit-buffer-root-node))
-         (tree (treesit-induce-sparse-tree
-                node (rx (or "class_declaration"
-                             "interface_declaration"
-                             "enum_declaration"
-                             "record_declaration"
-                             "method_declaration")))))
-    (java-ts-mode--imenu-1 tree)))
+         (class-tree
+          `("Class" . ,(java-ts-mode--imenu-1
+                        (treesit-induce-sparse-tree
+                         node "^class_declaration$"))))
+         (interface-tree
+          `("Interface" . ,(java-ts-mode--imenu-1
+                            (treesit-induce-sparse-tree
+                             node "^interface_declaration$"))))
+         (enum-tree
+          `("Enum" . ,(java-ts-mode--imenu-1
+                       (treesit-induce-sparse-tree
+                        node "^enum_declaration$"))))
+         (record-tree
+          `("Record" . ,(java-ts-mode--imenu-1
+                         (treesit-induce-sparse-tree
+                          node "^record_declaration$"))))
+         (method-tree
+          `("Method" . ,(java-ts-mode--imenu-1
+                         (treesit-induce-sparse-tree
+                          node "^method_declaration$")))))
+    (cl-remove-if
+     #'null
+     `(,(when (cdr class-tree) class-tree)
+       ,(when (cdr interface-tree) interface-tree)
+       ,(when (cdr enum-tree) enum-tree)
+       ,(when (cdr record-tree) record-tree)
+       ,(when (cdr method-tree) method-tree)))))
 
 ;;;###autoload
 (define-derived-mode java-ts-mode prog-mode "Java"
   "Major mode for editing Java, powered by tree-sitter."
-  :group 'c
+  :group 'java
   :syntax-table java-ts-mode--syntax-table
 
   (unless (treesit-ready-p nil 'java)
@@ -268,9 +288,12 @@ java-ts-mode
   ;; Indent.
   (setq-local treesit-simple-indent-rules java-ts-mode--indent-rules)
 
+  ;; Electric
+  (setq-local electric-indent-chars
+              (append "{}():;," electric-indent-chars))
+
   ;; Navigation.
-  (setq-local treesit-defun-type-regexp
-              (rx (or "declaration")))
+  (setq-local treesit-defun-type-regexp "declaration")
 
   ;; Font-lock.
   (setq-local treesit-font-lock-settings java-ts-mode--font-lock-settings)
diff --git a/lisp/progmodes/json-ts-mode.el b/lisp/progmodes/json-ts-mode.el
index 686640f98a..c1d3d283b8 100644
--- a/lisp/progmodes/json-ts-mode.el
+++ b/lisp/progmodes/json-ts-mode.el
@@ -33,6 +33,7 @@
 
 (defcustom json-ts-mode-indent-offset 2
   "Number of spaces for each indentation step in `json-ts-mode'."
+  :version "29.1"
   :type 'integer
   :safe 'integerp
   :group 'json)
@@ -67,20 +68,26 @@ json-ts--indent-rules
 (defvar json-ts-mode--font-lock-settings
   (treesit-font-lock-rules
    :language 'json
-   :feature 'minimal
+   :feature 'comment
    :override t
-   `((pair
-      key: (_) @font-lock-string-face)
-
-     (string) @font-lock-string-face
-
-     (number) @font-lock-constant-face
-
-     [(null) (true) (false)] @font-lock-constant-face
-
-     (escape_sequence) @font-lock-constant-face
-
-     (comment) @font-lock-comment-face))
+   '((comment) @font-lock-comment-face)
+   :language 'json
+   :feature 'string
+   :override t
+   '((escape_sequence) @font-lock-constant-face
+     (string) @font-lock-string-face)
+   :language 'json
+   :feature 'number
+   :override t
+   '((number) @font-lock-constant-face)
+   :language 'json
+   :feature 'constant
+   :override t
+   '([(null) (true) (false)] @font-lock-constant-face)
+   :language 'json
+   :feature 'pair
+   :override t
+   `((pair key: (_) @font-lock-variable-name-face)))
   "Font-lock settings for JSON.")
 
 (defun json-ts-mode--imenu-1 (node)
@@ -127,6 +134,10 @@ json-ts-mode
   (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
   (setq-local comment-end "")
 
+  ;; Electric
+  (setq-local electric-indent-chars
+              (append "{}():;," electric-indent-chars))
+
   ;; Indent.
   (setq-local treesit-simple-indent-rules json-ts--indent-rules)
 
@@ -137,7 +148,7 @@ json-ts-mode
   ;; Font-lock.
   (setq-local treesit-font-lock-settings json-ts-mode--font-lock-settings)
   (setq-local treesit-font-lock-feature-list
-              '((minimal) () ()))
+              '((comment string number) (constant pair) ()))
 
   ;; Imenu.
   (setq-local imenu-create-index-function #'json-ts-mode--imenu)
diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el
index f4dfa2ae95..c5a6f5fc60 100644
--- a/lisp/progmodes/ts-mode.el
+++ b/lisp/progmodes/ts-mode.el
@@ -30,6 +30,7 @@
 
 (defcustom ts-mode-indent-offset 2
   "Number of spaces for each indentation step in `ts-mode'."
+  :version "29.1"
   :type 'integer
   :safe 'integerp
   :group 'typescript)
@@ -100,7 +101,6 @@ ts-mode--keywords
 
 (defvar ts-mode--font-lock-settings
   (treesit-font-lock-rules
-
    :language 'tsx
    :override t
    :feature 'comment
@@ -271,18 +271,26 @@ ts-mode
    ((treesit-ready-p nil 'tsx)
     ;; Tree-sitter.
     (treesit-parser-create 'tsx)
+
     ;; Comments.
     (setq-local comment-start "// ")
     (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
     (setq-local comment-end "")
+
+    ;; Electric
+    (setq-local electric-indent-chars
+                (append "{}():;," electric-indent-chars))
+
     ;; Indent.
     (setq-local treesit-simple-indent-rules ts-mode--indent-rules)
+
     ;; Navigation.
     (setq-local treesit-defun-type-regexp
                 (rx (or "class_declaration"
                         "method_definition"
                         "function_declaration"
                         "lexical_declaration")))
+
     ;; Font-lock.
     (setq-local treesit-font-lock-settings ts-mode--font-lock-settings)
     (setq-local treesit-font-lock-feature-list
@@ -291,9 +299,12 @@ ts-mode
                   (property pattern jsx)))
     ;; Imenu.
     (setq-local imenu-create-index-function #'js--treesit-imenu)
+
     ;; Which-func (use imenu).
     (setq-local which-func-functions nil)
+
     (treesit-major-mode-setup))
+
    ;; Elisp.
    (t
     (js-mode)

commit 7e9c2e295283b4dcf4f88cf25a094e37731543fc
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Nov 14 00:54:54 2022 -0800

    ; * test/src/treesit-tests.el (treesit-node-check): New test.

diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index 7fc810492b..9447b46f4e 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -505,6 +505,24 @@ treesit-node-at
                     (treesit-node-at (point)))
                    "]"))))
 
+(ert-deftest treesit-node-check ()
+  "Test `treesit-node-check'."
+  (skip-unless (treesit-language-available-p 'json))
+  (let (parser root-node array-node comment-node)
+    (progn
+      (insert "/* comment */ [1,  2, 3,4  ")
+      (setq parser (treesit-parser-create 'json))
+      (setq root-node (treesit-parser-root-node
+                       parser))
+      (setq comment-node (treesit-node-child root-node 0))
+      (setq array-node (treesit-node-child root-node 1)))
+
+    (should (treesit-node-check comment-node 'extra))
+    (should (treesit-node-check array-node 'has-error))
+    (should-error (treesit-node-check array-node 'xxx))
+    ;; TODO: Test for `missing'.
+    ))
+
 (ert-deftest treesit-misc ()
   "Misc helper functions."
   (let ((settings '((t 0 t)

commit 3a0c94ac0b5d5098f9140c5ab4231d6dd06ec393
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Nov 14 00:51:54 2022 -0800

    Remove feature that checks whether tree-sitter node "has changes"
    
    First of all, we signal error on using an outdated node, so if a node
    has changes, calling treesit-node-check would only raise an error.
    Besides, in order to properly answer whether a node has changed, we
    would have to update the node as the buffer is edited, which we don't
    do right now.
    
    * doc/lispref/parsing.texi (Accessing Node Information): Remove
    relevant manual text.
    * src/treesit.c (Ftreesit_node_check): Remove docstring mentions,
    remove the branch for "has-changes".
    (syms_of_treesit): Remove has-changes.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 2c838e317e..9fcf488da1 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -875,11 +875,6 @@ Accessing Node Information
 A node can be ``extra'': such nodes represent things like comments,
 which can appear anywhere in the text.
 
-@cindex tree-sitter node that has changes
-@cindex has changes, tree-sitter node
-A node ``has changes'' if the buffer changed since the last time the
-node was retrieved, i.e., the node is outdated.
-
 @cindex tree-sitter node that has error
 @cindex has error, tree-sitter node
 A node ``has error'' if the text it spans contains a syntax error.  It
@@ -888,8 +883,8 @@ Accessing Node Information
 
 @defun treesit-node-check node property
 This function checks if @var{node} has the specified @var{property}.
-@var{property} can be @code{named}, @code{missing}, @code{extra},
-@code{has-changes}, or @code{has-error}.
+@var{property} can be @code{named}, @code{missing}, @code{extra}, or
+@code{has-error}.
 @end defun
 
 @defun treesit-node-type node
@@ -1749,7 +1744,7 @@ Tree-sitter C API
 ts_node_is_named                        treesit-node-check
 ts_node_is_missing                      treesit-node-check
 ts_node_is_extra                        treesit-node-check
-ts_node_has_changes                     treesit-node-check
+ts_node_has_changes
 ts_node_has_error                       treesit-node-check
 ts_node_parent                          treesit-node-parent
 ts_node_child                           treesit-node-child
diff --git a/src/treesit.c b/src/treesit.c
index 86328ae03e..602554daa0 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1629,7 +1629,7 @@ DEFUN ("treesit-node-check",
        Ftreesit_node_check, Streesit_node_check, 2, 2, 0,
        doc: /* Return non-nil if NODE has PROPERTY, nil otherwise.
 
-PROPERTY could be `named', `missing', `extra', `has-changes', or `has-error'.
+PROPERTY could be `named', `missing', `extra', or `has-error'.
 
 Named nodes correspond to named rules in the language definition,
 whereas "anonymous" nodes correspond to string literals in the
@@ -1641,9 +1641,6 @@ DEFUN ("treesit-node-check",
 Extra nodes represent things like comments, which are not required the
 language definition, but can appear anywhere.
 
-A node "has changes" if the buffer changed since the node is
-created.  (Don't forget the "s" at the end of `has-changes'.)
-
 A node "has error" if itself is a syntax error or contains any syntax
 errors.  */)
   (Lisp_Object node, Lisp_Object property)
@@ -1663,11 +1660,9 @@ DEFUN ("treesit-node-check",
     result = ts_node_is_extra (treesit_node);
   else if (EQ (property, Qhas_error))
     result = ts_node_has_error (treesit_node);
-  else if (EQ (property, Qhas_changes))
-    result = ts_node_has_changes (treesit_node);
   else
     signal_error ("Expecting `named', `missing', `extra', "
-		  "`has-changes' or `has-error', but got",
+		  "or `has-error', but got",
 		  property);
   return result ? Qt : Qnil;
 }
@@ -2829,7 +2824,6 @@ syms_of_treesit (void)
   DEFSYM (Qnamed, "named");
   DEFSYM (Qmissing, "missing");
   DEFSYM (Qextra, "extra");
-  DEFSYM (Qhas_changes, "has-changes");
   DEFSYM (Qhas_error, "has-error");
 
   DEFSYM (Qnot_found, "not-found");

commit 3a5c4bdc0c079f72bad98e01f70343ba9e9b0043
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sun Nov 13 10:51:42 2022 +0200

    Fix crash on MS-Windows due to memory-allocation problem in treesit.c
    
    * src/treesit.c (treesit_load_language): Use 'xstrdup'/'xfree'
    instead of 'strdup'/'free', to prevent crashes on MS-Windows,
    where we must use our own implementation of 'malloc'/'free',
    whereas 'strdup' uses the default implementation in the MS-Windows
    C runtime library.

diff --git a/src/treesit.c b/src/treesit.c
index 854d7754f0..86328ae03e 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -578,12 +578,12 @@ treesit_load_language (Lisp_Object language_symbol,
   /* Load TSLanguage.  */
   dynlib_error ();
   TSLanguage *(*langfn) (void);
-  char *c_name = strdup (SSDATA (base_name));
+  char *c_name = xstrdup (SSDATA (base_name));
   treesit_symbol_to_c_name (c_name);
   if (found_override)
     c_name = SSDATA (override_c_name);
   langfn = dynlib_sym (handle, c_name);
-  free (c_name);
+  xfree (c_name);
   error = dynlib_error ();
   if (error != NULL)
     {

commit 908aab6144bf9f62dd5b2c2f1776ed177fa6d18f
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Nov 12 15:57:02 2022 -0800

    Improve tree-sitter imenu for c-mode and js-mode
    
    Instead of a flat list, now categorize imenu entries into categories
    like "Function", "Variable", "Class", etc.
    
    * lisp/progmodes/c-ts-mode.el (c-ts-mode--imenu-1): Handle more edge
    cases.
    (c-ts-mode--imenu): Categorize menu entries.
    * lisp/progmodes/js.el (js--treesit-imenu-type-alist): Remove variable.
    (js--treesit-imenu-label): Remove function.
    (js--treesit-imenu-1): Use the name alone for labels.
    (js--treesit-imenu): Categorize menu entries.

diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 09241b7ab9..5617ea7d7c 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -340,23 +340,40 @@ c-ts-mode--imenu-1
          (subtrees (mapcan #'c-ts-mode--imenu-1 (cdr node)))
          (name (when ts-node
                  (or (treesit-node-text
-                      (or (treesit-node-child-by-field-name
-                           ts-node "declarator")
+                      (pcase (treesit-node-type ts-node)
+                        ("function_definition"
+                         (treesit-node-child-by-field-name
                           (treesit-node-child-by-field-name
-                           ts-node "name"))
+                           ts-node "declarator")
+                          "declarator"))
+                        ("declaration"
+                         (let ((child (treesit-node-child ts-node -1 t)))
+                           (pcase (treesit-node-type child)
+                             ("identifier" child)
+                             (_ (treesit-node-child-by-field-name
+                                 child "declarator")))))
+                        ("struct_specifier"
+                         (treesit-node-child-by-field-name
+                          ts-node "name")))
                       t)
                      "Unnamed node")))
          (marker (when ts-node
                    (set-marker (make-marker)
                                (treesit-node-start ts-node)))))
-    ;; A struct_specifier could be inside a parameter list or another
-    ;; struct definition.  In those cases we don't include it.
+    ;; A struct_specifier could be inside a parameter list, another
+    ;; struct definition, a variable declaration, a function
+    ;; declaration.  In those cases we don't include it.
     (cond
      ((string-match-p
-       (rx (or "parameter" "field") "_declaration")
+       (rx (or "parameter_declaration" "field_declaration"
+               "declaration" "function_definition"))
        (or (treesit-node-type (treesit-node-parent ts-node))
            ""))
       nil)
+     ((and (equal (treesit-node-type ts-node) "declaration")
+           (not (equal (treesit-node-type (treesit-node-parent ts-node))
+                       "translation_unit")))
+      nil)
      ((null ts-node) subtrees)
      (subtrees
       `((,name ,(cons name marker) ,@subtrees)))
@@ -366,10 +383,15 @@ c-ts-mode--imenu-1
 (defun c-ts-mode--imenu ()
   "Return Imenu alist for the current buffer."
   (let* ((node (treesit-buffer-root-node))
-         (tree (treesit-induce-sparse-tree
-                node (rx (or "function_definition"
-                             "struct_specifier")))))
-    (c-ts-mode--imenu-1 tree)))
+         (func-tree (treesit-induce-sparse-tree
+                     node "^function_definition$"))
+         (var-tree (treesit-induce-sparse-tree
+                    node "^declaration$"))
+         (struct-tree (treesit-induce-sparse-tree
+                       node "^struct_specifier$")))
+    `(("Struct" . ,(c-ts-mode--imenu-1 struct-tree))
+      ("Variable" . ,(c-ts-mode--imenu-1 var-tree))
+      ("Function" . ,(c-ts-mode--imenu-1 func-tree)))))
 
 ;;;###autoload
 (define-derived-mode c-ts-mode--base-mode prog-mode "C"
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 8ec7e7c675..ac2b6a27b7 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3631,23 +3631,6 @@ js-treesit-current-defun
              do (setq node (treesit-node-parent node))
              finally return  (string-join name-list "."))))
 
-;; Keep this private since we might later change it or generalize it.
-(defvar js--treesit-imenu-type-alist
-  '((variable . "V ")
-    (function . "F ")
-    (class . "C ")
-    (method . "M "))
-  "Maps imenu label types to their \"symbol\".
-Symbols are prefixed to each label in imenu (see
-`js--treesit-imenu-label').")
-
-(defun js--treesit-imenu-label (type name)
-  "Format label for imenu.
-TYPE can be `variable', `function', `class', `method'.
-NAME is a string."
-  (format "%s%s" (alist-get type js--treesit-imenu-type-alist)
-          name))
-
 (defun js--treesit-imenu-1 (node)
   "Given a sparse tree, create an imenu alist.
 
@@ -3695,23 +3678,24 @@ js--treesit-imenu-1
            (treesit-node-top-level ts-node))
       nil)
      (subtrees
-      (let ((parent-label (js--treesit-imenu-label type name))
-            (jump-label ""))
-        `((,parent-label
-           ,(cons jump-label marker)
-           ,@subtrees))))
-     (t (let ((label (js--treesit-imenu-label type name)))
-          (list (cons label marker)))))))
+      `((,name
+         ,(cons "" marker)
+         ,@subtrees)))
+     (t (list (cons name marker))))))
 
 (defun js--treesit-imenu ()
   "Return Imenu alist for the current buffer."
   (let* ((node (treesit-buffer-root-node))
-         (tree (treesit-induce-sparse-tree
-                node (rx (or "class_declaration"
-                             "method_definition"
-                             "function_declaration"
-                             "lexical_declaration")))))
-    (js--treesit-imenu-1 tree)))
+         (class-tree (treesit-induce-sparse-tree
+                      node (rx (or "class_declaration"
+                                   "method_definition"))))
+         (func-tree (treesit-induce-sparse-tree
+                     node "function_declaration"))
+         (var-tree (treesit-induce-sparse-tree
+                    node "lexical_declaration")))
+    `(("Class" . ,(js--treesit-imenu-1 class-tree))
+      ("Varieable" . ,(js--treesit-imenu-1 var-tree))
+      ("Function" . ,(js--treesit-imenu-1 func-tree)))))
 
 ;;; Main Function
 

commit c78dc25a5351b1a4191028ba252c892ae1dd2438
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Nov 12 14:33:14 2022 -0800

    ; Minor typo fixes for tree-sitter modes
    
    * etc/NEWS: Fix typos.  Change Tree-sitter to tree-sitter.
    * lisp/progmodes/c-ts-mode.el
    * lisp/progmodes/css-ts-mode.el
    * lisp/progmodes/java-ts-mode.el
    * lisp/progmodes/json-ts-mode.el: Change Tree Sitter to tree-sitter.
    Fix typo.

diff --git a/etc/NEWS b/etc/NEWS
index 5e655a953d..e456476f00 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2783,33 +2783,33 @@ This is a lightweight variant of 'js-mode' that is used by default
 when visiting JSON files.
 
 
-** New mode ts-mode'.
-A major mode based on the Tree-sitter library for editing programs
-in the FOO language.  It includes support for font-locking,
+** New mode 'ts-mode'.
+A major mode based on the tree-sitter library for editing programs
+in the TypeScript language.  It includes support for font-locking,
 indentation, and navigation.
 
-** New mode c-ts-mode'.
-A major mode based on the Tree-sitter library for editing programs
+** New mode 'c-ts-mode'.
+A major mode based on the tree-sitter library for editing programs
 in the C language.  It includes support for font-locking,
 indentation, Imenu, which-func, and navigation.
 
-** New mode c++-ts-mode'.
-A major mode based on the Tree-sitter library for editing programs
+** New mode 'c++-ts-mode'.
+A major mode based on the tree-sitter library for editing programs
 in the C++ language.  It includes support for font-locking,
 indentation, Imenu, which-func, and navigation.
 
-** New mode java-ts-mode'.
-A major mode based on the Tree-sitter library for editing programs
+** New mode 'java-ts-mode'.
+A major mode based on the tree-sitter library for editing programs
 in the Java language.  It includes support for font-locking,
 indentation, Imenu, which-func, and navigation.
 
-** New mode css-ts-mode'.
-A major mode based on the Tree-sitter library for editing programs
+** New mode 'css-ts-mode'.
+A major mode based on the tree-sitter library for editing programs
 in the CSS language.  It includes support for font-locking,
 indentation, Imenu, which-func, and navigation.
 
-** New mode json-ts-mode'.
-A major mode based on the Tree-sitter library for editing programs
+** New mode 'json-ts-mode'.
+A major mode based on the tree-sitter library for editing programs
 in the JSON language.  It includes support for font-locking,
 indentation, Imenu, which-func, and navigation.
 
diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 3e77a85b4d..09241b7ab9 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -1,4 +1,4 @@
-;;; c-ts-mode.el --- tree sitter support for C and C++  -*- lexical-binding: t; -*-
+;;; c-ts-mode.el --- tree-sitter support for C and C++  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2022 Free Software Foundation, Inc.
 
@@ -191,7 +191,7 @@ c-ts-mode--font-lock-settings
    :override t
    :feature 'comment
    `((comment) @font-lock-comment-face
-     (comment) @contexual)
+     (comment) @contextual)
    :language mode
    :override t
    :feature 'preprocessor
@@ -373,7 +373,7 @@ c-ts-mode--imenu
 
 ;;;###autoload
 (define-derived-mode c-ts-mode--base-mode prog-mode "C"
-  "Major mode for editing C, powered by Tree Sitter."
+  "Major mode for editing C, powered by tree-sitter."
   :group 'c
   :syntax-table c-ts-mode--syntax-table
 
@@ -406,11 +406,11 @@ c-ts-mode--base-mode
 
 ;;;###autoload
 (define-derived-mode c-ts-mode c-ts-mode--base-mode "C"
-  "Major mode for editing C, powered by Tree Sitter."
+  "Major mode for editing C, powered by tree-sitter."
   :group 'c
 
   (unless (treesit-ready-p nil 'c)
-    (error "Tree Sitter for C isn't available"))
+    (error "Tree-sitter for C isn't available"))
 
   (treesit-parser-create 'c)
 
@@ -424,11 +424,11 @@ c-ts-mode
 
 ;;;###autoload
 (define-derived-mode c++-ts-mode c-ts-mode--base-mode "C++"
-  "Major mode for editing C, powered by Tree Sitter."
+  "Major mode for editing C, powered by tree-sitter."
   :group 'c++
 
   (unless (treesit-ready-p nil 'cpp)
-    (error "Tree Sitter for C++ isn't available"))
+    (error "Tree-sitter for C++ isn't available"))
 
   (treesit-parser-create 'cpp)
 
diff --git a/lisp/progmodes/css-ts-mode.el b/lisp/progmodes/css-ts-mode.el
index c1a8d4e94d..e22bf99c6c 100644
--- a/lisp/progmodes/css-ts-mode.el
+++ b/lisp/progmodes/css-ts-mode.el
@@ -1,4 +1,4 @@
-;;; css-ts-mode.el --- tree sitter support for CSS  -*- lexical-binding: t; -*-
+;;; css-ts-mode.el --- tree-sitter support for CSS  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2022 Free Software Foundation, Inc.
 
@@ -101,7 +101,7 @@ css-ts-mode
   :syntax-table css-mode-syntax-table
 
   (unless (treesit-ready-p nil 'css)
-    (error "Tree Sitter for CSS isn't available"))
+    (error "Tree-sitter for CSS isn't available"))
 
   (treesit-parser-create 'css)
 
diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index 734a8be471..5ec7da9f5c 100644
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -1,4 +1,4 @@
-;;; java-ts-mode.el --- tree sitter support for Java  -*- lexical-binding: t; -*-
+;;; java-ts-mode.el --- tree-sitter support for Java  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2022 Free Software Foundation, Inc.
 
@@ -251,7 +251,7 @@ java-ts-mode--imenu
 
 ;;;###autoload
 (define-derived-mode java-ts-mode prog-mode "Java"
-  "Major mode for editing Java, powered by Tree Sitter."
+  "Major mode for editing Java, powered by tree-sitter."
   :group 'c
   :syntax-table java-ts-mode--syntax-table
 
diff --git a/lisp/progmodes/json-ts-mode.el b/lisp/progmodes/json-ts-mode.el
index 13eb5b78a9..686640f98a 100644
--- a/lisp/progmodes/json-ts-mode.el
+++ b/lisp/progmodes/json-ts-mode.el
@@ -1,4 +1,4 @@
-;;; json-ts-mode.el --- tree sitter support for JSON  -*- lexical-binding: t; -*-
+;;; json-ts-mode.el --- tree-sitter support for JSON  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2022 Free Software Foundation, Inc.
 
@@ -113,12 +113,12 @@ json-ts-mode--imenu
 
 ;;;###autoload
 (define-derived-mode json-ts-mode prog-mode "JSON"
-  "Major mode for editing JSON, powered by Tree Sitter."
+  "Major mode for editing JSON, powered by tree-sitter."
   :group 'json
   :syntax-table json-ts-mode--syntax-table
 
   (unless (treesit-ready-p nil 'json)
-    (error "Tree Sitter for JSON isn't available"))
+    (error "Tree-sitter for JSON isn't available"))
 
   (treesit-parser-create 'json)
 

commit 67f9705fc0fc5ecc91172ab02df8c1f31fe654e2
Author: Theodor Thornhill <theo@thornhill.no>
Date:   Thu Nov 10 17:15:49 2022 +0100

    Add tree-sitter modes for C-like languages
    
    * etc/NEWS: Mention the new modes
    * lisp/progmodes/c-ts-mode.el: New major mode with tree-sitter support
    for C and C++.
    * lisp/progmodes/java-ts-mode.el: New major mode with tree-sitter support.
    * lisp/progmodes/json-ts-mode.el: New major mode with tree-sitter support.
    * lisp/progmodes/css-ts-mode.el: New major mode with tree-sitter support.

diff --git a/etc/NEWS b/etc/NEWS
index 9ed78bc6b3..5e655a953d 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2784,10 +2784,34 @@ when visiting JSON files.
 
 
 ** New mode ts-mode'.
-Support is added for TypeScript, based on the new integration with
-Tree-Sitter. There's support for font-locking, indentation and
-navigation.  Tree-Sitter is required for this mode to function, but if
-it is not available, we will default to use 'js-mode'.
+A major mode based on the Tree-sitter library for editing programs
+in the FOO language.  It includes support for font-locking,
+indentation, and navigation.
+
+** New mode c-ts-mode'.
+A major mode based on the Tree-sitter library for editing programs
+in the C language.  It includes support for font-locking,
+indentation, Imenu, which-func, and navigation.
+
+** New mode c++-ts-mode'.
+A major mode based on the Tree-sitter library for editing programs
+in the C++ language.  It includes support for font-locking,
+indentation, Imenu, which-func, and navigation.
+
+** New mode java-ts-mode'.
+A major mode based on the Tree-sitter library for editing programs
+in the Java language.  It includes support for font-locking,
+indentation, Imenu, which-func, and navigation.
+
+** New mode css-ts-mode'.
+A major mode based on the Tree-sitter library for editing programs
+in the CSS language.  It includes support for font-locking,
+indentation, Imenu, which-func, and navigation.
+
+** New mode json-ts-mode'.
+A major mode based on the Tree-sitter library for editing programs
+in the JSON language.  It includes support for font-locking,
+indentation, Imenu, which-func, and navigation.
 
 
 * Incompatible Lisp Changes in Emacs 29.1
diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
new file mode 100644
index 0000000000..3e77a85b4d
--- /dev/null
+++ b/lisp/progmodes/c-ts-mode.el
@@ -0,0 +1,445 @@
+;;; c-ts-mode.el --- tree sitter support for C and C++  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2022 Free Software Foundation, Inc.
+
+;; Author     : Theodor Thornhill <theo@thornhill.no>
+;; Maintainer : Theodor Thornhill <theo@thornhill.no>
+;; Created    : November 2022
+;; Keywords   : c c++ cpp languages tree-sitter
+
+;; This file is part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'treesit)
+(require 'rx)
+
+(defcustom c-ts-mode-indent-offset 2
+  "Number of spaces for each indentation step in `c-ts-mode'."
+  :type 'integer
+  :safe 'integerp
+  :group 'c)
+
+(defcustom c-ts-mode-indent-style 'gnu
+  "Style used for indentation.
+
+The selected style could be one of GNU, K&R, LINUX or BSD.  If
+one of the supplied styles doesn't suffice a function could be
+set instead.  This function is expected return a list that
+follows the form of `treesit-simple-indent-rules'."
+  :type '(choice (symbol :tag "Gnu" 'gnu)
+                 (symbol :tag "K&R" 'k&r)
+                 (symbol :tag "Linux" 'linux)
+                 (symbol :tag "BSD" 'bsd)
+                 (function :tag "A function for user customized style" ignore))
+  :group 'c)
+
+(defvar c-ts-mode--syntax-table
+  (let ((table (make-syntax-table)))
+    ;; Taken from the cc-langs version
+    (modify-syntax-entry ?_  "_"     table)
+    (modify-syntax-entry ?\\ "\\"    table)
+    (modify-syntax-entry ?+  "."     table)
+    (modify-syntax-entry ?-  "."     table)
+    (modify-syntax-entry ?=  "."     table)
+    (modify-syntax-entry ?%  "."     table)
+    (modify-syntax-entry ?<  "."     table)
+    (modify-syntax-entry ?>  "."     table)
+    (modify-syntax-entry ?&  "."     table)
+    (modify-syntax-entry ?|  "."     table)
+    (modify-syntax-entry ?\' "\""    table)
+    (modify-syntax-entry ?\240 "."   table)
+    (modify-syntax-entry ?/  ". 124b" table)
+    (modify-syntax-entry ?*  ". 23"   table)
+    table)
+  "Syntax table for `c-ts-mode'.")
+
+(defun c-ts-mode--indent-styles (mode)
+  "Indent rules supported by `c-ts-mode'.
+MODE is either `c' or `cpp'."
+  (let ((common
+         `(((parent-is "translation_unit") parent-bol 0)
+           ((node-is ")") parent 1)
+           ((node-is "]") parent-bol 0)
+           ((node-is "}") (and parent parent-bol) 0)
+           ((node-is "else") parent-bol 0)
+           ((node-is "case") parent-bol 0)
+           ((node-is "preproc_arg") no-indent)
+           ((node-is "comment") no-indent)
+           ((parent-is "comment") no-indent)
+           ((node-is "labeled_statement") parent-bol 0)
+           ((parent-is "labeled_statement") parent-bol c-ts-mode-indent-offset)
+           ((match "preproc_ifdef" "compound_statement") point-min 0)
+           ((match "#endif" "preproc_ifdef") point-min 0)
+           ((match "preproc_if" "compound_statement") point-min 0)
+           ((match "#endif" "preproc_if") point-min 0)
+           ((match "preproc_function_def" "compound_statement") point-min 0)
+           ((match "preproc_call" "compound_statement") point-min 0)
+           ((parent-is "compound_statement") (and parent parent-bol) c-ts-mode-indent-offset)
+           ((parent-is "function_definition") parent-bol 0)
+           ((parent-is "conditional_expression") first-sibling 0)
+           ((parent-is "assignment_expression") parent-bol c-ts-mode-indent-offset)
+           ((parent-is "comma_expression") first-sibling 0)
+           ((parent-is "init_declarator") parent-bol c-ts-mode-indent-offset)
+           ((parent-is "parenthesized_expression") first-sibling 1)
+           ((parent-is "argument_list") first-sibling 1)
+           ((parent-is "parameter_list") first-sibling 1)
+           ((parent-is "binary_expression") parent 0)
+           ((query "(for_statement initializer: (_) @indent)") parent-bol 5)
+           ((query "(for_statement condition: (_) @indent)") parent-bol 5)
+           ((query "(for_statement update: (_) @indent)") parent-bol 5)
+           ((query "(call_expression arguments: (_) @indent)") parent c-ts-mode-indent-offset)
+           ((parent-is "call_expression") parent 0)
+           ((parent-is "enumerator_list") parent-bol c-ts-mode-indent-offset)
+           ((parent-is "field_declaration_list") parent-bol c-ts-mode-indent-offset)
+           ((parent-is "initializer_list") parent-bol c-ts-mode-indent-offset)
+           ((parent-is "if_statement") parent-bol c-ts-mode-indent-offset)
+           ((parent-is "for_statement") parent-bol c-ts-mode-indent-offset)
+           ((parent-is "while_statement") parent-bol c-ts-mode-indent-offset)
+           ((parent-is "switch_statement") parent-bol c-ts-mode-indent-offset)
+           ((parent-is "case_statement") parent-bol c-ts-mode-indent-offset)
+           ((parent-is "do_statement") parent-bol c-ts-mode-indent-offset)
+           ,@(when (eq mode 'cpp)
+               `(((node-is "field_initializer_list") parent-bol ,(* c-ts-mode-indent-offset 2)))))))
+    `((gnu
+       ;; Prepend rules to set highest priority
+       ((match "while" "do_statement") parent 0)
+       ,@common)
+      (k&r ,@common)
+      (linux ,@common)
+      (bsd
+       ((parent-is "if_statement") parent-bol 0)
+       ((parent-is "for_statement") parent-bol 0)
+       ((parent-is "while_statement") parent-bol 0)
+       ((parent-is "switch_statement") parent-bol 0)
+       ((parent-is "case_statement") parent-bol 0)
+       ((parent-is "do_statement") parent-bol 0)
+       ,@common))))
+
+(defun c-ts-mode--set-indent-style (mode)
+  "Helper function to set indentation style.
+MODE is either `c' or `cpp'."
+  (let ((style
+         (if (functionp c-ts-mode-indent-style)
+             (funcall c-ts-mode-indent-style)
+           (pcase c-ts-mode-indent-style
+             ('gnu   (alist-get 'gnu (c-ts-mode--indent-styles mode)))
+             ('k&r   (alist-get 'k&r (c-ts-mode--indent-styles mode)))
+             ('bsd   (alist-get 'bsd (c-ts-mode--indent-styles mode)))
+             ('linux (alist-get 'linux (c-ts-mode--indent-styles mode)))))))
+    `((,mode ,@style))))
+
+(defvar c-ts-mode--preproc-keywords
+  '("#define" "#if" "#ifdef" "#ifndef"
+    "#else" "#elif" "#endif" "#include")
+  "C/C++ keywords for tree-sitter font-locking.")
+
+(defun c-ts-mode--keywords (mode)
+  "C/C++ keywords for tree-sitter font-locking.
+MODE is either `c' or `cpp'."
+  (let ((c-keywords
+         '("break" "case" "const" "continue"
+           "default" "do" "else" "enum"
+           "extern" "for" "goto" "if"
+           "long" "register" "return" "short"
+           "signed" "sizeof" "static" "struct"
+           "switch" "typedef" "union" "unsigned"
+           "volatile" "while")))
+    (if (eq mode 'cpp)
+        (append c-keywords
+                '("and" "and_eq" "bitand" "bitor"
+                  "catch" "class" "co_await" "co_return"
+                  "co_yield" "compl" "concept" "consteval"
+                  "constexpr" "constinit" "decltype" "delete"
+                  "explicit" "final" "friend" "friend"
+                  "mutable" "namespace" "new" "noexcept"
+                  "not" "not_eq" "operator" "or"
+                  "or_eq" "override" "private" "protected"
+                  "public" "requires" "template" "throw"
+                  "try" "typename" "using" "virtual"
+                  "xor" "xor_eq"))
+      (append '("auto") c-keywords))))
+
+(defvar c-ts-mode--operators
+  '("=" "-" "*" "/" "+" "%" "~" "|" "&" "^" "<<" ">>" "->"
+    "." "<" "<=" ">=" ">" "==" "!=" "!" "&&" "||" "-="
+    "+=" "*=" "/=" "%=" "|=" "&=" "^=" ">>=" "<<=" "--" "++")
+  "C/C++ operators for tree-sitter font-locking.")
+
+(defun c-ts-mode--font-lock-settings (mode)
+  "Tree-sitter font-lock settings.
+MODE is either `c' or `cpp'."
+  (treesit-font-lock-rules
+   :language mode
+   :override t
+   :feature 'comment
+   `((comment) @font-lock-comment-face
+     (comment) @contexual)
+   :language mode
+   :override t
+   :feature 'preprocessor
+   `((preproc_directive) @font-lock-preprocessor-face
+
+     (preproc_def
+      name: (identifier) @font-lock-variable-name-face)
+
+     (preproc_ifdef
+      name: (identifier) @font-lock-variable-name-face)
+
+     (preproc_function_def
+      name: (identifier) @font-lock-function-name-face)
+
+     (preproc_params
+      (identifier) @font-lock-variable-name-face)
+
+     (preproc_defined) @font-lock-preprocessor-face
+     (preproc_defined (identifier) @font-lock-variable-name-face)
+     [,@c-ts-mode--preproc-keywords] @font-lock-preprocessor-face)
+   :language mode
+   :override t
+   :feature 'constant
+   `((true) @font-lock-constant-face
+     (false) @font-lock-constant-face
+     (null) @font-lock-constant-face
+     ,@(when (eq mode 'cpp)
+         '((this) @font-lock-constant-face)))
+   :language mode
+   :override t
+   :feature 'keyword
+   `([,@(c-ts-mode--keywords mode)] @font-lock-keyword-face
+     ,@(when (eq mode 'cpp)
+         '((auto) @font-lock-keyword-face)))
+   :language mode
+   :override t
+   :feature 'operator
+   `([,@c-ts-mode--operators] @font-lock-builtin-face)
+   :language mode
+   :override t
+   :feature 'string
+   `((string_literal) @font-lock-string-face
+     ((string_literal)) @contextual
+     (system_lib_string) @font-lock-string-face
+     (escape_sequence) @font-lock-string-face)
+   :language mode
+   :override t
+   :feature 'literal
+   `((number_literal) @font-lock-constant-face
+     (char_literal) @font-lock-constant-face)
+   :language mode
+   :override t
+   :feature 'type
+   `((primitive_type) @font-lock-type-face
+     ,@(when (eq mode 'cpp)
+         '((type_qualifier) @font-lock-type-face
+
+           (qualified_identifier
+            scope: (namespace_identifier) @font-lock-type-face)
+
+           (operator_cast) type: (type_identifier) @font-lock-type-face)))
+   :language mode
+   :override t
+   :feature 'definition
+   `((declaration
+      declarator: (identifier) @font-lock-variable-name-face)
+
+     (declaration
+      type: (type_identifier) @font-lock-type-face)
+
+     (field_declaration
+      declarator: (field_identifier) @font-lock-variable-name-face)
+
+     (field_declaration
+      type: (type_identifier) @font-lock-type-face)
+
+     (parameter_declaration
+      type: (type_identifier) @font-lock-type-face)
+
+     (function_definition
+      type: (type_identifier) @font-lock-type-face)
+
+     (function_declarator
+      declarator: (identifier) @font-lock-function-name-face)
+
+     (array_declarator
+      declarator: (identifier) @font-lock-variable-name-face)
+
+     (init_declarator
+      declarator: (identifier) @font-lock-variable-name-face)
+
+     (struct_specifier
+      name: (type_identifier) @font-lock-type-face)
+
+     (sized_type_specifier) @font-lock-type-face
+
+     (enum_specifier
+      name: (type_identifier) @font-lock-type-face)
+
+     (enumerator
+      name: (identifier) @font-lock-variable-name-face)
+
+     (parameter_declaration
+      type: (_) @font-lock-type-face
+      declarator: (identifier) @font-lock-variable-name-face)
+
+     (pointer_declarator
+      declarator: (identifier) @font-lock-variable-name-face)
+
+     (pointer_declarator
+      declarator: (field_identifier) @font-lock-variable-name-face))
+   :language mode
+   :override t
+   :feature 'expression
+   '((assignment_expression
+      left: (identifier) @font-lock-variable-name-face)
+
+     (call_expression
+      function: (identifier) @font-lock-function-name-face)
+
+     (field_expression
+      field: (field_identifier) @font-lock-variable-name-face)
+
+     (field_expression
+      argument: (identifier) @font-lock-variable-name-face
+      field: (field_identifier) @font-lock-variable-name-face)
+
+     (pointer_expression
+      argument: (identifier) @font-lock-variable-name-face))
+   :language mode
+   :override t
+   :feature 'statement
+   '((expression_statement (identifier) @font-lock-variable-name-face)
+     (labeled_statement
+      label: (statement_identifier) @font-lock-type-face))
+   :language mode
+   :override t
+   :feature 'error
+   '((ERROR) @font-lock-warning-face)))
+
+(defun c-ts-mode--imenu-1 (node)
+  "Helper for `c-ts-mode--imenu'.
+Find string representation for NODE and set marker, then recurse
+the subtrees."
+  (let* ((ts-node (car node))
+         (subtrees (mapcan #'c-ts-mode--imenu-1 (cdr node)))
+         (name (when ts-node
+                 (or (treesit-node-text
+                      (or (treesit-node-child-by-field-name
+                           ts-node "declarator")
+                          (treesit-node-child-by-field-name
+                           ts-node "name"))
+                      t)
+                     "Unnamed node")))
+         (marker (when ts-node
+                   (set-marker (make-marker)
+                               (treesit-node-start ts-node)))))
+    ;; A struct_specifier could be inside a parameter list or another
+    ;; struct definition.  In those cases we don't include it.
+    (cond
+     ((string-match-p
+       (rx (or "parameter" "field") "_declaration")
+       (or (treesit-node-type (treesit-node-parent ts-node))
+           ""))
+      nil)
+     ((null ts-node) subtrees)
+     (subtrees
+      `((,name ,(cons name marker) ,@subtrees)))
+     (t
+      `((,name . ,marker))))))
+
+(defun c-ts-mode--imenu ()
+  "Return Imenu alist for the current buffer."
+  (let* ((node (treesit-buffer-root-node))
+         (tree (treesit-induce-sparse-tree
+                node (rx (or "function_definition"
+                             "struct_specifier")))))
+    (c-ts-mode--imenu-1 tree)))
+
+;;;###autoload
+(define-derived-mode c-ts-mode--base-mode prog-mode "C"
+  "Major mode for editing C, powered by Tree Sitter."
+  :group 'c
+  :syntax-table c-ts-mode--syntax-table
+
+  ;; Comments.
+  (setq-local comment-start "// ")
+  (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
+  (setq-local comment-end "")
+
+  ;; Navigation.
+  (setq-local treesit-defun-type-regexp
+              (rx (or "specifier"
+                      "definition")))
+
+  ;; Indent.
+  (when (eq c-ts-mode-indent-style 'linux)
+    (setq-local indent-tabs-mode t))
+
+  ;; Electric
+  (setq-local electric-indent-chars
+	      (append "{}():;," electric-indent-chars))
+
+  ;; Imenu.
+  (setq-local imenu-create-index-function #'c-ts-mode--imenu)
+  (setq-local which-func-functions nil)
+
+  (setq-local treesit-font-lock-feature-list
+              '((comment preprocessor operator constant string literal keyword)
+                (type definition expression statement)
+                (error))))
+
+;;;###autoload
+(define-derived-mode c-ts-mode c-ts-mode--base-mode "C"
+  "Major mode for editing C, powered by Tree Sitter."
+  :group 'c
+
+  (unless (treesit-ready-p nil 'c)
+    (error "Tree Sitter for C isn't available"))
+
+  (treesit-parser-create 'c)
+
+  (setq-local treesit-simple-indent-rules
+              (c-ts-mode--set-indent-style 'c))
+
+  ;; Font-lock.
+  (setq-local treesit-font-lock-settings (c-ts-mode--font-lock-settings 'c))
+
+  (treesit-major-mode-setup))
+
+;;;###autoload
+(define-derived-mode c++-ts-mode c-ts-mode--base-mode "C++"
+  "Major mode for editing C, powered by Tree Sitter."
+  :group 'c++
+
+  (unless (treesit-ready-p nil 'cpp)
+    (error "Tree Sitter for C++ isn't available"))
+
+  (treesit-parser-create 'cpp)
+
+  (setq-local treesit-simple-indent-rules
+              (c-ts-mode--set-indent-style 'cpp))
+
+  ;; Font-lock.
+  (setq-local treesit-font-lock-settings (c-ts-mode--font-lock-settings 'cpp))
+
+  (treesit-major-mode-setup))
+
+(provide 'c-ts-mode)
+
+;;; c-ts-mode.el ends here
diff --git a/lisp/progmodes/css-ts-mode.el b/lisp/progmodes/css-ts-mode.el
new file mode 100644
index 0000000000..c1a8d4e94d
--- /dev/null
+++ b/lisp/progmodes/css-ts-mode.el
@@ -0,0 +1,131 @@
+;;; css-ts-mode.el --- tree sitter support for CSS  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2022 Free Software Foundation, Inc.
+
+;; Author     : Theodor Thornhill <theo@thornhill.no>
+;; Maintainer : Theodor Thornhill <theo@thornhill.no>
+;; Created    : November 2022
+;; Keywords   : css languages tree-sitter
+
+;; This file is part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'treesit)
+(require 'rx)
+(require 'css-mode)
+
+(defcustom css-ts-mode-indent-offset 2
+  "Number of spaces for each indentation step in `ts-mode'."
+  :type 'integer
+  :safe 'integerp
+  :group 'css)
+
+(defvar css-ts-mode--indent-rules
+  `((css
+     ((node-is "}") parent-bol 0)
+     ((node-is ")") parent-bol 0)
+     ((node-is "]") parent-bol 0)
+
+     ((parent-is "block") parent-bol css-ts-mode-indent-offset)
+     ((parent-is "arguments") parent-bol css-ts-mode-indent-offset)
+     ((parent-is "declaration") parent-bol css-ts-mode-indent-offset))))
+
+(defvar css-ts-mode--settings
+  (treesit-font-lock-rules
+   :language 'css
+   :feature 'basic
+   :override t
+   `((unit) @font-lock-constant-face
+     (integer_value) @font-lock-builtin-face
+     (float_value) @font-lock-builtin-face
+     (plain_value) @font-lock-variable-name-face
+     (comment) @font-lock-comment-face
+     (class_selector) @css-selector
+     (child_selector) @css-selector
+     (id_selector) @css-selector
+     (tag_name) @css-selector
+     (property_name) @css-property
+     (class_name) @css-selector
+     (function_name) @font-lock-function-name-face)))
+
+(defun css-ts-mode--imenu-1 (node)
+  "Helper for `css-ts-mode--imenu'.
+Find string representation for NODE and set marker, then recurse
+the subtrees."
+  (let* ((ts-node (car node))
+         (subtrees (mapcan #'css-ts-mode--imenu-1 (cdr node)))
+         (name (when ts-node
+                 (if (equal (treesit-node-type ts-node) "tag_name")
+                     (treesit-node-text ts-node)
+                   (treesit-node-text (treesit-node-child ts-node 1) t))))
+         (marker (when ts-node
+                   (set-marker (make-marker)
+                               (treesit-node-start ts-node)))))
+    (cond
+     ((null ts-node) subtrees)
+     (subtrees
+      `((,name ,(cons name marker) ,@subtrees)))
+     (t
+      `((,name . ,marker))))))
+
+(defun css-ts-mode--imenu ()
+  "Return Imenu alist for the current buffer."
+  (let* ((node (treesit-buffer-root-node))
+         (tree (treesit-induce-sparse-tree
+                node (rx (or "class_selector"
+                             "id_selector"
+                             "tag_name")))))
+    (css-ts-mode--imenu-1 tree)))
+
+(define-derived-mode css-ts-mode prog-mode "CSS"
+  "Major mode for editing CSS."
+  :group 'css
+  :syntax-table css-mode-syntax-table
+
+  (unless (treesit-ready-p nil 'css)
+    (error "Tree Sitter for CSS isn't available"))
+
+  (treesit-parser-create 'css)
+
+  ;; Comments
+  (setq-local comment-start "/*")
+  (setq-local comment-start-skip "/\\*+[ \t]*")
+  (setq-local comment-end "*/")
+  (setq-local comment-end-skip "[ \t]*\\*+/")
+
+  ;; Indent.
+  (setq-local treesit-simple-indent-rules css-ts-mode--indent-rules)
+
+  ;; Navigation.
+  (setq-local treesit-defun-type-regexp "rule_set")
+  ;; Font-lock.
+  (setq-local treesit-font-lock-settings css-ts-mode--settings)
+  (setq treesit-font-lock-feature-list '((basic) () ()))
+
+  ;; Imenu.
+  (setq-local imenu-create-index-function #'css-ts-mode--imenu)
+  (setq-local which-func-functions nil) ;; Piggyback on imenu
+
+  (treesit-major-mode-setup))
+
+(provide 'css-ts-mode)
+
+;;; css-ts-mode.el ends here
diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
new file mode 100644
index 0000000000..734a8be471
--- /dev/null
+++ b/lisp/progmodes/java-ts-mode.el
@@ -0,0 +1,289 @@
+;;; java-ts-mode.el --- tree sitter support for Java  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2022 Free Software Foundation, Inc.
+
+;; Author     : Theodor Thornhill <theo@thornhill.no>
+;; Maintainer : Theodor Thornhill <theo@thornhill.no>
+;; Created    : November 2022
+;; Keywords   : java languages tree-sitter
+
+;; This file is part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'treesit)
+(require 'rx)
+
+(defcustom java-ts-mode-indent-offset 4
+  "Number of spaces for each indentation step in `java-ts-mode'."
+  :type 'integer
+  :safe 'integerp
+  :group 'java)
+
+(defvar java-ts-mode--syntax-table
+  (let ((table (make-syntax-table)))
+    ;; Taken from the cc-langs version
+    (modify-syntax-entry ?_  "_"     table)
+    (modify-syntax-entry ?\\ "\\"    table)
+    (modify-syntax-entry ?+  "."     table)
+    (modify-syntax-entry ?-  "."     table)
+    (modify-syntax-entry ?=  "."     table)
+    (modify-syntax-entry ?%  "."     table)
+    (modify-syntax-entry ?<  "."     table)
+    (modify-syntax-entry ?>  "."     table)
+    (modify-syntax-entry ?&  "."     table)
+    (modify-syntax-entry ?|  "."     table)
+    (modify-syntax-entry ?\' "\""    table)
+    (modify-syntax-entry ?\240 "."   table)
+    table)
+  "Syntax table for `java-ts-mode'.")
+
+(defvar java-ts-mode--indent-rules
+  `((java
+     ((parent-is "program") parent-bol 0)
+     ((node-is "}") (and parent parent-bol) 0)
+     ((node-is ")") parent-bol 0)
+     ((node-is "]") parent-bol 0)
+     ((parent-is "class_body") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "interface_body") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "constructor_body") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "enum_body") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "switch_block") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "record_declaration_body") parent-bol java-ts-mode-indent-offset)
+     ((query "(method_declaration (block _ @indent))") parent-bol java-ts-mode-indent-offset)
+     ((query "(method_declaration (block (_) @indent))") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "variable_declarator") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "method_invocation") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "switch_rule") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "ternary_expression") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "element_value_array_initializer") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "function_definition") parent-bol 0)
+     ((parent-is "conditional_expression") first-sibling 0)
+     ((parent-is "assignment_expression") parent-bol 2)
+     ((parent-is "binary_expression") parent 0)
+     ((parent-is "parenthesized_expression") first-sibling 1)
+     ((parent-is "argument_list") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "annotation_argument_list") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "modifiers") parent-bol 0)
+     ((parent-is "formal_parameters") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "formal_parameter") parent-bol 0)
+     ((parent-is "init_declarator") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "if_statement") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "for_statement") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "while_statement") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "switch_statement") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "case_statement") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "labeled_statement") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "do_statement") parent-bol java-ts-mode-indent-offset)
+     ((parent-is "block") (and parent parent-bol) java-ts-mode-indent-offset)))
+  "Tree-sitter indent rules.")
+
+(defvar java-ts-mode--keywords
+  '("abstract" "assert" "break" "case" "catch"
+    "class" "continue" "default" "do" "else"
+    "enum" "exports" "extends" "final" "finally"
+    "for" "if" "implements" "import" "instanceof"
+    "interface" "module" "native" "new" "non-sealed"
+    "open" "opens" "package" "private" "protected"
+    "provides" "public" "requires" "return" "sealed"
+    "static" "strictfp" "switch" "synchronized"
+    "throw" "throws" "to" "transient" "transitive"
+    "try" "uses" "volatile" "while" "with" "record")
+  "C keywords for tree-sitter font-locking.")
+
+(defvar java-ts-mode--operators
+  '("@" "+" ":" "++" "-" "--" "&" "&&" "|" "||"
+    "!=" "==" "*" "/" "%" "<" "<=" ">" ">=" "="
+    "-=" "+=" "*=" "/=" "%=" "->" "^" "^=" "&="
+    "|=" "~" ">>" ">>>" "<<" "::" "?")
+  "C operators for tree-sitter font-locking.")
+
+(defvar java-ts-mode--font-lock-settings
+  (treesit-font-lock-rules
+   :language 'java
+   :override t
+   :feature 'basic
+   '((identifier) @font-lock-variable-name-face)
+   :language 'java
+   :override t
+   :feature 'comment
+   `((line_comment) @font-lock-comment-face
+     (block_comment) @font-lock-comment-face)
+   :language 'java
+   :override t
+   :feature 'constant
+   `(((identifier) @font-lock-constant-face
+      (:match "^[A-Z_][A-Z_\\d]*$" @font-lock-constant-face))
+     (true) @font-lock-constant-face
+     (false) @font-lock-constant-face)
+   :language 'java
+   :override t
+   :feature 'keyword
+   `([,@java-ts-mode--keywords] @font-lock-keyword-face
+     (labeled_statement
+      (identifier) @font-lock-keyword-face))
+   :language 'java
+   :override t
+   :feature 'operator
+   `([,@java-ts-mode--operators] @font-lock-builtin-face)
+   :language 'java
+   :override t
+   :feature 'annotation
+   `((annotation
+      name: (identifier) @font-lock-constant-face)
+
+     (marker_annotation
+      name: (identifier) @font-lock-constant-face))
+   :language 'java
+   :override t
+   :feature 'string
+   `((string_literal) @font-lock-string-face)
+   :language 'java
+   :override t
+   :feature 'literal
+   `((null_literal) @font-lock-constant-face
+     (decimal_floating_point_literal)  @font-lock-constant-face
+     (hex_floating_point_literal) @font-lock-constant-face)
+   :language 'java
+   :override t
+   :feature 'type
+   '((interface_declaration
+      name: (identifier) @font-lock-type-face)
+
+     (class_declaration
+      name: (identifier) @font-lock-type-face)
+
+     (record_declaration
+      name: (identifier) @font-lock-type-face)
+
+     (enum_declaration
+      name: (identifier) @font-lock-type-face)
+
+     (constructor_declaration
+      name: (identifier) @font-lock-type-face)
+
+     (field_access
+      object: (identifier) @font-lock-type-face)
+
+     (method_reference (identifier) @font-lock-type-face)
+
+     ((scoped_identifier name: (identifier) @font-lock-type-face)
+      (:match "^[A-Z]" @font-lock-type-face))
+
+     (type_identifier) @font-lock-type-face
+
+     [(boolean_type)
+      (integral_type)
+      (floating_point_type)
+      (void_type)] @font-lock-type-face)
+   :language 'java
+   :override t
+   :feature 'definition
+   `((method_declaration
+      name: (identifier) @font-lock-function-name-face)
+
+     (formal_parameter
+      name: (identifier) @font-lock-variable-name-face)
+
+     (catch_formal_parameter
+      name: (identifier) @font-lock-variable-name-face))
+   :language 'java
+   :override t
+   :feature 'expression
+   '((method_invocation
+      object: (identifier) @font-lock-variable-name-face)
+
+     (method_invocation
+      name: (identifier) @font-lock-function-name-face)
+
+     (argument_list (identifier) @font-lock-variable-name-face)))
+  "Tree-sitter font-lock settings.")
+
+(defun java-ts-mode--imenu-1 (node)
+  "Helper for `java-ts-mode--imenu'.
+Find string representation for NODE and set marker, then recurse
+the subtrees."
+  (let* ((ts-node (car node))
+         (subtrees (mapcan #'java-ts-mode--imenu-1 (cdr node)))
+         (name (when ts-node
+                 (or (treesit-node-text
+                      (or (treesit-node-child-by-field-name
+                           ts-node "name"))
+                      t)
+                     "Unnamed node")))
+         (marker (when ts-node
+                   (set-marker (make-marker)
+                               (treesit-node-start ts-node)))))
+    (cond
+     ((null ts-node) subtrees)
+     (subtrees
+      `((,name ,(cons name marker) ,@subtrees)))
+     (t
+      `((,name . ,marker))))))
+
+(defun java-ts-mode--imenu ()
+  "Return Imenu alist for the current buffer."
+  (let* ((node (treesit-buffer-root-node))
+         (tree (treesit-induce-sparse-tree
+                node (rx (or "class_declaration"
+                             "interface_declaration"
+                             "enum_declaration"
+                             "record_declaration"
+                             "method_declaration")))))
+    (java-ts-mode--imenu-1 tree)))
+
+;;;###autoload
+(define-derived-mode java-ts-mode prog-mode "Java"
+  "Major mode for editing Java, powered by Tree Sitter."
+  :group 'c
+  :syntax-table java-ts-mode--syntax-table
+
+  (unless (treesit-ready-p nil 'java)
+    (error "Tree-sitter for Java isn't available"))
+
+  (treesit-parser-create 'java)
+
+  ;; Comments.
+  (setq-local comment-start "// ")
+  (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
+  (setq-local comment-end "")
+
+  ;; Indent.
+  (setq-local treesit-simple-indent-rules java-ts-mode--indent-rules)
+
+  ;; Navigation.
+  (setq-local treesit-defun-type-regexp
+              (rx (or "declaration")))
+
+  ;; Font-lock.
+  (setq-local treesit-font-lock-settings java-ts-mode--font-lock-settings)
+  (setq-local treesit-font-lock-feature-list
+              '((basic comment keyword constant string operator)
+                (type definition expression literal annotation)
+                ()))
+
+  ;; Imenu.
+  (setq-local imenu-create-index-function #'java-ts-mode--imenu)
+  (setq-local which-func-functions nil) ;; Piggyback on imenu
+  (treesit-major-mode-setup))
+
+(provide 'java-ts-mode)
+
+;;; java-ts-mode.el ends here
diff --git a/lisp/progmodes/json-ts-mode.el b/lisp/progmodes/json-ts-mode.el
new file mode 100644
index 0000000000..13eb5b78a9
--- /dev/null
+++ b/lisp/progmodes/json-ts-mode.el
@@ -0,0 +1,150 @@
+;;; json-ts-mode.el --- tree sitter support for JSON  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2022 Free Software Foundation, Inc.
+
+;; Author     : Theodor Thornhill <theo@thornhill.no>
+;; Maintainer : Theodor Thornhill <theo@thornhill.no>
+;; Created    : November 2022
+;; Keywords   : json languages tree-sitter
+
+;; This file is part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+;;; Commentary:
+;;
+
+;;; Code:
+
+(require 'treesit)
+(require 'rx)
+
+(defcustom json-ts-mode-indent-offset 2
+  "Number of spaces for each indentation step in `json-ts-mode'."
+  :type 'integer
+  :safe 'integerp
+  :group 'json)
+
+(defvar json-ts-mode--syntax-table
+  (let ((table (make-syntax-table)))
+    ;; Taken from the cc-langs version
+    (modify-syntax-entry ?_  "_"     table)
+    (modify-syntax-entry ?$ "_"      table)
+    (modify-syntax-entry ?\\ "\\"    table)
+    (modify-syntax-entry ?+  "."     table)
+    (modify-syntax-entry ?-  "."     table)
+    (modify-syntax-entry ?=  "."     table)
+    (modify-syntax-entry ?%  "."     table)
+    (modify-syntax-entry ?<  "."     table)
+    (modify-syntax-entry ?>  "."     table)
+    (modify-syntax-entry ?&  "."     table)
+    (modify-syntax-entry ?|  "."     table)
+    (modify-syntax-entry ?` "\""     table)
+    (modify-syntax-entry ?\240 "."   table)
+    table)
+  "Syntax table for `json-ts-mode'.")
+
+
+(defvar json-ts--indent-rules
+  `((json
+     ((node-is "}") parent-bol 0)
+     ((node-is ")") parent-bol 0)
+     ((node-is "]") parent-bol 0)
+     ((parent-is "object") parent-bol json-ts-mode-indent-offset))))
+
+(defvar json-ts-mode--font-lock-settings
+  (treesit-font-lock-rules
+   :language 'json
+   :feature 'minimal
+   :override t
+   `((pair
+      key: (_) @font-lock-string-face)
+
+     (string) @font-lock-string-face
+
+     (number) @font-lock-constant-face
+
+     [(null) (true) (false)] @font-lock-constant-face
+
+     (escape_sequence) @font-lock-constant-face
+
+     (comment) @font-lock-comment-face))
+  "Font-lock settings for JSON.")
+
+(defun json-ts-mode--imenu-1 (node)
+  "Helper for `json-ts-mode--imenu'.
+Find string representation for NODE and set marker, then recurse
+the subtrees."
+  (let* ((ts-node (car node))
+         (subtrees (mapcan #'json-ts-mode--imenu-1 (cdr node)))
+         (name (when ts-node
+                 (treesit-node-text
+                  (treesit-node-child-by-field-name
+                   ts-node "key")
+                  t)))
+         (marker (when ts-node
+                   (set-marker (make-marker)
+                               (treesit-node-start ts-node)))))
+    (cond
+     ((null ts-node) subtrees)
+     (subtrees
+      `((,name ,(cons name marker) ,@subtrees)))
+     (t
+      `((,name . ,marker))))))
+
+(defun json-ts-mode--imenu ()
+  "Return Imenu alist for the current buffer."
+  (let* ((node (treesit-buffer-root-node))
+         (tree (treesit-induce-sparse-tree
+                node "pair")))
+    (json-ts-mode--imenu-1 tree)))
+
+;;;###autoload
+(define-derived-mode json-ts-mode prog-mode "JSON"
+  "Major mode for editing JSON, powered by Tree Sitter."
+  :group 'json
+  :syntax-table json-ts-mode--syntax-table
+
+  (unless (treesit-ready-p nil 'json)
+    (error "Tree Sitter for JSON isn't available"))
+
+  (treesit-parser-create 'json)
+
+  ;; Comments.
+  (setq-local comment-start "// ")
+  (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
+  (setq-local comment-end "")
+
+  ;; Indent.
+  (setq-local treesit-simple-indent-rules json-ts--indent-rules)
+
+  ;; Navigation.
+  (setq-local treesit-defun-type-regexp
+              (rx (or "pair" "object")))
+
+  ;; Font-lock.
+  (setq-local treesit-font-lock-settings json-ts-mode--font-lock-settings)
+  (setq-local treesit-font-lock-feature-list
+              '((minimal) () ()))
+
+  ;; Imenu.
+  (setq-local imenu-create-index-function #'json-ts-mode--imenu)
+  (setq-local which-func-functions nil) ;; Piggyback on imenu
+
+  (treesit-major-mode-setup))
+
+(provide 'json-ts-mode)
+
+;;; json-ts-mode.el ends here

commit faf44e2c61734cfe2422498ed27b4f645635120d
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Nov 12 10:57:56 2022 +0200

    Fix recent changes in documentation
    
    * lisp/treesit.el (treesit-node-at): Doc fix.
    
    * doc/lispref/parsing.texi (Language Definitions): Add
    cross-reference.
    (Retrieving Nodes): Renamed from "Retrieving Node"; all references
    changed.
    (Retrieving Nodes): Fix wording and markup.

diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index e79c8cef18..b1bbe5e0a9 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -1366,7 +1366,7 @@ Top
 
 * Language Definitions::     Loading tree-sitter language definitions.
 * Using Parser::             Introduction to parsers.
-* Retrieving Node::          Retrieving node from syntax tree.
+* Retrieving Nodes::         Retrieving nodes from a syntax tree.
 * Accessing Node Information:: Accessing node information.
 * Pattern Matching::         Pattern matching with query patterns.
 * Multiple Languages::       Parse text written in multiple languages.
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index f690e6a604..2c838e317e 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -41,7 +41,7 @@ Parsing Program Source
 @menu
 * Language Definitions::     Loading tree-sitter language definitions.
 * Using Parser::             Introduction to parsers.
-* Retrieving Node::          Retrieving node from syntax tree.
+* Retrieving Nodes::         Retrieving nodes from a syntax tree.
 * Accessing Node Information:: Accessing node information.
 * Pattern Matching::         Pattern matching with query patterns.
 * Multiple Languages::       Parse text written in multiple languages.
@@ -337,7 +337,8 @@ Language Definitions
 @item token(@var{rule})
 marks @var{rule} to produce a single leaf node.  That is, instead of
 generating a parent node with individual child nodes under it,
-everything is combined into a single leaf node.
+everything is combined into a single leaf node.  @xref{Retrieving
+Nodes}.
 @item token.immediate(@var{rule})
 Normally, grammar rules ignore preceding whitespace; this
 changes @var{rule} to match only when there is no preceding
@@ -461,8 +462,8 @@ Using Parser
 the root node of the generated syntax tree.
 @end defun
 
-@node Retrieving Node
-@section Retrieving Node
+@node Retrieving Nodes
+@section Retrieving Nodes
 @cindex retrieve node, tree-sitter
 @cindex tree-sitter, find node
 @cindex get node, tree-sitter
@@ -487,28 +488,27 @@ Retrieving Node
 modified, and there is no way to update a node once it is retrieved.
 Using an outdated node signals the @code{treesit-node-outdated} error.
 
-@heading Retrieving node from syntax tree
+@heading Retrieving nodes from syntax tree
 @cindex retrieving tree-sitter nodes
 @cindex syntax tree, retrieving nodes
 
+@cindex leaf node, of tree-sitter parse tree
+@cindex tree-sitter parse tree, leaf node
 @defun treesit-node-at pos &optional parser-or-lang named
-This function returns a @emph{leaf} node at buffer position @var{pos}.
+This function returns a @dfn{leaf} node at buffer position @var{pos}.
 A leaf node is a node that doesn't have any child nodes.
 
 This function tries to return a node whose span covers @var{pos}: the
-node's beginning is less or equal to @var{pos}, and the node's end is
-greater or equal to @var{pos}.
+node's beginning position is less or equal to @var{pos}, and the
+node's end position is greater or equal to @var{pos}.
 
-But if no leaf node's span covers @var{pos} (e.g., @var{pos} is on the
+If no leaf node's span covers @var{pos} (e.g., @var{pos} is in the
 whitespace between two leaf nodes), this function returns the first
 leaf node after @var{pos}.
 
 Finally, if there is no leaf node after @var{pos}, return the first
 leaf node before @var{pos}.
 
-If @var{pos} is in between two adjacent nodes, this function returns
-the one after @var{pos}.
-
 When @var{parser-or-lang} is @code{nil} or omitted, this function uses
 the first parser in @code{(treesit-parser-list)} of the current
 buffer.  If @var{parser-or-lang} is a parser object, it uses that
@@ -517,10 +517,10 @@ Retrieving Node
 that.
 
 If this function cannot find a suitable node to return, it returns
-nil.
+@code{nil}.
 
-If @var{named} is non-@code{nil}, this function looks for a named node
-only (@pxref{tree-sitter named node, named node}).
+If @var{named} is non-@code{nil}, this function looks only for named
+nodes (@pxref{tree-sitter named node, named node}).
 
 Example:
 
@@ -570,7 +570,7 @@ Retrieving Node
 Given a node, a Lisp program can retrieve other nodes starting from
 it, or query for information about this node.
 
-@heading Retrieving node from other nodes
+@heading Retrieving nodes from other nodes
 @cindex syntax tree nodes, retrieving from other nodes
 
 @subheading By kinship
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 4d1a6bdf82..1070b66f70 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -173,8 +173,8 @@ treesit-node-at
 
 A leaf node is a node that doesn't have any child nodes.
 
-The returned node's span covers POS: the node's beginning is less
-or equal to POS, and the node's end is greater or equal to POS.
+The returned node's span covers POS: the node's beginning is before
+or at POS, and the node's end is at or after POS.
 
 If no leaf node's span covers POS (e.g., POS is on whitespace
 between two leaf nodes), return the first leaf node after POS.
@@ -182,9 +182,6 @@ treesit-node-at
 If there is no leaf node after POS, return the first leaf node
 before POS.
 
-If POS is in between two adjacent nodes, return the one after
-POS.
-
 Return nil if no leaf node can be returned.  If NAMED is non-nil,
 only look for named nodes.
 

commit e333f040e9f68bdce2b5735b4b9dd68944199056
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Nov 11 21:37:29 2022 -0800

    ; * lisp/treesit.el (treesit--indent-1): Fix treesit-node-at usage.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 796b85ef74..4d1a6bdf82 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1178,7 +1178,7 @@ treesit--indent-1
          (smallest-node
           (cond ((null (treesit-parser-list)) nil)
                 ((eq 1 (length (treesit-parser-list)))
-                 (treesit-node-at bol nil nil t))
+                 (treesit-node-at bol))
                 ((treesit-language-at (point))
                  (treesit-node-at bol (treesit-language-at (point))))
                 (t (treesit-node-at bol))))

commit 5cd3db73bed06e394ea8e7b0e332b1b1e5bd9571
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Nov 11 20:04:38 2022 -0800

    Improve treesit-node-at
    
    * doc/lispref/parsing.texi (Retrieving Node): Update manual.
    * lisp/treesit.el (treesit-node-at): Change semantic.  It tries to
    return the node that a user would expect in various circumstances.
    * test/src/treesit-tests.el (treesit-node-at): New test.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index bc2f0dda91..f690e6a604 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -492,9 +492,22 @@ Retrieving Node
 @cindex syntax tree, retrieving nodes
 
 @defun treesit-node-at pos &optional parser-or-lang named
-This function returns the @emph{smallest} node that starts at or after
-the buffer position @var{pos}.  In other words, the start of the node
-is greater or equal to @var{pos}.
+This function returns a @emph{leaf} node at buffer position @var{pos}.
+A leaf node is a node that doesn't have any child nodes.
+
+This function tries to return a node whose span covers @var{pos}: the
+node's beginning is less or equal to @var{pos}, and the node's end is
+greater or equal to @var{pos}.
+
+But if no leaf node's span covers @var{pos} (e.g., @var{pos} is on the
+whitespace between two leaf nodes), this function returns the first
+leaf node after @var{pos}.
+
+Finally, if there is no leaf node after @var{pos}, return the first
+leaf node before @var{pos}.
+
+If @var{pos} is in between two adjacent nodes, this function returns
+the one after @var{pos}.
 
 When @var{parser-or-lang} is @code{nil} or omitted, this function uses
 the first parser in @code{(treesit-parser-list)} of the current
@@ -503,15 +516,12 @@ Retrieving Node
 parser using that language in @code{(treesit-parser-list)}, and uses
 that.
 
+If this function cannot find a suitable node to return, it returns
+nil.
+
 If @var{named} is non-@code{nil}, this function looks for a named node
 only (@pxref{tree-sitter named node, named node}).
 
-When @var{pos} is after all the text in the buffer, technically there
-is no node after @var{pos}.  But for convenience, this function will
-return the last leaf node in the parse tree.  If @var{strict} is
-non-@code{nil}, this function will strictly comply to the semantics and
-return @var{nil}.
-
 Example:
 
 @example
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 1c61b1efeb..796b85ef74 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -168,44 +168,61 @@ treesit-node-language
   (treesit-parser-language
    (treesit-node-parser node)))
 
-(defun treesit-node-at (pos &optional parser-or-lang named strict)
-  "Return the smallest node that starts at or after buffer position POS.
+(defun treesit-node-at (pos &optional parser-or-lang named)
+  "Return the leaf node at position POS.
 
-\"Starts at or after POS\" means the start of the node is greater
-than or equal to POS.
+A leaf node is a node that doesn't have any child nodes.
 
-Return nil if none was found.  If NAMED is non-nil, only look for
-named node.
+The returned node's span covers POS: the node's beginning is less
+or equal to POS, and the node's end is greater or equal to POS.
+
+If no leaf node's span covers POS (e.g., POS is on whitespace
+between two leaf nodes), return the first leaf node after POS.
+
+If there is no leaf node after POS, return the first leaf node
+before POS.
+
+If POS is in between two adjacent nodes, return the one after
+POS.
+
+Return nil if no leaf node can be returned.  If NAMED is non-nil,
+only look for named nodes.
 
 If PARSER-OR-LANG is nil, use the first parser in
 `treesit-parser-list'; if PARSER-OR-LANG is a parser, use
 that parser; if PARSER-OR-LANG is a language, find a parser using
-that language in the current buffer, and use that.
-
-If POS is after all the text in the buffer, i.e., there is no
-node after POS, return the last leaf node in the parse tree, even
-though that node is before POS.  If STRICT is non-nil, return nil
-in this case."
+that language in the current buffer, and use that."
   (let* ((root (if (treesit-parser-p parser-or-lang)
                    (treesit-parser-root-node parser-or-lang)
                  (treesit-buffer-root-node parser-or-lang)))
          (node root)
+         (node-before root)
+         (pos-1 (max (1- pos) (point-min)))
          next)
     (when node
       ;; This is very fast so no need for C implementation.
       (while (setq next (treesit-node-first-child-for-pos
                          node pos named))
         (setq node next))
-      ;; If we are at the end of buffer or after all the text, we will
-      ;; end up with NODE = root node.  For convenience, return the last
-      ;; leaf node in the tree.
+      ;; If POS is at the end of buffer, after all the text, we will
+      ;; end up with NODE = root node.  Instead of returning nil,
+      ;; return the last leaf node in the tree for convenience.
       (if (treesit-node-eq node root)
-          (if strict
-              nil
+          (progn
             (while (setq next (treesit-node-child node -1 named))
               (setq node next))
             node)
-        node))))
+        ;; Normal case, where we found a node.
+        (if (<= (treesit-node-start node) pos)
+            node
+          ;; So the node we found is completely after POS, try to find
+          ;; a node whose end equals to POS.
+          (while (setq next (treesit-node-first-child-for-pos
+                             node-before pos-1 named))
+            (setq node-before next))
+          (if (eq (treesit-node-end node-before) pos)
+              node-before
+            node))))))
 
 (defun treesit-node-on (beg end &optional parser-or-lang named)
   "Return the smallest node covering BEG to END.
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index 5e4aea3ad4..7fc810492b 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -474,6 +474,37 @@ treesit-node-supplemental
     ;; `treesit-search-forward-goto'
     ))
 
+(ert-deftest treesit-node-at ()
+  "Test `treesit-node-at'."
+  (skip-unless (treesit-language-available-p 'json))
+  (let (parser root-node)
+    (progn
+      (insert "[1,  2, 3,4]  ")
+      (setq parser (treesit-parser-create 'json))
+      (setq root-node (treesit-parser-root-node
+                       parser)))
+    ;; Point at ",", should return ",".
+    (goto-char (point-min))
+    (search-forward "1")
+    (should (equal (treesit-node-text
+                    (treesit-node-at (point)))
+                   ","))
+    ;; Point behind ",", should still return the ",".
+    (search-forward ",")
+    (should (equal (treesit-node-text
+                    (treesit-node-at (point)))
+                   ","))
+    ;; Point between "," and "2", should return 2.
+    (forward-char)
+    (should (equal (treesit-node-text
+                    (treesit-node-at (point)))
+                   "2"))
+    ;; EOF, should return the last leaf node "]".
+    (goto-char (point-max))
+    (should (equal (treesit-node-text
+                    (treesit-node-at (point)))
+                   "]"))))
+
 (ert-deftest treesit-misc ()
   "Misc helper functions."
   (let ((settings '((t 0 t)

commit 4489450f37deafb013b1f0fc00c89f0973fda14a
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Nov 10 15:00:29 2022 -0800

    In end-of-defun, terminate early if no further defun exists
    
    Before this change, end-of-defun calls end-of-defun-function even if
    point is not necessarily at the beginning of a defun (contrary to what
    end-of-defun-function's docstring claims).  Now it terminates early
    and doesn't call end-of-defun-function.
    
    * lisp/emacs-lisp/lisp.el (beginning-of-defun-raw): Update docstring
    clarifying the return value.
    (end-of-defun): Terminate early if beginning-of-defun-raw returns nil.

diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index acae1a0b0a..c8d05a084b 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -375,7 +375,10 @@ beginning-of-defun-raw
 is non-nil.
 
 If variable `beginning-of-defun-function' is non-nil, its value
-is called as a function to find the defun's beginning."
+is called as a function to find the defun's beginning.
+
+Return non-nil if this function successfully found the beginning
+of a defun, nil if it failed to find one."
   (interactive "^p")   ; change this to "P", maybe, if we ever come to pass ARG
                       ; to beginning-of-defun-function.
   (unless arg (setq arg 1))
@@ -543,6 +546,7 @@ end-of-defun
         (push-mark))
     (if (or (null arg) (= arg 0)) (setq arg 1))
     (let ((pos (point))
+          (success nil)
           (beg (progn (when end-of-defun-moves-to-eol
                         (end-of-line 1))
                       (beginning-of-defun-raw 1) (point)))
@@ -567,9 +571,12 @@ end-of-defun
             (setq arg (1- arg))
           ;; We started from after the end of the previous function.
           (goto-char pos))
+        ;; At this point, point either didn't move (because we started
+        ;; in between two defun's), or is at the end of a defun
+        ;; (because we started in the middle of a defun).
         (unless (zerop arg)
-          (beginning-of-defun-raw (- arg))
-          (funcall end-of-defun-function)))
+          (when (setq success (beginning-of-defun-raw (- arg)))
+            (funcall end-of-defun-function))))
        ((< arg 0)
         ;; Moving backward.
         (if (< (point) pos)
@@ -579,16 +586,18 @@ end-of-defun
           ;; We started from inside a function.
           (goto-char beg))
         (unless (zerop arg)
-          (beginning-of-defun-raw (- arg))
-	  (setq beg (point))
-          (funcall end-of-defun-function))))
+          (when (setq success (beginning-of-defun-raw (- arg)))
+            (setq beg (point))
+            (funcall end-of-defun-function)))))
       (funcall skip)
-      (while (and (< arg 0) (>= (point) pos))
+      (while (and (< arg 0) (>= (point) pos) success)
         ;; We intended to move backward, but this ended up not doing so:
         ;; Try harder!
         (goto-char beg)
-        (beginning-of-defun-raw (- arg))
-        (if (>= (point) beg)
+        (setq success (beginning-of-defun-raw (- arg)))
+        ;; If we successfully moved pass point, or there is no further
+        ;; defun beginnings anymore, stop.
+        (if (or (>= (point) beg) (not success))
 	    (setq arg 0)
 	  (setq beg (point))
           (funcall end-of-defun-function)

commit 98ed6db34f76cfe37d70d8ad82d29fcfa2a56e24
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Nov 10 14:16:25 2022 -0800

    ; Fix docstring graph alignment in Ftreesit_search_forward
    
    * src/treesit.c (Ftreesit_search_forward): Replace tabs with spaces.

diff --git a/src/treesit.c b/src/treesit.c
index 63785b2122..854d7754f0 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2649,15 +2649,15 @@ DEFUN ("treesit-search-forward",
 For a tree like below, where START is marked by S, traverse as
 numbered from 1 to 12:
 
-		12
-		|
+                12
+                |
        S--------3----------11
        |        |          |
   o--o-+--o  1--+--2    6--+-----10
   |  |                  |        |
   o  o                +-+-+   +--+--+
-		      |   |   |  |  |
-		      4   5   7  8  9
+                      |   |   |  |  |
+                      4   5   7  8  9
 
 Note that this function doesn't traverse the subtree of START, and it
 always traverse leaf nodes first, then upwards.  */)

commit 2ec403f777adf39d3e972667513086f2053530dd
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Nov 10 10:34:57 2022 -0800

    Utilize new face font-lock-escape-face in python-mode
    
    * lisp/progmodes/python.el (python--treesit-settings): Use
    font-lock-escape-face rather than font-lock-constant-face.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 61f29dd005..a5d02d0fcb 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1118,7 +1118,7 @@ python--treesit-settings
    :feature 'escape-sequence
    :language 'python
    :override t
-   '((escape_sequence) @font-lock-constant-face))
+   '((escape_sequence) @font-lock-escape-face))
   "Tree-sitter font-lock settings.")
 
 

commit c5e3b99467dd07522f9522cc77cddbaa69222a7b
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Nov 10 10:00:28 2022 -0800

    Accept older versions of tree-sitter library
    
    * configure.ac: Accept a tree-sitter library as long as it provides
    ts_set_allocator.

diff --git a/configure.ac b/configure.ac
index caf3366cfd..20259186c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3216,15 +3216,34 @@ AC_DEFUN
 
 if test "${with_tree_sitter}" != "no"; then
    dnl Tree-sitter 0.20.2 added support to change the malloc it uses
-   dnl at runtime.
-   dnl
-   dnl Tree-sitter's Makefile has problems, until that's fixed,
-   dnl tree-sitter libraries will be versioned 0.6.3.  So for now
-   dnl require 0.0.
-  EMACS_CHECK_MODULES([TREE_SITTER], [tree-sitter >= 0.0],
+   dnl at runtime, we need that feature.  However, tree-sitter's
+   dnl Makefile has problems, until that's fixed, all tree-sitter
+   dnl libraries distributed are versioned 0.6.3.  We try to
+   dnl accept a tree-sitter library that has incorrect version as long
+   dnl as it supports changing malloc.
+  EMACS_CHECK_MODULES([TREE_SITTER], [tree-sitter >= 0.20.2],
     [HAVE_TREE_SITTER=yes], [HAVE_TREE_SITTER=no])
   if test "${HAVE_TREE_SITTER}" = yes; then
     AC_DEFINE(HAVE_TREE_SITTER, 1, [Define if using tree-sitter.])
+  else
+    EMACS_CHECK_MODULES([TREE_SITTER], [tree-sitter >= 0.6.3],
+      [HAVE_TREE_SITTER=yes], [HAVE_TREE_SITTER=no])
+    if test "${HAVE_TREE_SITTER}" = yes; then
+      OLD_CFLAGS=$CFLAGS
+      OLD_LIBS=$LIBS
+      CFLAGS="$CFLAGS $TREE_SITTER_CFLAGS"
+      LIBS="$TREE_SITTER_LIBS $LIBS"
+      AC_CHECK_FUNCS([ts_set_allocator])
+      CFLAGS=$OLD_CFLAGS
+      LIBS=$OLD_LIBS
+      if test "$ac_cv_func_ts_set_allocator" == yes; then
+        AC_DEFINE(HAVE_TREE_SITTER, 1, [Define if using tree-sitter.])
+      else
+        AC_MSG_ERROR([Tree-sitter library exists but its version is too old]);
+        TREE_SITTER_CFLAGS=
+        TREE_SITTER_LIBS=
+      fi
+    fi
   fi
 
   # Windows loads tree-sitter dynamically

commit ab4edbf60eca767775e18d8d0e318c28a74792b3
Author: Robert Pluim <rpluim@gmail.com>
Date:   Thu Nov 10 12:46:03 2022 +0100

    ; * lisp/font-lock.el (font-lock-bracket-face): Improve docstring

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index baeafecf16..bb89557863 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2128,7 +2128,7 @@ font-lock-punctuation-face
 
 (defface font-lock-bracket-face
   '((t :inherit font-lock-punctuation-face))
-  "Font Lock mode face used to highlight brackets."
+  "Font Lock mode face used to highlight brackets, braces, and parens."
   :group 'font-lock-faces
   :version "29.1")
 

commit a5a047a07f2d4f98fc67b40eb1f1a1d711905381
Author: Robert Pluim <rpluim@gmail.com>
Date:   Thu Nov 10 12:45:14 2022 +0100

    ; * lisp/treesit.el (treesit-font-lock-rules): Improve docstring

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 4e3a691e69..1c61b1efeb 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -587,8 +587,8 @@ treesit-font-lock-rules
      \"(script_element) @font-lock-builtin-face\")
 
 For each QUERY, a :language keyword and a :feature keyword is
-required.  Each query's :feature is a symbol summarizing what does
-the query fontify.  It is used to allow users to enable/disable
+required.  Each query's :feature is a symbol summarizing what the
+query fontifies.  It is used to allow users to enable/disable
 certain features.  See `treesit-font-lock-kind-list' for more.
 Other keywords include:
 

commit f5084ed197cfea8387ffa7dd72b72933905fe699
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Thu Nov 10 13:04:42 2022 +0200

    ; * etc/NEWS: Fix last change.

diff --git a/etc/NEWS b/etc/NEWS
index 74f1948569..9ed78bc6b3 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -734,11 +734,11 @@ filter/sentinel error has been handled.
 
 +++
 ** New faces for font-lock.
-These faces are primarily meant for use with tree-sitter. They are:
+These faces are primarily meant for use with tree-sitter.  They are:
 'font-lock-bracket-face', 'font-lock-delimiter-face',
 'font-lock-escape-face', 'font-lock-number-face',
 'font-lock-misc-punctuation-face', 'font-lock-operator-face',
-'font-lock-property-face', 'font-lock-punctuation-face'.
+'font-lock-property-face', and 'font-lock-punctuation-face'.
 
 +++
 ** New face 'variable-pitch-text'.

commit e06953b02a0e7b26b33c511a22896d0db4e5d63d
Author: Randy Taylor <dev@rjt.dev>
Date:   Fri Oct 28 22:39:50 2022 -0400

    Add more font-lock faces (Bug#58940)
    
    * lisp/font-lock.el (font-lock-bracket-face, font-lock-delimiter-face,
    font-lock-escape-face, font-lock-number-face,
    font-lock-misc-punctuation-face, font-lock-operator-face,
    font-lock-property-face, font-lock-punctuation-face): Define new
    faces.
    * lisp/cus-theme.el (custom-theme--listed-faces): Add them to the
    list.
    * doc/lispref/modes.texi (Faces for Font Lock): Document them.
    * etc/NEWS: Mention them.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 973d183a72..f61848c948 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3653,6 +3653,71 @@ Faces for Font Lock
 @item font-lock-negation-char-face
 @vindex font-lock-negation-char-face
 for easily-overlooked negation characters.
+
+@item font-lock-escape-face
+@vindex font-lock-escape-face
+for escape sequences in strings.
+This face inherits, by default, from @code{font-lock-regexp-grouping-backslash}.
+
+Here is an example in Python, where the escape sequence @code{\n} is used:
+
+@smallexample
+@group
+print('Hello world!\n')
+@end group
+@end smallexample
+
+@item font-lock-number-face
+@vindex font-lock-number-face
+for numbers.
+
+@item font-lock-operator-face
+@vindex font-lock-operator-face
+for operators.
+
+@item font-lock-property-face
+@vindex font-lock-property-face
+for properties of an object, such as the declaration and use of fields
+in a struct.
+This face inherits, by default, from @code{font-lock-variable-name-face}.
+
+For example,
+
+@smallexample
+@group
+typedef struct
+@{
+  int prop;
+//    ^ property
+@} obj;
+
+int main()
+@{
+  obj o;
+  o.prop = 3;
+//  ^ property
+@}
+@end group
+@end smallexample
+
+@item font-lock-punctuation-face
+@vindex font-lock-punctuation-face
+for punctuation such as brackets and delimiters.
+
+@item font-lock-bracket-face
+@vindex font-lock-bracket-face
+for brackets (e.g., @code{()}, @code{[]}, @code{@{@}}).
+This face inherits, by default, from @code{font-lock-punctuation-face}.
+
+@item font-lock-delimiter-face
+@vindex font-lock-delimiter-face
+for delimiters (e.g., @code{;}, @code{:}, @code{,}).
+This face inherits, by default, from @code{font-lock-punctuation-face}.
+
+@item font-lock-misc-punctuation-face
+@vindex font-lock-misc-punctuation-face
+for punctuation that is not a bracket or delimiter.
+This face inherits, by default, from @code{font-lock-punctuation-face}.
 @end table
 
 @node Syntactic Font Lock
diff --git a/etc/NEWS b/etc/NEWS
index c5a142b500..74f1948569 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -732,6 +732,14 @@ If the current buffer is visiting a file that is executable, the
 This determines how long to pause Emacs after a process
 filter/sentinel error has been handled.
 
++++
+** New faces for font-lock.
+These faces are primarily meant for use with tree-sitter. They are:
+'font-lock-bracket-face', 'font-lock-delimiter-face',
+'font-lock-escape-face', 'font-lock-number-face',
+'font-lock-misc-punctuation-face', 'font-lock-operator-face',
+'font-lock-property-face', 'font-lock-punctuation-face'.
+
 +++
 ** New face 'variable-pitch-text'.
 This face is like 'variable-pitch' (from which it inherits), but is
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index 90680ff68f..1df2ab8db7 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -66,13 +66,17 @@ custom-theme--listed-faces
   variable-pitch escape-glyph homoglyph
   minibuffer-prompt highlight region
   shadow secondary-selection trailing-whitespace
-  font-lock-builtin-face font-lock-comment-delimiter-face
-  font-lock-comment-face font-lock-constant-face
-  font-lock-doc-face font-lock-doc-markup-face font-lock-function-name-face
+  font-lock-bracket-face font-lock-builtin-face
+  font-lock-comment-delimiter-face font-lock-comment-face
+  font-lock-constant-face font-lock-delimiter-face
+  font-lock-doc-face font-lock-doc-markup-face
+  font-lock-escape-face font-lock-function-name-face
   font-lock-keyword-face font-lock-negation-char-face
-  font-lock-preprocessor-face font-lock-regexp-grouping-backslash
-  font-lock-regexp-grouping-construct font-lock-string-face
-  font-lock-type-face font-lock-variable-name-face
+  font-lock-number-face font-lock-misc-punctuation-face
+  font-lock-operator-face font-lock-preprocessor-face
+  font-lock-property-face font-lock-punctuation-face
+  font-lock-regexp-grouping-backslash font-lock-regexp-grouping-construct
+  font-lock-string-face font-lock-type-face font-lock-variable-name-face
   font-lock-warning-face button link link-visited fringe
   header-line tooltip mode-line mode-line-buffer-id
   mode-line-emphasis mode-line-highlight mode-line-inactive
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index e88dc1d3b7..baeafecf16 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2095,6 +2095,55 @@ font-lock-regexp-grouping-construct
   "Font Lock mode face used to highlight grouping constructs in Lisp regexps."
   :group 'font-lock-faces)
 
+(defface font-lock-escape-face
+  '((t :inherit font-lock-regexp-grouping-backslash))
+  "Font Lock mode face used to highlight escape sequences in strings."
+  :group 'font-lock-faces
+  :version "29.1")
+
+(defface font-lock-number-face
+  '((t nil))
+  "Font Lock mode face used to highlight numbers."
+  :group 'font-lock-faces
+  :version "29.1")
+
+(defface font-lock-operator-face
+  '((t nil))
+  "Font Lock mode face used to highlight operators."
+  :group 'font-lock-faces
+  :version "29.1")
+
+(defface font-lock-property-face
+  '((t :inherit font-lock-variable-name-face))
+  "Font Lock mode face used to highlight properties of an object.
+For example, the declaration and use of fields in a struct."
+  :group 'font-lock-faces
+  :version "29.1")
+
+(defface font-lock-punctuation-face
+  '((t nil))
+  "Font Lock mode face used to highlight punctuation."
+  :group 'font-lock-faces
+  :version "29.1")
+
+(defface font-lock-bracket-face
+  '((t :inherit font-lock-punctuation-face))
+  "Font Lock mode face used to highlight brackets."
+  :group 'font-lock-faces
+  :version "29.1")
+
+(defface font-lock-delimiter-face
+  '((t :inherit font-lock-punctuation-face))
+  "Font Lock mode face used to highlight delimiters."
+  :group 'font-lock-faces
+  :version "29.1")
+
+(defface font-lock-misc-punctuation-face
+  '((t :inherit font-lock-punctuation-face))
+  "Font Lock mode face used to highlight miscellaneous punctuation."
+  :group 'font-lock-faces
+  :version "29.1")
+
 ;; End of Color etc. support.
 
 ;;; Menu support.

commit 77cb95c851edc338c94cb35effdc8c9ffc64a461
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Nov 10 00:31:10 2022 -0800

    ; Revert back to requiring tree-sitter v0.0 for now

diff --git a/configure.ac b/configure.ac
index c5f2be6439..caf3366cfd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3217,7 +3217,11 @@ AC_DEFUN
 if test "${with_tree_sitter}" != "no"; then
    dnl Tree-sitter 0.20.2 added support to change the malloc it uses
    dnl at runtime.
-  EMACS_CHECK_MODULES([TREE_SITTER], [tree-sitter >= 0.20.2],
+   dnl
+   dnl Tree-sitter's Makefile has problems, until that's fixed,
+   dnl tree-sitter libraries will be versioned 0.6.3.  So for now
+   dnl require 0.0.
+  EMACS_CHECK_MODULES([TREE_SITTER], [tree-sitter >= 0.0],
     [HAVE_TREE_SITTER=yes], [HAVE_TREE_SITTER=no])
   if test "${HAVE_TREE_SITTER}" = yes; then
     AC_DEFINE(HAVE_TREE_SITTER, 1, [Define if using tree-sitter.])

commit eecc2d45b94513ba95789dfe0ef58aeb8b029049
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Nov 9 14:50:39 2022 -0800

    ; Update tree-sitter HTML manuals in admin/notes
    
    * admin/notes/tree-sitter/html-manual/Language-Definitions.html
    * admin/notes/tree-sitter/html-manual/Multiple-Languages.html
    * admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html
    * admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html
    * admin/notes/tree-sitter/html-manual/Retrieving-Node.html: Update.

diff --git a/admin/notes/tree-sitter/html-manual/Language-Definitions.html b/admin/notes/tree-sitter/html-manual/Language-Definitions.html
index 6df676b168..4fd7eb5687 100644
--- a/admin/notes/tree-sitter/html-manual/Language-Definitions.html
+++ b/admin/notes/tree-sitter/html-manual/Language-Definitions.html
@@ -236,18 +236,20 @@
 at point.  The mode-line will display
 </p>
 <div class="example">
-<pre class="example"><var>parent</var> <var>field</var>: (<var>child</var> (<var>grandchild</var> (&hellip;)))
+<pre class="example"><var>parent</var> <var>field</var>: (<var>node</var> (<var>child</var> (&hellip;)))
 </pre></div>
 
-<p><var>child</var>, <var>grand</var>, <var>grand-grandchild</var>, etc., are nodes that
-begin at point.  <var>parent</var> is the parent node of <var>child</var>.
+<p>where <var>node</var>, <var>child</var>, etc, are nodes which begin at point.
+<var>parent</var> is the parent of <var>node</var>.  <var>node</var> is displayed in
+bold typeface.  <var>field-name</var>s are field names of <var>node</var> and
+<var>child</var>, etc.
 </p>
-<p>If there is no node that starts at point, i.e., point is in the middle
-of a node, then the mode-line only displays the smallest node that
-spans the position of point, and its immediate parent.
+<p>If no node starts at point, i.e., point is in the middle of a node,
+then the mode line displays the earliest node that spans point, and
+its immediate parent.
 </p>
-<p>This minor mode doesn&rsquo;t create parsers on its own.  It simply uses the
-first parser in <code>(treesit-parser-list)</code> (see <a href="Using-Parser.html">Using Tree-sitter Parser</a>).
+<p>This minor mode doesn&rsquo;t create parsers on its own.  It uses the first
+parser in <code>(treesit-parser-list)</code> (see <a href="Using-Parser.html">Using Tree-sitter Parser</a>).
 </p></dd></dl>
 
 <span id="Reading-the-grammar-definition"></span><h3 class="heading">Reading the grammar definition</h3>
diff --git a/admin/notes/tree-sitter/html-manual/Multiple-Languages.html b/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
index eac142921f..6d1800fad7 100644
--- a/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
+++ b/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
@@ -67,7 +67,6 @@
 </div>
 <hr>
 <span id="Parsing-Text-in-Multiple-Languages"></span><h3 class="section">37.6 Parsing Text in Multiple Languages</h3>
-
 <span id="index-multiple-languages_002c-parsing-with-tree_002dsitter"></span>
 <span id="index-parsing-multiple-languages-with-tree_002dsitter"></span>
 <p>Sometimes, the source of a programming language could contain snippets
@@ -76,8 +75,22 @@
 need to be assigned different parsers.  Traditionally, this is
 achieved by using narrowing.  While tree-sitter works with narrowing
 (see <a href="Using-Parser.html#tree_002dsitter-narrowing">narrowing</a>), the recommended way is
-instead to set regions of buffer text in which a parser will operate.
+instead to set regions of buffer text (i.e., ranges) in which a parser
+will operate.  This section describes functions for setting and
+getting ranges for a parser.
+</p>
+<p>Lisp programs should call <code>treesit-update-ranges</code> to make sure
+the ranges for each parser are correct before using parsers in a
+buffer, and call <code>treesit-language-at</code> to figure out the language
+responsible for the text at some position.  These two functions don&rsquo;t
+work by themselves, they need major modes to set
+<code>treesit-range-settings</code> and
+<code>treesit-language-at-point-function</code>, which do the actual work.
+These functions and variables are explained in more detail towards the
+end of the section.
 </p>
+<span id="Getting-and-setting-ranges"></span><h3 class="heading">Getting and setting ranges</h3>
+
 <dl class="def">
 <dt id="index-treesit_002dparser_002dset_002dincluded_002dranges"><span class="category">Function: </span><span><strong>treesit-parser-set-included-ranges</strong> <em>parser ranges</em><a href='#index-treesit_002dparser_002dset_002dincluded_002dranges' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This function sets up <var>parser</var> to operate on <var>ranges</var>.  The
@@ -126,24 +139,6 @@
 </pre></div>
 </dd></dl>
 
-<dl class="def">
-<dt id="index-treesit_002dset_002dranges"><span class="category">Function: </span><span><strong>treesit-set-ranges</strong> <em>parser-or-lang ranges</em><a href='#index-treesit_002dset_002dranges' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>Like <code>treesit-parser-set-included-ranges</code>, this function sets
-the ranges of <var>parser-or-lang</var> to <var>ranges</var>.  Conveniently,
-<var>parser-or-lang</var> could be either a parser or a language.  If it is
-a language, this function looks for the first parser in
-<code>(treesit-parser-list)</code> for that language in the current buffer,
-and sets the ranges for it.
-</p></dd></dl>
-
-<dl class="def">
-<dt id="index-treesit_002dget_002dranges"><span class="category">Function: </span><span><strong>treesit-get-ranges</strong> <em>parser-or-lang</em><a href='#index-treesit_002dget_002dranges' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function returns the ranges of <var>parser-or-lang</var>, like
-<code>treesit-parser-included-ranges</code>.  And like
-<code>treesit-set-ranges</code>, <var>parser-or-lang</var> can be a parser or
-a language symbol.
-</p></dd></dl>
-
 <dl class="def">
 <dt id="index-treesit_002dquery_002drange"><span class="category">Function: </span><span><strong>treesit-query-range</strong> <em>source query &amp;optional beg end</em><a href='#index-treesit_002dquery_002drange' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This function matches <var>source</var> with <var>query</var> and returns the
@@ -166,57 +161,56 @@
 <code>treesit-query-error</code> error if <var>query</var> is malformed.
 </p></dd></dl>
 
-<dl class="def">
-<dt id="index-treesit_002drange_002dfunctions"><span class="category">Variable: </span><span><strong>treesit-range-functions</strong><a href='#index-treesit_002drange_002dfunctions' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This variable holds the list of range functions.  Font-locking and
-indenting code use functions in this list to set correct ranges for
-a language parser before using it.
-</p>
-<p>The signature of each function in the list should be:
-</p>
-<div class="example">
-<pre class="example">(<var>start</var> <var>end</var> &amp;rest <var>_</var>)
-</pre></div>
+<span id="Supporting-multiple-languages-in-Lisp-programs"></span><h3 class="heading">Supporting multiple languages in Lisp programs</h3>
 
-<p>where <var>start</var> and <var>end</var> specify the region that is about to be
-used.  A range function only needs to (but is not limited to) update
-ranges in that region.
+<p>It should suffice for general Lisp programs to call the following two
+functions in order to support program sources that mixes multiple
+languages.
 </p>
-<p>The functions in the list are called in order.
-</p></dd></dl>
-
 <dl class="def">
-<dt id="index-treesit_002dupdate_002dranges"><span class="category">Function: </span><span><strong>treesit-update-ranges</strong> <em>&amp;optional start end</em><a href='#index-treesit_002dupdate_002dranges' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function is used by font-lock and indentation to update ranges
-before using any parser.  Each range function in
-<var>treesit-range-functions</var> is called in-order.  Arguments
-<var>start</var> and <var>end</var> are passed to each range function.
+<dt id="index-treesit_002dupdate_002dranges"><span class="category">Function: </span><span><strong>treesit-update-ranges</strong> <em>&amp;optional beg end</em><a href='#index-treesit_002dupdate_002dranges' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function updates ranges for parsers in the buffer.  It makes sure
+the parsers&rsquo; ranges are set correctly between <var>beg</var> and <var>end</var>,
+according to <code>treesit-range-settings</code>.  If omitted, <var>beg</var>
+defaults to the beginning of the buffer, and <var>end</var> defaults to the
+end of the buffer.
+</p>
+<p>For example, fontification functions use this function before querying
+for nodes in a region.
 </p></dd></dl>
 
-<span id="index-treesit_002dlanguage_002dat_002dpoint_002dfunction"></span>
 <dl class="def">
 <dt id="index-treesit_002dlanguage_002dat"><span class="category">Function: </span><span><strong>treesit-language-at</strong> <em>pos</em><a href='#index-treesit_002dlanguage_002dat' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function tries to figure out which language is responsible for
-the text at buffer position <var>pos</var>.  Under the hood it just calls
-<code>treesit-language-at-point-function</code>.
-</p>
-<p>Various Lisp programs use this function.  For example, the indentation
-program uses this function to determine which language&rsquo;s rule to use
-in a multi-language buffer.  So it is important to provide
-<code>treesit-language-at-point-function</code> for a multi-language major
-mode.
+<dd><p>This function returns the language of the text at buffer position
+<var>pos</var>.  Under the hood it calls
+<code>treesit-language-at-point-function</code> and returns its return
+value.  If <code>treesit-language-at-point-function</code> is <code>nil</code>,
+this function returns the language of the first parser in the returned
+value of <code>treesit-parser-list</code>.  If there is no parser in the
+buffer, it returns <code>nil</code>.
 </p></dd></dl>
 
-<span id="An-example"></span><h3 class="heading">An example</h3>
+<span id="Supporting-multiple-languages-in-major-modes"></span><h3 class="heading">Supporting multiple languages in major modes</h3>
 
+<span id="index-host-language_002c-tree_002dsitter"></span>
+<span id="index-tree_002dsitter-host-and-embedded-languages"></span>
+<span id="index-embedded-language_002c-tree_002dsitter"></span>
 <p>Normally, in a set of languages that can be mixed together, there is a
-major language and several embedded languages.  A Lisp program usually
-first parses the whole document with the major language&rsquo;s parser, sets
-ranges for the embedded languages, and then parses the embedded
+<em>host language</em> and one or more <em>embedded languages</em>.  A Lisp
+program usually first parses the whole document with the host
+language&rsquo;s parser, retrieves some information, sets ranges for the
+embedded languages with that information, and then parses the embedded
 languages.
 </p>
-<p>Suppose we need to parse a very simple document that mixes
-<acronym>HTML</acronym>, <acronym>CSS</acronym> and JavaScript:
+<p>Take a buffer containing <acronym>HTML</acronym>, <acronym>CSS</acronym> and JavaScript
+as an example.  A Lisp program will first parse the whole buffer with
+an <acronym>HTML</acronym> parser, then query the parser for
+<code>style_element</code> and <code>script_element</code> nodes, which
+correspond to <acronym>CSS</acronym> and JavaScript text, respectively.  Then
+it sets the range of the <acronym>CSS</acronym> and JavaScript parser to the
+ranges in which their corresponding nodes span.
+</p>
+<p>Given a simple <acronym>HTML</acronym> document:
 </p>
 <div class="example">
 <pre class="example">&lt;html&gt;
@@ -225,8 +219,8 @@
 &lt;/html&gt;
 </pre></div>
 
-<p>We first parse with <acronym>HTML</acronym>, then set ranges for <acronym>CSS</acronym>
-and JavaScript:
+<p>a Lisp program will first parse with a <acronym>HTML</acronym> parser, then set
+ranges for <acronym>CSS</acronym> and JavaScript parsers:
 </p>
 <div class="example">
 <pre class="example">;; Create parsers.
@@ -251,10 +245,76 @@
 (treesit-parser-set-included-ranges js js-range)
 </pre></div>
 
-<p>We use a query pattern <code><span class="nolinebreak">(style_element</span>&nbsp;<span class="nolinebreak">(raw_text)</span>&nbsp;@capture)</code><!-- /@w -->
-to find <acronym>CSS</acronym> nodes in the <acronym>HTML</acronym> parse tree.  For how
-to write query patterns, see <a href="Pattern-Matching.html">Pattern Matching Tree-sitter Nodes</a>.
+<p>Emacs automates this process in <code>treesit-update-ranges</code>.  A
+multi-language major mode should set <code>treesit-range-settings</code> so
+that <code>treesit-update-ranges</code> knows how to perform this process
+automatically.  Major modes should use the helper function
+<code>treesit-range-rules</code> to generate a value that can be assigned to
+<code>treesit-range-settings</code>.  The settings in the following example
+directly translate into operations shown above.
 </p>
+<div class="example">
+<pre class="example">(setq-local treesit-range-settings
+            (treesit-range-rules
+             :embed 'javascript
+             :host 'html
+             '((script_element (raw_text) @capture))
+</pre><pre class="example">
+
+</pre><pre class="example">             :embed 'css
+             :host 'html
+             '((style_element (raw_text) @capture))))
+</pre></div>
+
+<dl class="def">
+<dt id="index-treesit_002drange_002drules"><span class="category">Function: </span><span><strong>treesit-range-rules</strong> <em>&amp;rest query-specs</em><a href='#index-treesit_002drange_002drules' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function is used to set <var>treesit-range-settings</var>.  It
+takes care of compiling queries and other post-processing, and outputs
+a value that <var>treesit-range-settings</var> can have.
+</p>
+<p>It takes a series of <var>query-spec</var>s, where each <var>query-spec</var> is
+a <var>query</var> preceded by zero or more pairs of <var>keyword</var> and
+<var>value</var>.  Each <var>query</var> is a tree-sitter query in either the
+string, s-expression or compiled form, or a function.
+</p>
+<p>If <var>query</var> is a tree-sitter query, it should be preceeded by two
+<var>:keyword</var> <var>value</var> pairs, where the <code>:embed</code> keyword
+specifies the embedded language, and the <code>:host</code> keyword
+specified the host language.
+</p>
+<p><code>treesit-update-ranges</code> uses <var>query</var> to figure out how to set
+the ranges for parsers for the embedded language.  It queries
+<var>query</var> in a host language parser, computes the ranges in which
+the captured nodes span, and applies these ranges to embedded
+language parsers.
+</p>
+<p>If <var>query</var> is a function, it doesn&rsquo;t need any <var>:keyword</var> and
+<var>value</var> pair.  It should be a function that takes 2 arguments,
+<var>start</var> and <var>end</var>, and sets the ranges for parsers in the
+current buffer in the region between <var>start</var> and <var>end</var>.  It is
+fine for this function to set ranges in a larger region that
+encompasses the region between <var>start</var> and <var>end</var>.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002drange_002dsettings"><span class="category">Variable: </span><span><strong>treesit-range-settings</strong><a href='#index-treesit_002drange_002dsettings' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This variable helps <code>treesit-update-ranges</code> in updating the
+ranges for parsers in the buffer.  It is a list of <var>setting</var>s
+where the exact format of a <var>setting</var> is considered internal.  You
+should use <code>treesit-range-rules</code> to generate a value that this
+variable can have.
+</p>
+</dd></dl>
+
+
+<dl class="def">
+<dt id="index-treesit_002dlanguage_002dat_002dpoint_002dfunction"><span class="category">Variable: </span><span><strong>treesit-language-at-point-function</strong><a href='#index-treesit_002dlanguage_002dat_002dpoint_002dfunction' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This variable&rsquo;s value should be a function that takes a single
+argument, <var>pos</var>, which is a buffer position, and returns the
+language of the buffer text at <var>pos</var>.  This variable is used by
+<code>treesit-language-at</code>.
+</p></dd></dl>
+
 </div>
 <hr>
 <div class="header">
diff --git a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html
index 4f2933c985..72d82e6ee6 100644
--- a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html
+++ b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html
@@ -111,7 +111,7 @@
 <code>treesit-major-mode-setup</code>.
 </p>
 <dl class="def">
-<dt id="index-treesit_002dfont_002dlock_002drules"><span class="category">Function: </span><span><strong>treesit-font-lock-rules</strong> <em>:keyword value query...</em><a href='#index-treesit_002dfont_002dlock_002drules' class='copiable-anchor'> &para;</a></span></dt>
+<dt id="index-treesit_002dfont_002dlock_002drules"><span class="category">Function: </span><span><strong>treesit-font-lock-rules</strong> <em>&amp;rest query-specs</em><a href='#index-treesit_002dfont_002dlock_002drules' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This function is used to set <var>treesit-font-lock-settings</var>.  It
 takes care of compiling queries and other post-processing, and outputs
 a value that <var>treesit-font-lock-settings</var> accepts.  Here&rsquo;s an
@@ -129,13 +129,18 @@
  &quot;(script_element) @font-lock-builtin-face&quot;)
 </pre></div>
 
-<p>This function takes a list of text or s-exp queries.  Before each
-query, there are <var>:keyword</var>-<var>value</var> pairs that configure
-that query.  The <code>:lang</code> keyword sets the query&rsquo;s language and
-every query must specify the language.  The <code>:feature</code> keyword
-sets the feature name of the query.  Users can control which features
-are enabled with <code>font-lock-maximum-decoration</code> and
-<code>treesit-font-lock-feature-list</code> (see below).
+<p>This function takes a series of <var>query-spec</var>s, where each
+<var>query-spec</var> is a <var>query</var> preceded by multiple pairs of
+<var>:keyword</var> and <var>value</var>.  Each <var>query</var> is a tree-sitter
+query in either the string, s-expression or compiled form.
+</p>
+<p>For each <var>query</var>, the <var>:keyword</var> and <var>value</var> pairs add
+meta information to it.  The <code>:lang</code> keyword declares
+<var>query</var>&rsquo;s language.  The <code>:feature</code> keyword sets the feature
+name of <var>query</var>.  Users can control which features are enabled
+with <code>font-lock-maximum-decoration</code> and
+<code>treesit-font-lock-feature-list</code> (described below).  These two
+keywords are mandated.
 </p>
 <p>Other keywords are optional:
 </p>
@@ -148,7 +153,7 @@
 <tr><td width="15%"></td><td width="15%"><code>keep</code></td><td width="60%">Fill-in regions without an existing face</td></tr>
 </table>
 
-<p>Lisp programs mark patterns in the query with capture names (names
+<p>Lisp programs mark patterns in <var>query</var> with capture names (names
 that starts with <code>@</code>), and tree-sitter will return matched nodes
 tagged with those same capture names.  For the purpose of
 fontification, capture names in <var>query</var> should be face names like
@@ -230,9 +235,10 @@
 <dl class="def">
 <dt id="index-treesit_002dfont_002dlock_002dsettings"><span class="category">Variable: </span><span><strong>treesit-font-lock-settings</strong><a href='#index-treesit_002dfont_002dlock_002dsettings' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>A list of settings for tree-sitter based font lock.  The exact format
-of this variable is considered internal.  One should always use
+of each setting is considered internal.  One should always use
 <code>treesit-font-lock-rules</code> to set this variable.
-</p></dd></dl>
+</p>
+</dd></dl>
 
 <p>Multi-language major modes should provide range functions in
 <code>treesit-range-functions</code>, and Emacs will set the ranges
diff --git a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html
index 2fdb50df7c..5ea1f9bc33 100644
--- a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html
+++ b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html
@@ -106,7 +106,8 @@
 rule is applicable.  Then Emacs passes the node to <var>anchor</var>, which
 returns a buffer position.  Emacs takes the column number of that
 position, adds <var>offset</var> to it, and the result is the indentation
-column for the current line.
+column for the current line.  <var>offset</var> can be an integer or a
+variable whose value is an integer.
 </p>
 <p>The <var>matcher</var> and <var>anchor</var> are functions, and Emacs provides
 convenient defaults for them.
@@ -117,8 +118,8 @@
 position of the first non-whitespace character after the beginning of
 the line.  The argument <var>node</var> is the largest (highest-in-tree)
 node that starts at that position; and <var>parent</var> is the parent of
-<var>node</var>.  However, when that position is on a whitespace or inside
-a multi-line string, no node that starts at that position, so
+<var>node</var>.  However, when that position is in a whitespace or inside
+a multi-line string, no node can start at that position, so
 <var>node</var> is <code>nil</code>.  In that case, <var>parent</var> would be the
 smallest node that spans that position.
 </p>
@@ -215,6 +216,12 @@
 <dd><p>This anchor is a function that is called with 3 arguments: <var>node</var>,
 <var>parent</var>, and <var>bol</var>, and returns the first non-whitespace
 charater on the previous line.
+</p>
+</dd>
+<dt id='index-point_002dmin'><span><code>point-min</code><a href='#index-point_002dmin' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This anchor is a function is called with 3 arguments: <var>node</var>,
+<var>parent</var>, and <var>bol</var>, and returns the beginning of the buffer.
+This is useful as the beginning of the buffer is always at column 0.
 </p></dd>
 </dl>
 
diff --git a/admin/notes/tree-sitter/html-manual/Retrieving-Node.html b/admin/notes/tree-sitter/html-manual/Retrieving-Node.html
index e1de200707..0c086dab91 100644
--- a/admin/notes/tree-sitter/html-manual/Retrieving-Node.html
+++ b/admin/notes/tree-sitter/html-manual/Retrieving-Node.html
@@ -262,10 +262,9 @@
 <dd><p>This function traverses the subtree of <var>node</var> (including
 <var>node</var> itself), looking for a node for which <var>predicate</var>
 returns non-<code>nil</code>.  <var>predicate</var> is a regexp that is matched
-(case-insensitively) against each node&rsquo;s type, or a predicate function
-that takes a node and returns non-<code>nil</code> if the node matches.  The
-function returns the first node that matches, or <code>nil</code> if none
-does.
+against each node&rsquo;s type, or a predicate function that takes a node
+and returns non-<code>nil</code> if the node matches.  The function returns
+the first node that matches, or <code>nil</code> if none does.
 </p>
 <p>By default, this function only traverses named nodes, but if <var>all</var>
 is non-<code>nil</code>, it traverses all the nodes.  If <var>backward</var> is
@@ -279,9 +278,9 @@
 <dt id="index-treesit_002dsearch_002dforward"><span class="category">Function: </span><span><strong>treesit-search-forward</strong> <em>start predicate &amp;optional backward all</em><a href='#index-treesit_002dsearch_002dforward' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>Like <code>treesit-search-subtree</code>, this function also traverses the
 parse tree and matches each node with <var>predicate</var> (except for
-<var>start</var>), where <var>predicate</var> can be a (case-insensitive) regexp
-or a function.  For a tree like the below where <var>start</var> is marked
-S, this function traverses as numbered from 1 to 12:
+<var>start</var>), where <var>predicate</var> can be a regexp or a function.
+For a tree like the below where <var>start</var> is marked S, this function
+traverses as numbered from 1 to 12:
 </p>
 <div class="example">
 <pre class="example">              12
@@ -336,8 +335,8 @@
 <p>It takes the subtree under <var>root</var>, and combs it so only the nodes
 that match <var>predicate</var> are left.  Like previous functions, the
 <var>predicate</var> can be a regexp string that matches against each
-node&rsquo;s type case-insensitively, or a function that takes a node and
-return non-<code>nil</code> if it matches.
+node&rsquo;s type, or a function that takes a node and return non-<code>nil</code>
+if it matches.
 </p>
 <p>For example, for a subtree on the left that consist of both numbers
 and letters, if <var>predicate</var> is &ldquo;letter only&rdquo;, the returned tree

commit 663d768d44be150439a58cd858615cac3c1f572f
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Nov 9 14:48:07 2022 -0800

    * configure.ac: Change required tree-sitter version to 0.20.2.

diff --git a/configure.ac b/configure.ac
index 390838acfe..c5f2be6439 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3215,11 +3215,9 @@ AC_DEFUN
 TREE_SITTER_OBJ=
 
 if test "${with_tree_sitter}" != "no"; then
-   dnl TODO: we should use tree-sitter >= 0.20.2, but right now all
-   dnl tree-sitter libraries distributed are versioned at 0.0, so for
-   dnl the easy of development we'll just leave the version
-   dnl requirement at 0.0 for now.
-  EMACS_CHECK_MODULES([TREE_SITTER], [tree-sitter >= 0.0],
+   dnl Tree-sitter 0.20.2 added support to change the malloc it uses
+   dnl at runtime.
+  EMACS_CHECK_MODULES([TREE_SITTER], [tree-sitter >= 0.20.2],
     [HAVE_TREE_SITTER=yes], [HAVE_TREE_SITTER=no])
   if test "${HAVE_TREE_SITTER}" = yes; then
     AC_DEFINE(HAVE_TREE_SITTER, 1, [Define if using tree-sitter.])

commit 838fc77254286de318b65602b31c6d3915594a8e
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Nov 9 12:29:50 2022 -0800

    Make tree-sitter node type match case-sensitive
    
    * doc/lispref/parsing.texi (Retrieving Node): Update manual.
    * src/treesit.c (treesit_traverse_match_predicate): Change to
    fast_c_string_match.
    (Ftreesit_search_subtree)
    (Ftreesit_search_forward)
    (Ftreesit_induce_sparse_tree): Update docstring.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 0a0104b4be..bc2f0dda91 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -650,10 +650,9 @@ Retrieving Node
 This function traverses the subtree of @var{node} (including
 @var{node} itself), looking for a node for which @var{predicate}
 returns non-@code{nil}.  @var{predicate} is a regexp that is matched
-(case-insensitively) against each node's type, or a predicate function
-that takes a node and returns non-@code{nil} if the node matches.  The
-function returns the first node that matches, or @code{nil} if none
-does.
+against each node's type, or a predicate function that takes a node
+and returns non-@code{nil} if the node matches.  The function returns
+the first node that matches, or @code{nil} if none does.
 
 By default, this function only traverses named nodes, but if @var{all}
 is non-@code{nil}, it traverses all the nodes.  If @var{backward} is
@@ -666,9 +665,9 @@ Retrieving Node
 @defun treesit-search-forward start predicate &optional backward all
 Like @code{treesit-search-subtree}, this function also traverses the
 parse tree and matches each node with @var{predicate} (except for
-@var{start}), where @var{predicate} can be a (case-insensitive) regexp
-or a function.  For a tree like the below where @var{start} is marked
-S, this function traverses as numbered from 1 to 12:
+@var{start}), where @var{predicate} can be a regexp or a function.
+For a tree like the below where @var{start} is marked S, this function
+traverses as numbered from 1 to 12:
 
 @example
 @group
@@ -723,8 +722,8 @@ Retrieving Node
 It takes the subtree under @var{root}, and combs it so only the nodes
 that match @var{predicate} are left.  Like previous functions, the
 @var{predicate} can be a regexp string that matches against each
-node's type case-insensitively, or a function that takes a node and
-return non-@code{nil} if it matches.
+node's type, or a function that takes a node and return non-@code{nil}
+if it matches.
 
 For example, for a subtree on the left that consist of both numbers
 and letters, if @var{predicate} is ``letter only'', the returned tree
diff --git a/src/treesit.c b/src/treesit.c
index 48d650f1fc..63785b2122 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2476,7 +2476,7 @@ treesit_traverse_match_predicate (TSNode node, Lisp_Object pred,
   if (STRINGP (pred))
     {
       const char *type = ts_node_type (node);
-      return fast_c_string_match_ignore_case (pred, type, strlen (type)) >= 0;
+      return fast_c_string_match (pred, type, strlen (type)) >= 0;
     }
   else
     {
@@ -2594,8 +2594,7 @@ DEFUN ("treesit-search-subtree",
 
 Traverse the subtree of NODE, and match PREDICATE with each node along
 the way.  PREDICATE is a regexp string that matches against each
-node's type case-insensitively, or a function that takes a node and
-returns nil/non-nil.
+node's type, or a function that takes a node and returns nil/non-nil.
 
 By default, only traverse named nodes, but if ALL is non-nil, traverse
 all nodes.  If BACKWARD is non-nil, traverse backwards.  If LIMIT is
@@ -2639,8 +2638,8 @@ DEFUN ("treesit-search-forward",
 
 Start traversing the tree from node START, and match PREDICATE with
 each node (except START itself) along the way.  PREDICATE is a regexp
-string that matches against each node's type case-insensitively, or a
-function that takes a node and returns non-nil if it matches.
+string that matches against each node's type, or a function that takes
+a node and returns non-nil if it matches.
 
 By default, only search for named nodes, but if ALL is non-nil, search
 for all nodes.  If BACKWARD is non-nil, search backwards.
@@ -2737,8 +2736,7 @@ DEFUN ("treesit-induce-sparse-tree",
 
 This takes the subtree under ROOT, and combs it so only the nodes
 that match PREDICATE are left, like picking out grapes on the vine.
-PREDICATE is a regexp string that matches against each node's type
-case-insensitively.
+PREDICATE is a regexp string that matches against each node's type.
 
 For a subtree on the left that consist of both numbers and letters, if
 PREDICATE is "is letter", the returned tree is the one on the right.

commit a7042fa051c69b8c647fce3ec52b74974b5ea2be
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Nov 9 12:24:43 2022 -0800

    New function fast_c_string_match and fast_c_string_match_internal
    
    Generalize fast_c_string_match_ignore_case into
    fast_c_string_match_internal.  And Make fast_c_string and
    fast_c_string_match_ignore_case use fast_c_string_match_internal.
    
    * src/lisp.h (fast_c_string_match_internal)
    (fast_c_string_match): New declaration.
    (fast_c_string_match_ignore_case): Change to thin wrapper.
    * src/search.c (fast_c_string_match_internal): New function.

diff --git a/src/lisp.h b/src/lisp.h
index 1e41e2064c..9f497d9227 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4757,6 +4757,8 @@ XMODULE_FUNCTION (Lisp_Object o)
 extern void record_unwind_save_match_data (void);
 extern ptrdiff_t fast_string_match_internal (Lisp_Object, Lisp_Object,
 					     Lisp_Object);
+extern ptrdiff_t fast_c_string_match_internal (Lisp_Object, const char *,
+					       ptrdiff_t, Lisp_Object);
 
 INLINE ptrdiff_t
 fast_string_match (Lisp_Object regexp, Lisp_Object string)
@@ -4770,8 +4772,21 @@ fast_string_match_ignore_case (Lisp_Object regexp, Lisp_Object string)
   return fast_string_match_internal (regexp, string, Vascii_canon_table);
 }
 
-extern ptrdiff_t fast_c_string_match_ignore_case (Lisp_Object, const char *,
-						  ptrdiff_t);
+INLINE ptrdiff_t
+fast_c_string_match (Lisp_Object regexp,
+		     const char *string, ptrdiff_t len)
+{
+  return fast_c_string_match_internal (regexp, string, len, Qnil);
+}
+
+INLINE ptrdiff_t
+fast_c_string_match_ignore_case (Lisp_Object regexp,
+				 const char *string, ptrdiff_t len)
+{
+  return fast_c_string_match_internal (regexp, string, len,
+				       Vascii_canon_table);
+}
+
 extern ptrdiff_t fast_looking_at (Lisp_Object, ptrdiff_t, ptrdiff_t,
                                   ptrdiff_t, ptrdiff_t, Lisp_Object);
 extern ptrdiff_t find_newline1 (ptrdiff_t, ptrdiff_t, ptrdiff_t, ptrdiff_t,
diff --git a/src/search.c b/src/search.c
index b5d6a442c0..bd1adbbe09 100644
--- a/src/search.c
+++ b/src/search.c
@@ -496,19 +496,27 @@ fast_string_match_internal (Lisp_Object regexp, Lisp_Object string,
   return val;
 }
 
-/* Match REGEXP against STRING, searching all of STRING ignoring case,
-   and return the index of the match, or negative on failure.
-   This does not clobber the match data.
+/* Match REGEXP against STRING, searching all of STRING and return the
+   index of the match, or negative on failure.  This does not clobber
+   the match data.  Table is a canonicalize table for ignoring case,
+   or nil for none.
+
    We assume that STRING contains single-byte characters.  */
 
 ptrdiff_t
-fast_c_string_match_ignore_case (Lisp_Object regexp,
-				 const char *string, ptrdiff_t len)
+fast_c_string_match_internal (Lisp_Object regexp,
+			      const char *string, ptrdiff_t len,
+			      Lisp_Object table)
 {
+  /* FIXME: This is expensive and not obviously correct when it makes
+     a difference. I.e., no longer "fast", and may hide bugs.
+     Something should be done about this.  */
   regexp = string_make_unibyte (regexp);
+  /* Record specpdl index because freeze_pattern pushes an
+     unwind-protect on the specpdl.  */
   specpdl_ref count = SPECPDL_INDEX ();
   struct regexp_cache *cache_entry
-    = compile_pattern (regexp, 0, Vascii_canon_table, 0, 0);
+    = compile_pattern (regexp, 0, table, 0, 0);
   freeze_pattern (cache_entry);
   re_match_object = Qt;
   ptrdiff_t val = re_search (&cache_entry->buf, string, len, 0, len, 0);

commit 2332c3eb55b2c8541ea83d4a847c56f888239f6a
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Nov 8 20:44:54 2022 -0800

    Add tree-sitter shortdoc
    
    * lisp/treesit.el (treesit--generate-shortdoc-examples): New function.
    (treesit): New shortdoc group.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 766e0ac4f1..4e3a691e69 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1742,6 +1742,199 @@ treesit--check-manual-coverage
                functions-in-source)
               "\n"))))
 
+;;; Shortdocs
+
+(defun treesit--generate-shortdoc-examples ()
+  "Generate examples for shortdoc."
+  (with-temp-buffer
+    (let (node parent)
+      (insert "int c = 0;")
+      (print (treesit-parser-create 'c))
+      (print (treesit-parser-list))
+      (goto-char (point-min))
+      (print (setq node (treesit-node-at (point))))
+      (print (setq parent (treesit-node-parent node)))
+      (print (treesit-node-children parent))
+      (print (treesit-node-next-sibling node))
+      (print (treesit-node-child-by-field-name parent "declarator"))
+      nil)))
+
+(define-short-documentation-group treesit
+
+
+  "Parsers"
+  (treesit-parser-create
+   :no-eval (treesit-parser-create)
+   :eg-result-string "#<treesit-parser for c>")
+  (treesit-parser-delete
+   :no-value (treesit-parser-delete parser))
+  (treesit-parser-list
+   :no-eval (treesit-parser-list)
+   :eg-result-string "(#<treesit-parser for c>)")
+  (treesit-parser-buffer
+   :no-eval (treesit-parser-buffer parser)
+   :eg-result-string "#<buffer xdisp.c>")
+  (treesit-parser-language
+   :no-eval (treesit-parser-language parser)
+   :eg-result c)
+
+
+  "Parser ranges"
+  (treesit-parser-set-included-ranges
+   :no-value (treesit-parser-set-included-ranges parser '((1 . 4) (5 . 8))))
+  (treesit-parser-included-ranges
+   :no-eval (treesit-parser-included-ranges parser)
+   :eg-result '((1 . 4) (5 . 8)))
+  (treesit-query-range
+   :no-eval (treesit-query-range node '((script_element) @cap))
+   :eg-result-string '((1 . 4) (5 . 8)))
+
+
+  "Retrieving a node"
+  (treesit-node-at
+   :no-eval (treesit-node-at (point))
+   :eg-result-string "#<treesit-node (identifier) in 179-180>")
+  (treesit-node-on
+   :no-eval (treesit-node-on 18 28)
+   :eg-result-string "#<treesit-node (compound_statement) in 143-290>")
+  (treesit-buffer-root-node
+   :no-eval (treesit-buffer-root-node)
+   :eg-result-string "#<treesit-node (translation_unit) in 1-4830>")
+  (treesit-parser-root-node
+   :no-eval (treesit-parser-root-node parser)
+   :eg-result-string "#<treesit-node (translation_unit) in 1-4830>")
+
+
+  "Retrieving a node from another node"
+  (treesit-node-parent
+   :no-eval (treesit-node-parent node)
+   :eg-result-string "#<treesit-node (declaration) in 1-11>")
+  (treesit-node-child
+   :no-eval (treesit-node-child node 0)
+   :eg-result-string "#<treesit-node (primitive_type) in 1-4>")
+  (treesit-node-children
+   :no-eval (treesit-node-children node)
+   :eg-result-string "(#<treesit-node (primitive_type) in 1-4> #<treesit-node (init_declarator) in 5-10> #<treesit-node \";\" in 10-11>)")
+  (treesit-node-next-sibling
+   :no-eval (treesit-node-next-sibling node)
+   :eg-result-string "#<treesit-node (init_declarator) in 5-10>")
+  (treesit-node-prev-sibling
+   :no-eval (treesit-node-prev-sibling node)
+   :eg-result-string "#<treesit-node (primitive_type) in 1-4>")
+  (treesit-node-child-by-field-name
+   :no-eval (treesit-node-child-by-field-name node "declarator")
+   :eg-result-string "#<treesit-node (init_declarator) in 5-10>")
+
+
+  (treesit-first-child-for-pos
+   :no-eval (treesit-first-child-for-pos node 1)
+   :eg-result-string "#<treesit-node (primitive_type) in 1-4>")
+  (treesit-node-descendant-for-range
+   :no-eval (treesit-node-descendant-for-range node 2 3)
+   :eg-result-string "#<treesit-node (primitive_type) in 1-4>")
+
+
+  "Searching for node"
+  (treesit-search-subtree
+   :no-eval (treesit-search-subtree node "function_definition")
+   :eg-result-string "#<treesit-node (function_definition) in 57-146>")
+  (treesit-search-forward
+   :no-eval (treesit-search-forward node "function_definition")
+   :eg-result-string "#<treesit-node (function_definition) in 57-146>")
+  (treesit-search-forward-goto
+   :no-eval (treesit-search-forward-goto node "function_definition")
+   :eg-result-string "#<treesit-node (function_definition) in 57-146>")
+  (treesit-induce-sparse-tree
+   :no-eval (treesit-induce-sparse-tree node "function_definition")
+   :eg-result-string "(nil (#<treesit-node (function_definition) in 57-146>) (#<treesit-node (function_definition) in 259-296>) (#<treesit-node (function_definition) in 303-659>))")
+  (treesit-filter-child
+   :no-eval (treesit-filter-child node (lambda (n) (equal (treesit-node-type) "identifier")))
+   :eg-result-string "(#<treesit-node (identifier) in 195-196>)")
+  (treesit-parent-until
+   :no-eval (treesit-parent-until node (lambda (p) (eq (treesit-node-start p) (point))))
+   :eg-result-string "#<treesit-node (declaration) in 1-11>")
+  (treesit-parent-while
+   :no-eval (treesit-parent-while node (lambda (p) (eq (treesit-node-start p) (point))))
+   :eg-result-string "#<treesit-node (declaration) in 1-11>")
+  (treesit-node-top-level
+   :no-eval (treesit-node-top-level node)
+   :eg-result-string "#<treesit-node (declaration) in 1-11>")
+
+
+  "Retrieving node information"
+  (treesit-node-text
+   :no-eval (treesit-node-text node)
+   :eg-result "int")
+  (treesit-node-start
+   :no-eval (treesit-node-start node)
+   :eg-result 1)
+  (treesit-node-end
+   :no-eval (treesit-node-end node)
+   :eg-result 10)
+  (treesit-node-type
+   :no-eval (treesit-node-type node)
+   :eg-result "function_definition")
+  (treesit-node-field-name
+   :no-eval (treesit-node-field-name node)
+   :eg-result "body")
+
+
+  (treesit-node-parser
+   :no-eval (treesit-node-parser node)
+   :eg-result-string "#<treesit-parser for c>")
+  (treesit-node-language
+   :no-eval (treesit-node-language node)
+   :eg-result c)
+  (treesit-node-buffer
+   :no-eval (treesit-node-buffer node)
+   :eg-result-string "#<buffer xdisp.c>")
+
+
+  (treesit-node-index
+   :no-eval (treesit-node-index node)
+   :eg-result 0)
+  (treesit-node-string
+   :no-eval (treesit-node-string node)
+   :eg-result-string "(init_declarator declarator: (identifier) value: (number_literal))")
+  (treesit-node-check
+   :no-eval (treesit-node-check node 'named)
+   :eg-result t)
+
+
+  (treesit-field-name-for-child
+   :no-eval (treesit-field-name-for-child node)
+   :eg-result "body")
+  (treesit-child-count
+   :no-eval (treesit-child-count node)
+   :eg-result 3)
+
+
+  "Pattern matching"
+  (treesit-query-capture
+   :no-eval (treesit-query-capture node '((identifier) @id "return" @ret))
+   :eg-result-string "((id . #<treesit-node (identifier) in 195-196>) (ret . #<treesit-node "return" in 338-344>))")
+  (treesit-query-compile
+   :no-eval (treesit-query-compile 'c '((identifier) @id "return" @ret))
+   :eg-result-string "#<treesit-compiled-query>")
+  (treesit-query-language
+   :no-eval (treesit-query-language compiled-query)
+   :eg-result c)
+  (treesit-query-expand
+   :eval (treesit-query-expand '((identifier) @id "return" @ret)))
+  (treesit-pattern-expand
+   :eval (treesit-pattern-expand :anchor)
+   :eval (treesit-pattern-expand '(identifier))
+   :eval (treesit-pattern-expand :equal))
+
+
+  "Parsing a string"
+  (treesit-parse-string
+   :no-eval (treesit-parse-string "int c = 0;" 'c)
+   :eg-result-string "#<treesit-node (translation_unit) in 1-11>")
+  (treesit-query-string
+   :no-eval (treesit-query-string "int c = 0;" '((identifier) @id) 'c)
+   :eg-result-string "((id . #<treesit-node (identifier) in 5-6>))"))
+
 (provide 'treesit)
 
 ;;; treesit.el ends here

commit 077c66405261381704da33e6858f4b6639763f5a
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Nov 8 20:43:24 2022 -0800

    ; Fix treesit-query-range docstring
    
    * lisp/treesit.el (treesit-query-range): Change signature, change
    reference of treesit-query-in to that of treesit-query-capture.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index c2a15835b3..766e0ac4f1 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -340,15 +340,15 @@ treesit-query-string
        (treesit-parser-root-node parser)
        query))))
 
-(defun treesit-query-range (source query &optional beg end)
+(defun treesit-query-range (node query &optional beg end)
   "Query the current buffer and return ranges of captured nodes.
 
-QUERY, SOURCE, BEG, END are the same as in
-`treesit-query-in'.  This function returns a list
+QUERY, NODE, BEG, END are the same as in
+`treesit-query-capture'.  This function returns a list
 of (START . END), where START and END specifics the range of each
 captured node.  Capture names don't matter."
   (cl-loop for capture
-           in (treesit-query-capture source query beg end)
+           in (treesit-query-capture node query beg end)
            for node = (cdr capture)
            collect (cons (treesit-node-start node)
                          (treesit-node-end node))))

commit 2b4d46f99be3735823666c2a6d9f058cedeb031c
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Nov 8 20:41:58 2022 -0800

    Mimic existing python-mode beg/end-of-defun behavior better
    
    * lisp/progmodes/python.el (python-treesit-beginning-of-defun)
    (python-treesit-end-of-defun): New functions.
    * lisp/progmodes/python.el (python-mode): Use custom beg/end-of-defun
    functions.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 8db96b117f..61f29dd005 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2353,6 +2353,55 @@ python-nav-if-name-main
         (point)
       (ignore (goto-char point)))))
 
+
+;;; Tree-sitter navigation
+
+(defun python-treesit-beginning-of-defun (&optional arg)
+  "Tree-sitter `beginning-of-defun' function.
+ARG is the same as in `beginning-of-defun'."
+  (let ((arg (or arg 1))
+        (node (treesit-node-at (point)))
+        (function-or-class (rx (or "function" "class") "_definition")))
+    (if (> arg 0)
+        ;; Go backward.
+        (while (and (> arg 0)
+                    (setq node (treesit-search-forward-goto
+                                node function-or-class t t)))
+          ;; Here we deviate from `treesit-beginning-of-defun': if
+          ;; NODE is function_definition, find the top-level
+          ;; function_definition, if NODE is class_definition, find
+          ;; the top-level class_definition, don't mix the two like
+          ;; `treesit-beginning-of-defun' would.
+          (setq node (or (treesit-node-top-level node)
+                         node))
+          (setq arg (1- arg)))
+      ;; Go forward.
+      (while (and (< arg 0)
+                  (setq node (treesit-search-forward-goto
+                              node function-or-class)))
+        (setq node (or (treesit-node-top-level node)
+                       node))
+        (setq arg (1+ arg))))
+    (when node
+      (goto-char (treesit-node-start node))
+      t)))
+
+(defun python-treesit-end-of-defun ()
+  "Tree-sitter `end-of-defun' function."
+  ;; Why not simply get the largest node at point: when point is at
+  ;; (point-min), that gives us the root node.
+  (let* ((node (treesit-node-at (point)))
+         (top-func (treesit-node-top-level
+                    node
+                    "function_definition"))
+         (top-class (treesit-node-top-level
+                     node
+                     "class_definition")))
+    ;; Prefer function_definition over class_definition: when we are
+    ;; in a function_definition inside a class_definition, jump to the
+    ;; end of function_definition.
+    (goto-char (or (treesit-node-end (or top-func top-class)) (point)))))
+
 
 ;;; Shell integration
 
@@ -6508,10 +6557,9 @@ python-mode
     (setq-local treesit-font-lock-settings python--treesit-settings)
     (setq-local imenu-create-index-function
                 #'python-imenu-treesit-create-index)
-    (setq-local treesit-defun-type-regexp (rx bol
-                                              (or "function" "class")
-                                              "_definition"
-                                              eol))
+    (setq-local beginning-of-defun-function
+                #'python-treesit-beginning-of-defun)
+    (setq-local end-of-defun-function #'python-treesit-end-of-defun)
     (treesit-major-mode-setup))
    ;; Elisp.
    (t

commit 5858921f409f6ee9d2e08dbdcd1719969a4f5544
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Wed Nov 9 15:35:51 2022 +0200

    ; Minor improvements in wording of tree-sitter docs
    
    * doc/lispref/parsing.texi (Multiple Languages):
    * doc/lispref/modes.texi (Parser-based Font Lock): Improve
    wording.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index da190b0b02..973d183a72 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3951,17 +3951,17 @@ Parser-based Font Lock
 @end example
 
 This function takes a series of @var{query-spec}s, where each
-@var{query-spec} is a @var{query} preceded by multiple pairs of
-@var{:keyword} and @var{value}.  Each @var{query} is a tree-sitter
-query in either the string, s-expression or compiled form.
-
-For each @var{query}, the @var{:keyword} and @var{value} pairs add
-meta information to it.  The @code{:lang} keyword declares
-@var{query}'s language.  The @code{:feature} keyword sets the feature
-name of @var{query}.  Users can control which features are enabled
-with @code{font-lock-maximum-decoration} and
+@var{query-spec} is a @var{query} preceded by one or more
+@var{:keyword}/@var{value} pairs.  Each @var{query} is a
+tree-sitter query in either the string, s-expression or compiled form.
+
+For each @var{query}, the @var{:keyword}/@var{value} pairs that
+precede it add meta information to it.  The @code{:lang} keyword
+declares @var{query}'s language.  The @code{:feature} keyword sets the
+feature name of @var{query}.  Users can control which features are
+enabled with @code{font-lock-maximum-decoration} and
 @code{treesit-font-lock-feature-list} (described below).  These two
-keywords are mandated.
+keywords are mandatory.
 
 Other keywords are optional:
 
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index cae83f8d5c..0a0104b4be 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -1537,12 +1537,12 @@ Multiple Languages
 a value that @var{treesit-range-settings} can have.
 
 It takes a series of @var{query-spec}s, where each @var{query-spec} is
-a @var{query} preceded by zero or more pairs of @var{keyword} and
-@var{value}.  Each @var{query} is a tree-sitter query in either the
+a @var{query} preceded by zero or more @var{keyword}/@var{value}
+pairs.  Each @var{query} is a tree-sitter query in either the
 string, s-expression or compiled form, or a function.
 
 If @var{query} is a tree-sitter query, it should be preceeded by two
-@var{:keyword} @var{value} pairs, where the @code{:embed} keyword
+@var{:keyword}/@var{value} pairs, where the @code{:embed} keyword
 specifies the embedded language, and the @code{:host} keyword
 specified the host language.
 

commit 29418f954eb114bf3c108b6e03569036f854ae45
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Nov 8 10:39:53 2022 -0800

    ; Improve tree-sitter documentation
    
    * doc/lispref/modes.texi (Parser-based Font Lock)
    * doc/lispref/parsing.texi (Multiple Languages)
    * lisp/treesit.el (treesit-range-rules)
    (treesit-font-lock-rules): Improve phrasing around queries and keyword
    and values.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 8a0b5a12a1..da190b0b02 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3950,16 +3950,16 @@ Parser-based Font Lock
 @end group
 @end example
 
-This function takes a series of @var{query-spec}s, which are triplets
-@w{@code{@var{:keyword} @var{value} @dots{} @var{query}}}.  Each
-@var{query} is a tree-sitter query in either the string, s-expression
-or compiled form.
-
-The @var{:keyword} and @var{value} pairs configure the query which
-follows them in the argument list.  The @code{:lang} keyword sets the
-query's language.  The @code{:feature} keyword sets the feature name
-of the query.  Users can control which features are enabled with
-@code{font-lock-maximum-decoration} and
+This function takes a series of @var{query-spec}s, where each
+@var{query-spec} is a @var{query} preceded by multiple pairs of
+@var{:keyword} and @var{value}.  Each @var{query} is a tree-sitter
+query in either the string, s-expression or compiled form.
+
+For each @var{query}, the @var{:keyword} and @var{value} pairs add
+meta information to it.  The @code{:lang} keyword declares
+@var{query}'s language.  The @code{:feature} keyword sets the feature
+name of @var{query}.  Users can control which features are enabled
+with @code{font-lock-maximum-decoration} and
 @code{treesit-font-lock-feature-list} (described below).  These two
 keywords are mandated.
 
@@ -3975,7 +3975,7 @@ Parser-based Font Lock
 @item @tab @code{keep} @tab Fill-in regions without an existing face
 @end multitable
 
-Lisp programs mark patterns in the query with capture names (names
+Lisp programs mark patterns in @var{query} with capture names (names
 that starts with @code{@@}), and tree-sitter will return matched nodes
 tagged with those same capture names.  For the purpose of
 fontification, capture names in @var{query} should be face names like
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index a22b088111..cae83f8d5c 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -1537,14 +1537,14 @@ Multiple Languages
 a value that @var{treesit-range-settings} can have.
 
 It takes a series of @var{query-spec}s, where each @var{query-spec} is
-a triplet of arguments @w{@code{@var{:keyword} @var{value} @dots{}
-@var{query}}}.  Each @var{query} is a tree-sitter query in either the
+a @var{query} preceded by zero or more pairs of @var{keyword} and
+@var{value}.  Each @var{query} is a tree-sitter query in either the
 string, s-expression or compiled form, or a function.
 
-If @var{query} is a tree-sitter query, it should be used with the pair
-@var{:keyword} and @var{value}, where the @code{:embed}
-keyword specifies the embedded language, and the @code{:host}
-keyword specified the host language.
+If @var{query} is a tree-sitter query, it should be preceeded by two
+@var{:keyword} @var{value} pairs, where the @code{:embed} keyword
+specifies the embedded language, and the @code{:host} keyword
+specified the host language.
 
 @code{treesit-update-ranges} uses @var{query} to figure out how to set
 the ranges for parsers for the embedded language.  It queries
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 61bca49d8c..c2a15835b3 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -374,15 +374,17 @@ treesit-range-settings
 (defun treesit-range-rules (&rest query-specs)
   "Produce settings for `treesit-range-settings'.
 
-QUERY-SPECS are a series of QUERY-SPEC triplets of the form
+QUERY-SPECS are a series of QUERY-SPECs, where each QUERY-SPEC is
+a QUERY preceeded by zero or more pairs of :KEYWORD and VALUE,
+like this:
 
     :KEYWORD VALUE... QUERY
 
 Each QUERY is a tree-sitter query in either the string,
 s-expression or compiled form.
 
-Each QUERY should be preceded by :KEYWORD VALUE pairs that
-configures this query.  For example,
+For each QUERY, :KEYWORD and VALUE pairs add meta information to
+it.  For example,
 
     (treesit-range-rules
      :embed \\='javascript
@@ -562,7 +564,8 @@ treesit-font-lock-settings
 (defun treesit-font-lock-rules (&rest query-specs)
   "Return a value suitable for `treesit-font-lock-settings'.
 
-QUERY-SPECS is a series of 3 arguments:
+QUERY-SPECS is a series of QUERY-SPECs.  Each QUERY-SPEC is a
+QUERY preceded by multiple pairs of :KEYWORD and VALUE:
 
    :KEYWORD VALUE... QUERY
 
@@ -570,8 +573,8 @@ treesit-font-lock-rules
 or compiled form.  For each query, captured nodes are highlighted
 with the capture name as its face.
 
-Before each QUERY there could be :KEYWORD and VALUE pairs that
-configure the query (and only that query).  For example,
+:KEYWORD and VALUE pairs preceeding a QUERY add meta information
+to QUERY.  For example,
 
     (treesit-font-lock-rules
      :language \\='javascript

commit 07292b1344549a164eff9d548f819235a14a0b4e
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Nov 7 02:27:59 2022 -0800

    ; Improve docstring of treesit-simple-indent-presets
    
    * lisp/treesit.el (treesit-simple-indent-presets): Improve docstring.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 9f4814b603..61bca49d8c 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1023,17 +1023,18 @@ treesit-simple-indent-presets
                                 fns)))))
   "A list of presets.
 These presets that can be used as MATHER and ANCHOR in
-`treesit-simple-indent-rules'.
+`treesit-simple-indent-rules'.  MACHTERs and ANCHORs are
+functions that takes 3 arguments: NODE, PARENT and BOL.
 
 MATCHER:
 
 \(match NODE-TYPE PARENT-TYPE NODE-FIELD NODE-INDEX-MIN NODE-INDEX-MAX)
 
-    NODE-TYPE checks for node's type, PARENT-TYPE checks for
-    parent's type, NODE-FIELD checks for the filed name of node
-    in the parent, NODE-INDEX-MIN and NODE-INDEX-MAX checks for
-    the node's index in the parent.  Therefore, to match the
-    first child where parent is \"argument_list\", use
+    NODE-TYPE checks for NODE's type, PARENT-TYPE checks for
+    PARENT's type, NODE-FIELD checks for the filed name of NODE
+    in PARENT, NODE-INDEX-MIN and NODE-INDEX-MAX checks for
+    NODE's index in PARENT.  Therefore, to match the first child
+    where PARENT is \"argument_list\", use
 
         (match nil \"argument_list\" nil nil 0 0).
 
@@ -1041,49 +1042,49 @@ treesit-simple-indent-presets
 
 no-node
 
-    Matches the case where node is nil, i.e., there is no node
+    Matches the case where NODE is nil, i.e., there is no node
     that starts at point.  This is the case when indenting an
     empty line.
 
 \(parent-is TYPE)
 
-    Check that the parent's type matches regexp TYPE.
+    Check that PARENT's type matches regexp TYPE.
 
 \(node-is TYPE)
 
-    Checks that the node's type matches regexp TYPE.
+    Checks that NODE's type matches regexp TYPE.
 
 \(query QUERY)
 
-    Queries the parent node with QUERY, and checks if the node
-    is captured (by any capture name).
+    Queries PARENT with QUERY, and checks if NODE is
+    captured (by any capture name).
 
 ANCHOR:
 
 first-sibling
 
-    Find the first child of the parent.
+    Returns the start of the first child of PARENT.
 
 parent
 
-    Find the parent.
+    Returns the start of PARENT.
 
 parent-bol
 
-    Find the beginning of non-space characters on the line where
-    the parent is on.
+    Returns the beginning of non-space characters on the line where
+    PARENT is on.
 
 prev-sibling
 
-    Find node's previous sibling.
+    Returns the start of NODE's previous sibling.
 
 no-indent
 
-    Do nothing.
+    Returns the start of NODE.
 
 prev-line
 
-    The first non-whitespace charater on the previous line.
+    Returns the  first non-whitespace character on the previous line.
 
 point-min
 

commit 1bed1f0b8e9095d66f905ed7b409a397f1972262
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Nov 7 02:00:04 2022 -0800

    Add tree-sitter indent preset "point-min"
    
    * doc/lispref/modes.texi (Parser-based Indentation): Update manual.
    * lisp/treesit.el (treesit-simple-indent-presets): Add preset.  Update
    docstring.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 50dbec35e4..8a0b5a12a1 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -4937,6 +4937,11 @@ Parser-based Indentation
 This anchor is a function that is called with 3 arguments: @var{node},
 @var{parent}, and @var{bol}, and returns the first non-whitespace
 charater on the previous line.
+
+@item point-min
+This anchor is a function is called with 3 arguments: @var{node},
+@var{parent}, and @var{bol}, and returns the beginning of the buffer.
+This is useful as the beginning of the buffer is always at column 0.
 @end ftable
 
 @end defvar
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 83f9dd1b7f..9f4814b603 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -998,6 +998,7 @@ treesit-simple-indent-presets
                              (goto-char bol)
                              (forward-line -1)
                              (skip-chars-forward " \t"))))
+        (cons 'point-min (lambda (&rest _) (point-min)))
         ;; TODO: Document.
         (cons 'and (lambda (&rest fns)
                      (lambda (node parent bol &rest _)
@@ -1082,7 +1083,11 @@ treesit-simple-indent-presets
 
 prev-line
 
-    The first non-whitespace charater on the previous line.")
+    The first non-whitespace charater on the previous line.
+
+point-min
+
+    Returns the beginning of buffer, which is always at column 0.")
 
 (defun treesit--simple-indent-eval (exp)
   "Evaluate EXP.

commit 98f5b74808a54ad9093888b72b2c04e085f4b369
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Nov 7 01:59:21 2022 -0800

    Add treesit--indent-rules-optimize
    
    * lisp/treesit.el (treesit--indent-rules-optimize): New function.
    (treesit-major-mode-setup): Optimize indent rules when setting up for
    major mode.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 37eee929d7..83f9dd1b7f 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1327,6 +1327,35 @@ treesit-check-indent
       (indent-region (point-min) (point-max))
       (diff-buffers source-buf (current-buffer)))))
 
+(defun treesit--indent-rules-optimize (rules)
+  "Optimize simple indent RULES.
+RULES should be a value suitable for
+`treesit-simple-indent-rules'.  Return the optimized version of
+RULES."
+  ;; Right now this function just compiles queries.  it doesn't
+  ;; byte-compile matchers and anchors because it doesn't make much
+  ;; difference.
+  (cl-loop for setting in rules
+           for lang = (car setting)
+           for indent-rules = (cdr setting)
+           collect
+           (cl-labels
+               ;; Optimize a matcher or anchor.
+               ((optimize-func (func)
+                  (pcase func
+                    (`(query ,qry)
+                     (list 'query (treesit-query-compile lang qry)))
+                    (_ func)))
+                ;; Optimize a rule (MATCHER ANCHOR OFFSET).
+                (optimize-rule (rule)
+                  (let ((matcher (nth 0 rule))
+                        (anchor (nth 1 rule))
+                        (offset (nth 2 rule)))
+                    (list (optimize-func matcher)
+                          (optimize-func anchor)
+                          offset))))
+             (cons lang (mapcar #'optimize-rule indent-rules)))))
+
 ;;; Search
 
 (defun treesit-search-forward-goto
@@ -1539,6 +1568,9 @@ treesit-major-mode-setup
     (treesit-font-lock-recompute-features))
   ;; Indent.
   (when treesit-simple-indent-rules
+    (setq-local treesit-simple-indent-rules
+                (treesit--indent-rules-optimize
+                 treesit-simple-indent-rules))
     (setq-local indent-line-function #'treesit-indent)
     (setq-local indent-region-function #'treesit-indent-region))
   ;; Navigation.

commit 1ae314dfda1a7746fb31957ac3eedefd70b3c1fe
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Nov 7 01:27:49 2022 -0800

    ; Documentation fixes for tree-sitter
    
    * doc/lispref/parsing.texi (Multiple Languages): Resolve the FIXME.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index a7a8f8400b..a22b088111 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -1335,12 +1335,12 @@ Multiple Languages
 Lisp programs should call @code{treesit-update-ranges} to make sure
 the ranges for each parser are correct before using parsers in a
 buffer, and call @code{treesit-language-at} to figure out the language
-responsible for the text at some position.  Multi-language major modes
-set @code{treesit-range-settings} and
-@c FIXME: ``power''?
-@code{treesit-language-at-point-function} respectively to power these
-two functions.  These functions and variables are explained in more
-detail towards the end of the section.
+responsible for the text at some position.  These two functions don't
+work by themselves, they need major modes to set
+@code{treesit-range-settings} and
+@code{treesit-language-at-point-function}, which do the actual work.
+These functions and variables are explained in more detail towards the
+end of the section.
 
 @heading Getting and setting ranges
 

commit 488a6efe323927a4064afc193b66cd11e2caf77c
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sun Nov 6 11:59:27 2022 +0200

    ; More documentation improvements for treesit
    
    * lisp/treesit.el (treesit-language-at, treesit-range-rules)
    (treesit-font-lock-rules): Doc fixes.
    
    * doc/lispref/parsing.texi (Multiple Languages):
    * doc/lispref/modes.texi (Parser-based Font Lock): Fix wording.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 5d9c4b15d8..50dbec35e4 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3950,15 +3950,15 @@ Parser-based Font Lock
 @end group
 @end example
 
-This function takes a list of @var{query-spec}s of the form
+This function takes a series of @var{query-spec}s, which are triplets
 @w{@code{@var{:keyword} @var{value} @dots{} @var{query}}}.  Each
 @var{query} is a tree-sitter query in either the string, s-expression
 or compiled form.
 
-Before each query, there are @var{:keyword} @var{value} pairs that
-configure that query.  The @code{:lang} keyword sets the query's
-language.  The @code{:feature} keyword sets the feature name of the
-query.  Users can control which features are enabled with
+The @var{:keyword} and @var{value} pairs configure the query which
+follows them in the argument list.  The @code{:lang} keyword sets the
+query's language.  The @code{:feature} keyword sets the feature name
+of the query.  Users can control which features are enabled with
 @code{font-lock-maximum-decoration} and
 @code{treesit-font-lock-feature-list} (described below).  These two
 keywords are mandated.
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 7f7d49b04b..a7a8f8400b 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -1336,7 +1336,8 @@ Multiple Languages
 the ranges for each parser are correct before using parsers in a
 buffer, and call @code{treesit-language-at} to figure out the language
 responsible for the text at some position.  Multi-language major modes
-sets @code{treesit-range-settings} and
+set @code{treesit-range-settings} and
+@c FIXME: ``power''?
 @code{treesit-language-at-point-function} respectively to power these
 two functions.  These functions and variables are explained in more
 detail towards the end of the section.
@@ -1417,9 +1418,9 @@ Multiple Languages
 @code{treesit-query-error} error if @var{query} is malformed.
 @end defun
 
-@heading Supporting multiple languages as Lisp programs
+@heading Supporting multiple languages in Lisp programs
 
-It should suffice for general Lisp programs to call these two
+It should suffice for general Lisp programs to call the following two
 functions in order to support program sources that mixes multiple
 languages.
 
@@ -1430,8 +1431,8 @@ Multiple Languages
 defaults to the beginning of the buffer, and @var{end} defaults to the
 end of the buffer.
 
-For example, fontification functions uses this function before
-querying for nodes in a region.
+For example, fontification functions use this function before querying
+for nodes in a region.
 @end defun
 
 @defun treesit-language-at pos
@@ -1444,26 +1445,25 @@ Multiple Languages
 buffer, it returns @code{nil}.
 @end defun
 
-@heading Supporting multiple languages as major modes
+@heading Supporting multiple languages in major modes
 
 @cindex host language, tree-sitter
-@cindex tree-sitter host language
+@cindex tree-sitter host and embedded languages
 @cindex embedded language, tree-sitter
-@cindex tree-sitter embedded language
 Normally, in a set of languages that can be mixed together, there is a
-host language and one or more embedded languages.  A Lisp program
-usually first parses the whole document with the host language's
-parser, retrieve some information, sets ranges for the embedded
-languages with that information, and then parses the embedded
+@dfn{host language} and one or more @dfn{embedded languages}.  A Lisp
+program usually first parses the whole document with the host
+language's parser, retrieves some information, sets ranges for the
+embedded languages with that information, and then parses the embedded
 languages.
 
 Take a buffer containing @acronym{HTML}, @acronym{CSS} and JavaScript
-as an example.  A lisp program will first parse the whole buffer with
+as an example.  A Lisp program will first parse the whole buffer with
 an @acronym{HTML} parser, then query the parser for
 @code{style_element} and @code{script_element} nodes, which
-corresponds to @acronym{CSS} and JavaScript text, respectively.  Then
+correspond to @acronym{CSS} and JavaScript text, respectively.  Then
 it sets the range of the @acronym{CSS} and JavaScript parser to the
-range in which their corresponding nodes span.
+ranges in which their corresponding nodes span.
 
 Given a simple @acronym{HTML} document:
 
@@ -1476,7 +1476,8 @@ Multiple Languages
 @end group
 @end example
 
-A Lisp program will first parse with a @acronym{HTML} parser, then set
+@noindent
+a Lisp program will first parse with a @acronym{HTML} parser, then set
 ranges for @acronym{CSS} and JavaScript parsers:
 
 @example
@@ -1508,11 +1509,11 @@ Multiple Languages
 
 Emacs automates this process in @code{treesit-update-ranges}.  A
 multi-language major mode should set @code{treesit-range-settings} so
-that this function knows how to perform this process automatically.
-Major modes should use the helper function @code{treesit-range-rules}
-to generate the value that @code{treesit-range-settings} can have.
-The settings in the following example directly translates to
-operations shown above.
+that @code{treesit-update-ranges} knows how to perform this process
+automatically.  Major modes should use the helper function
+@code{treesit-range-rules} to generate a value that can be assigned to
+@code{treesit-range-settings}.  The settings in the following example
+directly translate into operations shown above.
 
 @example
 @group
@@ -1536,14 +1537,14 @@ Multiple Languages
 a value that @var{treesit-range-settings} can have.
 
 It takes a series of @var{query-spec}s, where each @var{query-spec} is
-of the form @w{@code{@var{:keyword} @var{value} @dots{} @var{query}}}.
-Each @var{query} is a tree-sitter query in either the string,
-s-expression or compiled form, or a function.
+a triplet of arguments @w{@code{@var{:keyword} @var{value} @dots{}
+@var{query}}}.  Each @var{query} is a tree-sitter query in either the
+string, s-expression or compiled form, or a function.
 
-If @var{query} is a tree-sitter qurey, it should be preceded by 2
-pairs of @var{:keyword} and @var{value}, where the @code{:embed}
-keyword specifies the @dfn{embedded language}, and the @code{:host}
-keyword specified the @dfn{host language}.
+If @var{query} is a tree-sitter query, it should be used with the pair
+@var{:keyword} and @var{value}, where the @code{:embed}
+keyword specifies the embedded language, and the @code{:host}
+keyword specified the host language.
 
 @code{treesit-update-ranges} uses @var{query} to figure out how to set
 the ranges for parsers for the embedded language.  It queries
@@ -1551,7 +1552,7 @@ Multiple Languages
 the captured nodes span, and applies these ranges to embedded
 language parsers.
 
-If @var{query} is a function, it doesn't need any @var{keyword} and
+If @var{query} is a function, it doesn't need any @var{:keyword} and
 @var{value} pair.  It should be a function that takes 2 arguments,
 @var{start} and @var{end}, and sets the ranges for parsers in the
 current buffer in the region between @var{start} and @var{end}.  It is
@@ -1560,11 +1561,11 @@ Multiple Languages
 @end defun
 
 @defvar treesit-range-settings
-This variable helps @code{treesit-update-ranges} to update ranges for
-parsers in the buffer.  It is a list of @var{setting}s where the exact
-format of a @var{setting} is considered internal.  You should use
-@code{treesit-range-rules} to generate a value that this variable can
-have.
+This variable helps @code{treesit-update-ranges} in updating the
+ranges for parsers in the buffer.  It is a list of @var{setting}s
+where the exact format of a @var{setting} is considered internal.  You
+should use @code{treesit-range-rules} to generate a value that this
+variable can have.
 
 @c Because the format is internal, we don't document them here.  Though
 @c we do have it explained in the docstring.  We also expose the fact
@@ -1616,7 +1617,7 @@ Tree-sitter major modes
 checks whether the user turned on tree-sitter for @var{mode}
 (according to @code{treesit-settings}), whether Emacs was built with
 tree-sitter, whether the buffer's size is not too large for
-tree-sitter to handle it, and whether language definition for
+tree-sitter to handle it, and whether the language definition for
 @var{language} is available on the system (@pxref{Language
 Definitions}).
 
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 84be69d8b7..37eee929d7 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -147,10 +147,10 @@ treesit-language-at-point-function
 
 (defun treesit-language-at (position)
   "Return the language at POSITION.
-Assumes parser ranges are up-to-date.  Returns the return value
-of `treesit-language-at-point-function' if it's non-nil,
-otherwise return the language of the first parser in
-`treesit-parser-list', or nil if there is no parser."
+This function assumes that parser ranges are up-to-date.  It
+returns the return value of `treesit-language-at-point-function'
+if it's non-nil, otherwise it returns the language of the first
+parser in `treesit-parser-list', or nil if there is no parser."
   (if treesit-language-at-point-function
       (funcall treesit-language-at-point-function position)
     (when-let ((parser (car (treesit-parser-list))))
@@ -374,7 +374,7 @@ treesit-range-settings
 (defun treesit-range-rules (&rest query-specs)
   "Produce settings for `treesit-range-settings'.
 
-QUERY-SPECS contains a series of QUERY-SPEC of the form
+QUERY-SPECS are a series of QUERY-SPEC triplets of the form
 
     :KEYWORD VALUE... QUERY
 
@@ -396,8 +396,8 @@ treesit-range-rules
 these ranges to parsers for the embedded language.
 
 QUERY can also be a function that takes two arguments, START and
-END.  If QUERY is a function, it doesn't need :KEYWORD VALUE
-pairs preceding it.  This function should set the ranges for
+END.  If QUERY is a function, it doesn't need the :KEYWORD VALUE
+pair preceding it.  This function should set the ranges for
 parsers in the current buffer in the region between START and
 END.  It is OK for this function to set ranges in a larger region
 that encompasses the region between START and END."
@@ -562,7 +562,7 @@ treesit-font-lock-settings
 (defun treesit-font-lock-rules (&rest query-specs)
   "Return a value suitable for `treesit-font-lock-settings'.
 
-QUERY-SPECS is made of a series of QUERY-SPECs of the form
+QUERY-SPECS is a series of 3 arguments:
 
    :KEYWORD VALUE... QUERY
 
@@ -570,7 +570,7 @@ treesit-font-lock-rules
 or compiled form.  For each query, captured nodes are highlighted
 with the capture name as its face.
 
-Before each QUERY there could be :KEYWORD VALUE pairs that
+Before each QUERY there could be :KEYWORD and VALUE pairs that
 configure the query (and only that query).  For example,
 
     (treesit-font-lock-rules

commit 9fbbb2355298f75e8fd09b35306e843ce45b9e25
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Nov 5 18:58:39 2022 -0700

    Fix incorrect tree-sitter fontification
    
    * lisp/treesit.el (treesit-font-lock-fontify-region): If the captured
    node is outside of the region between START and END, don't fontify it.
    Wrap fontification code in a when form.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 7233ce7f18..84be69d8b7 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -846,23 +846,30 @@ treesit-font-lock-fontify-region
                      (node (cdr capture))
                      (node-start (treesit-node-start node))
                      (node-end (treesit-node-end node)))
-                (cond
-                 ((eq face 'contextual)
-                  (treesit-font-lock-contextual-post-process
-                   node start end
-                   (or loudly treesit--font-lock-verbose)))
-                 ((facep face)
-                  (treesit-fontify-with-override
-                   (max node-start start) (min node-end end)
-                   face override))
-                 ((functionp face)
-                  (funcall face node override start end)))
-                ;; Don't raise an error if FACE is neither a face nor
-                ;; a function.  This is to allow intermediate capture
-                ;; names used for #match and #eq.
-                (when (or loudly treesit--font-lock-verbose)
-                  (message "Fontifying text from %d to %d, Face: %s, Node: %s"
-                           start end face (treesit-node-type node))))))))))
+                ;; Turns out it is possible to capture a node that's
+                ;; completely outside the region between START and
+                ;; END.  If the node is outside of that region, (max
+                ;; node-start start) and friends return bad values.
+                (when (and (< start node-end)
+                           (< node-start end))
+                  (cond
+                   ((eq face 'contextual)
+                    (treesit-font-lock-contextual-post-process
+                     node start end
+                     (or loudly treesit--font-lock-verbose)))
+                   ((facep face)
+                    (treesit-fontify-with-override
+                     (max node-start start) (min node-end end)
+                     face override))
+                   ((functionp face)
+                    (funcall face node override start end)))
+                  ;; Don't raise an error if FACE is neither a face nor
+                  ;; a function.  This is to allow intermediate capture
+                  ;; names used for #match and #eq.
+                  (when (or loudly treesit--font-lock-verbose)
+                    (message "Fontifying text from %d to %d, Face: %s, Node: %s"
+                             (max node-start start) (min node-end end)
+                             face (treesit-node-type node)))))))))))
   `(jit-lock-bounds ,start . ,end))
 
 ;;; Indent

commit 076a25810127cb8c56ff0f5272a3d8b98192ee77
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Nov 5 18:32:01 2022 -0700

    Allow tree-sitter indent offset to be a variable
    
    * doc/lispref/modes.texi (Parser-based Indentation): Update manual.
    * lisp/progmodes/js.el (js--treesit-indent-rules): Change all
    occurance of ,js-indent-level to js-indent-level.
    
    * lisp/progmodes/ts-mode.el (ts-mode--indent-rules): Change all
    occurance of ,ts-mode-indent-offset to ts-mode-indent-offset.
    * lisp/treesit.el (treesit-simple-indent-rules): Change docstring.
    (treesit-simple-indent): Allow offset to be a variable.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index e629679aea..5d9c4b15d8 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -4838,7 +4838,8 @@ Parser-based Indentation
 rule is applicable.  Then Emacs passes the node to @var{anchor}, which
 returns a buffer position.  Emacs takes the column number of that
 position, adds @var{offset} to it, and the result is the indentation
-column for the current line.
+column for the current line.  @var{offset} can be an integer or a
+variable whose value is an integer.
 
 The @var{matcher} and @var{anchor} are functions, and Emacs provides
 convenient defaults for them.
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index a3f0bc0ed3..8ec7e7c675 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3412,34 +3412,34 @@ js--treesit-indent-rules
        ((node-is ")") parent-bol 0)
        ((node-is "]") parent-bol 0)
        ((node-is ">") parent-bol 0)
-       ((parent-is "ternary_expression") parent-bol ,js-indent-level)
-       ((parent-is "member_expression") parent-bol ,js-indent-level)
+       ((parent-is "ternary_expression") parent-bol js-indent-level)
+       ((parent-is "member_expression") parent-bol js-indent-level)
        ((node-is ,switch-case) parent-bol 0)
        ;; "{" on the newline.
-       ((node-is "statement_block") parent-bol ,js-indent-level)
-       ((parent-is "named_imports") parent-bol ,js-indent-level)
-       ((parent-is "statement_block") parent-bol ,js-indent-level)
-       ((parent-is "variable_declarator") parent-bol ,js-indent-level)
-       ((parent-is "arguments") parent-bol ,js-indent-level)
-       ((parent-is "array") parent-bol ,js-indent-level)
-       ((parent-is "formal_parameters") parent-bol ,js-indent-level)
-       ((parent-is "template_substitution") parent-bol ,js-indent-level)
-       ((parent-is "object_pattern") parent-bol ,js-indent-level)
-       ((parent-is "object") parent-bol ,js-indent-level)
-       ((parent-is "pair") parent-bol ,js-indent-level)
-       ((parent-is "arrow_function") parent-bol ,js-indent-level)
-       ((parent-is "parenthesized_expression") parent-bol ,js-indent-level)
-       ((parent-is "class_body") parent-bol ,js-indent-level)
-       ((parent-is ,switch-case) parent-bol ,js-indent-level)
-       ((parent-is "statement_block") parent-bol ,js-indent-level)
+       ((node-is "statement_block") parent-bol js-indent-level)
+       ((parent-is "named_imports") parent-bol js-indent-level)
+       ((parent-is "statement_block") parent-bol js-indent-level)
+       ((parent-is "variable_declarator") parent-bol js-indent-level)
+       ((parent-is "arguments") parent-bol js-indent-level)
+       ((parent-is "array") parent-bol js-indent-level)
+       ((parent-is "formal_parameters") parent-bol js-indent-level)
+       ((parent-is "template_substitution") parent-bol js-indent-level)
+       ((parent-is "object_pattern") parent-bol js-indent-level)
+       ((parent-is "object") parent-bol js-indent-level)
+       ((parent-is "pair") parent-bol js-indent-level)
+       ((parent-is "arrow_function") parent-bol js-indent-level)
+       ((parent-is "parenthesized_expression") parent-bol js-indent-level)
+       ((parent-is "class_body") parent-bol js-indent-level)
+       ((parent-is ,switch-case) parent-bol js-indent-level)
+       ((parent-is "statement_block") parent-bol js-indent-level)
 
        ;; JSX
-       ((parent-is "jsx_opening_element") parent ,js-indent-level)
+       ((parent-is "jsx_opening_element") parent js-indent-level)
        ((node-is "jsx_closing_element") parent 0)
-       ((node-is "jsx_text") parent ,js-indent-level)
-       ((parent-is "jsx_element") parent ,js-indent-level)
+       ((node-is "jsx_text") parent js-indent-level)
+       ((parent-is "jsx_element") parent js-indent-level)
        ((node-is "/") parent 0)
-       ((parent-is "jsx_self_closing_element") parent ,js-indent-level)))))
+       ((parent-is "jsx_self_closing_element") parent js-indent-level)))))
 
 (defvar js--treesit-keywords
   '("as" "async" "await" "break" "case" "catch" "class" "const" "continue"
@@ -3852,11 +3852,11 @@ js-json--treesit-font-lock-settings
 
 (defvar js--json-treesit-indent-rules
   `((json
-     (no-node (js--treesit-backward-up-list) ,js-indent-level)
+     (no-node (js--treesit-backward-up-list) js-indent-level)
      ((node-is "}") parent-bol 0)
      ((node-is ")") parent-bol 0)
      ((node-is "]") parent-bol 0)
-     ((parent-is "object") parent-bol ,js-indent-level)
+     ((parent-is "object") parent-bol js-indent-level)
      )))
 
 ;;;###autoload
diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el
index a7dee1ead8..f4dfa2ae95 100644
--- a/lisp/progmodes/ts-mode.el
+++ b/lisp/progmodes/ts-mode.el
@@ -60,29 +60,29 @@ ts-mode--indent-rules
      ((node-is ")") parent-bol 0)
      ((node-is "]") parent-bol 0)
      ((node-is ">") parent-bol 0)
-     ((parent-is "ternary_expression") parent-bol ,ts-mode-indent-offset)
-     ((parent-is "member_expression") parent-bol ,ts-mode-indent-offset)
-     ((parent-is "named_imports") parent-bol ,ts-mode-indent-offset)
-     ((parent-is "statement_block") parent-bol ,ts-mode-indent-offset)
-     ((parent-is "type_arguments") parent-bol ,ts-mode-indent-offset)
-     ((parent-is "variable_declarator") parent-bol ,ts-mode-indent-offset)
-     ((parent-is "arguments") parent-bol ,ts-mode-indent-offset)
-     ((parent-is "array") parent-bol ,ts-mode-indent-offset)
-     ((parent-is "formal_parameters") parent-bol ,ts-mode-indent-offset)
-     ((parent-is "template_substitution") parent-bol ,ts-mode-indent-offset)
-     ((parent-is "object_pattern") parent-bol ,ts-mode-indent-offset)
-     ((parent-is "object") parent-bol ,ts-mode-indent-offset)
-     ((parent-is "object_type") parent-bol ,ts-mode-indent-offset)
-     ((parent-is "enum_body") parent-bol ,ts-mode-indent-offset)
-     ((parent-is "arrow_function") parent-bol ,ts-mode-indent-offset)
-     ((parent-is "parenthesized_expression") parent-bol ,ts-mode-indent-offset)
+     ((parent-is "ternary_expression") parent-bol ts-mode-indent-offset)
+     ((parent-is "member_expression") parent-bol ts-mode-indent-offset)
+     ((parent-is "named_imports") parent-bol ts-mode-indent-offset)
+     ((parent-is "statement_block") parent-bol ts-mode-indent-offset)
+     ((parent-is "type_arguments") parent-bol ts-mode-indent-offset)
+     ((parent-is "variable_declarator") parent-bol ts-mode-indent-offset)
+     ((parent-is "arguments") parent-bol ts-mode-indent-offset)
+     ((parent-is "array") parent-bol ts-mode-indent-offset)
+     ((parent-is "formal_parameters") parent-bol ts-mode-indent-offset)
+     ((parent-is "template_substitution") parent-bol ts-mode-indent-offset)
+     ((parent-is "object_pattern") parent-bol ts-mode-indent-offset)
+     ((parent-is "object") parent-bol ts-mode-indent-offset)
+     ((parent-is "object_type") parent-bol ts-mode-indent-offset)
+     ((parent-is "enum_body") parent-bol ts-mode-indent-offset)
+     ((parent-is "arrow_function") parent-bol ts-mode-indent-offset)
+     ((parent-is "parenthesized_expression") parent-bol ts-mode-indent-offset)
 
      ;; TSX
-     ((parent-is "jsx_opening_element") parent ,ts-mode-indent-offset)
+     ((parent-is "jsx_opening_element") parent ts-mode-indent-offset)
      ((node-is "jsx_closing_element") parent 0)
-     ((parent-is "jsx_element") parent ,ts-mode-indent-offset)
+     ((parent-is "jsx_element") parent ts-mode-indent-offset)
      ((node-is "/") parent 0)
-     ((parent-is "jsx_self_closing_element") parent ,ts-mode-indent-offset)
+     ((parent-is "jsx_self_closing_element") parent ts-mode-indent-offset)
      (no-node parent-bol 0)))
   "Tree-sitter indent rules.")
 
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 09e5d8084e..7233ce7f18 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -894,8 +894,9 @@ treesit-simple-indent-rules
 uses ANCHOR to find an anchor, it should be a function that takes
 the same argument (NODE PARENT BOL) and returns a point.
 
-Finally Emacs computes the column of that point returned by ANCHOR
-and adds OFFSET to it, and indents to that column.
+Finally Emacs computes the column of that point returned by
+ANCHOR and adds OFFSET to it, and indents to that column.  OFFSET
+can be an integer or a variable whose value is an integer.
 
 For MATCHER and ANCHOR, Emacs provides some convenient presets.
 See `treesit-simple-indent-presets'.")
@@ -1298,7 +1299,9 @@ treesit-simple-indent
                (let ((anchor-pos
                       (treesit--simple-indent-eval
                        (list anchor node parent bol))))
-                 (cons anchor-pos offset))
+                 (cons anchor-pos (if (symbolp offset)
+                                      (symbol-value offset)
+                                    offset)))
                finally return
                (progn (when treesit--indent-verbose
                         (message "No matched rule"))

commit f847ecc40bc768d97ba57083fd669ca0104e500f
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Nov 5 17:09:51 2022 -0700

    Don't indent empty lines in treesit-indent-region
    
    * lisp/treesit.el (treesit-indent-region): Wrap the old code in an if
    form that checks whether we are at an empty line.  Add comments.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 02bf026bc0..09e5d8084e 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1184,6 +1184,8 @@ treesit-indent
         (when (> (- (point-max) delta) (point))
           (goto-char (- (point-max) delta)))))))
 
+;; Batch size can't be too large, because we put markers on each
+;; ANCHOR, so a batch size of 400 lines means 400 markers.
 (defvar treesit--indent-region-batch-size 400
   "How many lines of indent value do we precompute.
 In `treesit-indent-region' we indent in batches: precompute
@@ -1195,12 +1197,21 @@ treesit-indent-region
   "Indent the region between BEG and END.
 Similar to `treesit-indent', but indent a region instead."
   (treesit-update-ranges beg end)
+  ;; We indent `treesit--indent-region-batch-size' lines at a time, to
+  ;; reduce the number of times the parser needs to re-parse.  In each
+  ;; batch, we go through each line and calculate the anchor and
+  ;; offset as usual, but instead of modifying the buffer, we save
+  ;; these information in a vector.  Once we've collected ANCHOR and
+  ;; OFFSET for each line in the batch, we go through each line again
+  ;; and apply the changes.  Now that buffer is modified, we need to
+  ;; reparse the buffer before continuing to indent the next batch.
   (let* ((meta-len 2)
          (vector-len (* meta-len treesit--indent-region-batch-size))
          ;; This vector saves the indent meta for each line in the
-         ;; batch.  It is a vector of [ANCHOR OFFSET BOL DELTA], where
-         ;; BOL is the position of BOL of that line, and DELTA =
-         ;; DESIRED-INDENT - CURRENT-INDENT.
+         ;; batch.  It is a vector [ANCHOR OFFSET ANCHOR OFFSET...].
+         ;; ANCHOR is a marker on the anchor position, and OFFSET is
+         ;; an integer.  ANCHOR and OFFSET are either both nil, or
+         ;; both valid.
          (meta-vec (make-vector vector-len 0))
          (lines-left-to-move 0)
          (end (copy-marker end t))
@@ -1217,16 +1228,22 @@ treesit-indent-region
         (while (and (eq lines-left-to-move 0)
                     (< idx treesit--indent-region-batch-size)
                     (< (point) end))
-          (pcase-let* ((`(,anchor . ,offset) (treesit--indent-1))
-                       (marker (aref meta-vec (* idx meta-len))))
-            ;; Set ANCHOR.
-            (when anchor
-              (if (markerp marker)
-                  (move-marker marker anchor)
-                (setf (aref meta-vec (* idx meta-len))
-                      (copy-marker anchor t))))
-            ;; SET OFFSET.
-            (setf (aref meta-vec (+ 1 (* idx meta-len))) offset))
+          (if (looking-at (rx (* whitespace) eol) t)
+              ;; Unlike in `indent-line' where we sometimes pre-indent
+              ;; an empty line, We don't indent empty lines in
+              ;; `indent-region'.  Set ANCHOR and OFFSET to nil.
+              (setf (aref meta-vec (* idx meta-len)) nil
+                    (aref meta-vec (+ 1 (* idx meta-len))) nil)
+            (pcase-let* ((`(,anchor . ,offset) (treesit--indent-1))
+                         (marker (aref meta-vec (* idx meta-len))))
+              ;; Set ANCHOR.
+              (when anchor
+                (if (markerp marker)
+                    (move-marker marker anchor)
+                  (setf (aref meta-vec (* idx meta-len))
+                        (copy-marker anchor t))))
+              ;; SET OFFSET.
+              (setf (aref meta-vec (+ 1 (* idx meta-len))) offset)))
           (cl-incf idx)
           (setq lines-left-to-move (forward-line 1)))
         ;; Now IDX = last valid IDX + 1.

commit b471f7f6141b3db8fb00f62f12900846f59beb9a
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Nov 5 16:55:17 2022 -0700

    Make treesit-language-at work in more situations
    
    ; * lisp/treesit.el (treesit-language-at): Return sometime sensible
    even if treesit-language-at-point-function is nil.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 515caf568c..02bf026bc0 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -147,9 +147,14 @@ treesit-language-at-point-function
 
 (defun treesit-language-at (position)
   "Return the language at POSITION.
-Assumes parser ranges are up-to-date."
-  (when treesit-language-at-point-function
-    (funcall treesit-language-at-point-function position)))
+Assumes parser ranges are up-to-date.  Returns the return value
+of `treesit-language-at-point-function' if it's non-nil,
+otherwise return the language of the first parser in
+`treesit-parser-list', or nil if there is no parser."
+  (if treesit-language-at-point-function
+      (funcall treesit-language-at-point-function position)
+    (when-let ((parser (car (treesit-parser-list))))
+      (treesit-parser-language parser))))
 
 ;;; Node API supplement
 

commit 5fbb7a126d19b41848b57e7e012619fa13cfa4d2
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Nov 5 16:52:38 2022 -0700

    ; Fix documentation for tree-sitter
    
    * doc/lispref/modes.texi (Parser-based Font Lock): Fix the signature
    style.
    * doc/lispref/parsing.texi (Language Definitions): Rephrase the
    section, remove documentation for deleted functions, fix signature
    style.
    * lisp/treesit.el (treesit-range-rules)
    (treesit-font-lock-rules): Change ARGS to QUERY-SPECS, fix docstring.
    * lisp/treesit.el (treesit-inspect-mode): Fix docstring.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 77b6f9a2fb..e629679aea 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3930,7 +3930,7 @@ Parser-based Font Lock
 @code{treesit-font-lock-rules}, then call
 @code{treesit-major-mode-setup}.
 
-@defun treesit-font-lock-rules :keyword value query...
+@defun treesit-font-lock-rules &rest query-specs
 This function is used to set @var{treesit-font-lock-settings}.  It
 takes care of compiling queries and other post-processing, and outputs
 a value that @var{treesit-font-lock-settings} accepts.  Here's an
@@ -3950,13 +3950,18 @@ Parser-based Font Lock
 @end group
 @end example
 
-This function takes a list of text or s-exp queries.  Before each
-query, there are @var{:keyword}-@var{value} pairs that configure
-that query.  The @code{:lang} keyword sets the query's language and
-every query must specify the language.  The @code{:feature} keyword
-sets the feature name of the query.  Users can control which features
-are enabled with @code{font-lock-maximum-decoration} and
-@code{treesit-font-lock-feature-list} (see below).
+This function takes a list of @var{query-spec}s of the form
+@w{@code{@var{:keyword} @var{value} @dots{} @var{query}}}.  Each
+@var{query} is a tree-sitter query in either the string, s-expression
+or compiled form.
+
+Before each query, there are @var{:keyword} @var{value} pairs that
+configure that query.  The @code{:lang} keyword sets the query's
+language.  The @code{:feature} keyword sets the feature name of the
+query.  Users can control which features are enabled with
+@code{font-lock-maximum-decoration} and
+@code{treesit-font-lock-feature-list} (described below).  These two
+keywords are mandated.
 
 Other keywords are optional:
 
@@ -4055,10 +4060,13 @@ Parser-based Font Lock
 
 @defvar treesit-font-lock-settings
 A list of settings for tree-sitter based font lock.  The exact format
-of this variable is considered internal.  One should always use
+of each setting is considered internal.  One should always use
 @code{treesit-font-lock-rules} to set this variable.
-@c Because the format is internal, we don't document them here.
-@c Though we do have it explained in the docstring.
+
+@c Because the format is internal, we don't document them here.  Though
+@c we do have it explained in the docstring.  We also expose the fact
+@c that it is a list of settings, so one could combine two of them with
+@c append.
 @end defvar
 
 Multi-language major modes should provide range functions in
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 92c7bf6dad..7f7d49b04b 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -228,18 +228,20 @@ Language Definitions
 at point.  The mode-line will display
 
 @example
-@var{parent} @var{field}: (@var{child} (@var{grandchild} (@dots{})))
+@var{parent} @var{field}: (@var{node} (@var{child} (@dots{})))
 @end example
 
-@var{child}, @var{grand}, @var{grand-grandchild}, etc., are nodes that
-begin at point.  @var{parent} is the parent node of @var{child}.
+where @var{node}, @var{child}, etc, are nodes which begin at point.
+@var{parent} is the parent of @var{node}.  @var{node} is displayed in
+bold typeface.  @var{field-name}s are field names of @var{node} and
+@var{child}, etc.
 
-If there is no node that starts at point, i.e., point is in the middle
-of a node, then the mode-line only displays the smallest node that
-spans the position of point, and its immediate parent.
+If no node starts at point, i.e., point is in the middle of a node,
+then the mode line displays the earliest node that spans point, and
+its immediate parent.
 
-This minor mode doesn't create parsers on its own.  It simply uses the
-first parser in @code{(treesit-parser-list)} (@pxref{Using Parser}).
+This minor mode doesn't create parsers on its own.  It uses the first
+parser in @code{(treesit-parser-list)} (@pxref{Using Parser}).
 @end deffn
 
 @heading Reading the grammar definition
@@ -1326,15 +1328,20 @@ Multiple Languages
 need to be assigned different parsers.  Traditionally, this is
 achieved by using narrowing.  While tree-sitter works with narrowing
 (@pxref{tree-sitter narrowing, narrowing}), the recommended way is
-instead to set regions of buffer text in which a parser will operate.
+instead to set regions of buffer text (i.e., ranges) in which a parser
+will operate.  This section describes functions for setting and
+getting ranges for a parser.
 
-@c FIXME: This text should be expanded, as it doesn't explain who do
-@c the other functions in this node related to supporting multiple
-@c languages.
-Specifically, a multi-language major mode should set
-@code{treesit-language-at-point-function} and
-@code{treesit-range-settings} for Emacs to handle multiple languages
-in the same buffer.
+Lisp programs should call @code{treesit-update-ranges} to make sure
+the ranges for each parser are correct before using parsers in a
+buffer, and call @code{treesit-language-at} to figure out the language
+responsible for the text at some position.  Multi-language major modes
+sets @code{treesit-range-settings} and
+@code{treesit-language-at-point-function} respectively to power these
+two functions.  These functions and variables are explained in more
+detail towards the end of the section.
+
+@heading Getting and setting ranges
 
 @defun treesit-parser-set-included-ranges parser ranges
 This function sets up @var{parser} to operate on @var{ranges}.  The
@@ -1389,22 +1396,6 @@ Multiple Languages
 @end example
 @end defun
 
-@defun treesit-set-ranges parser-or-lang ranges
-Like @code{treesit-parser-set-included-ranges}, this function sets
-the ranges of @var{parser-or-lang} to @var{ranges}.  Conveniently,
-@var{parser-or-lang} could be either a parser or a language.  If it is
-a language, this function looks for the first parser in
-@code{(treesit-parser-list)} for that language in the current buffer,
-and sets the ranges for it.
-@end defun
-
-@defun treesit-get-ranges parser-or-lang
-This function returns the ranges of @var{parser-or-lang}, like
-@code{treesit-parser-included-ranges}.  And like
-@code{treesit-set-ranges}, @var{parser-or-lang} can be a parser or
-a language symbol.
-@end defun
-
 @defun treesit-query-range source query &optional beg end
 This function matches @var{source} with @var{query} and returns the
 ranges of captured nodes.  The return value is a list of cons cells of
@@ -1426,37 +1417,55 @@ Multiple Languages
 @code{treesit-query-error} error if @var{query} is malformed.
 @end defun
 
+@heading Supporting multiple languages as Lisp programs
+
+It should suffice for general Lisp programs to call these two
+functions in order to support program sources that mixes multiple
+languages.
+
 @defun treesit-update-ranges &optional beg end
-This function is used by fontifications and indentation to update
-ranges before using any parser.  It makes sure the parsers' ranges are
-set correctly between @var{beg} and @var{end}, according to
-@code{treesit-range-settings}.  If omitted, @var{beg} defaults to the
-beginning of the buffer, and @var{end} defaults to the end of the
-buffer.
+This function updates ranges for parsers in the buffer.  It makes sure
+the parsers' ranges are set correctly between @var{beg} and @var{end},
+according to @code{treesit-range-settings}.  If omitted, @var{beg}
+defaults to the beginning of the buffer, and @var{end} defaults to the
+end of the buffer.
+
+For example, fontification functions uses this function before
+querying for nodes in a region.
 @end defun
 
-@vindex treesit-language-at-point-function
 @defun treesit-language-at pos
-This function tries to figure out which language is responsible for
-the text at buffer position @var{pos}.  Under the hood it just calls
-@code{treesit-language-at-point-function}, which is a function that
-takes the same argument as this function.
-
-Various Lisp programs use this function.  For example, the indentation
-program uses this function to determine which language's rule to use
-in a multi-language buffer.
+This function returns the language of the text at buffer position
+@var{pos}.  Under the hood it calls
+@code{treesit-language-at-point-function} and returns its return
+value.  If @code{treesit-language-at-point-function} is @code{nil},
+this function returns the language of the first parser in the returned
+value of @code{treesit-parser-list}.  If there is no parser in the
+buffer, it returns @code{nil}.
 @end defun
 
-@heading An example
+@heading Supporting multiple languages as major modes
 
+@cindex host language, tree-sitter
+@cindex tree-sitter host language
+@cindex embedded language, tree-sitter
+@cindex tree-sitter embedded language
 Normally, in a set of languages that can be mixed together, there is a
-main language and several embedded languages.  A Lisp program usually
-first parses the whole document with the major language's parser, sets
-ranges for the embedded languages, and then parses the embedded
+host language and one or more embedded languages.  A Lisp program
+usually first parses the whole document with the host language's
+parser, retrieve some information, sets ranges for the embedded
+languages with that information, and then parses the embedded
 languages.
 
-Suppose we need to parse a very simple document that mixes
-@acronym{HTML}, @acronym{CSS} and JavaScript:
+Take a buffer containing @acronym{HTML}, @acronym{CSS} and JavaScript
+as an example.  A lisp program will first parse the whole buffer with
+an @acronym{HTML} parser, then query the parser for
+@code{style_element} and @code{script_element} nodes, which
+corresponds to @acronym{CSS} and JavaScript text, respectively.  Then
+it sets the range of the @acronym{CSS} and JavaScript parser to the
+range in which their corresponding nodes span.
+
+Given a simple @acronym{HTML} document:
 
 @example
 @group
@@ -1467,8 +1476,8 @@ Multiple Languages
 @end group
 @end example
 
-We first parse with @acronym{HTML}, then set ranges for @acronym{CSS}
-and JavaScript:
+A Lisp program will first parse with a @acronym{HTML} parser, then set
+ranges for @acronym{CSS} and JavaScript parsers:
 
 @example
 @group
@@ -1497,14 +1506,13 @@ Multiple Languages
 @end group
 @end example
 
-We use a query pattern @w{@code{(style_element (raw_text) @@capture)}}
-to find @acronym{CSS} nodes in the @acronym{HTML} parse tree.  For how
-to write query patterns, @pxref{Pattern Matching}.
-
-Emacs can automate the above process in @code{treesit-update-ranges}.
-For it to work, a Lisp program should set
-@code{treesit-range-settings} to the output of
-@code{treesit-range-rules}, like in the following example:
+Emacs automates this process in @code{treesit-update-ranges}.  A
+multi-language major mode should set @code{treesit-range-settings} so
+that this function knows how to perform this process automatically.
+Major modes should use the helper function @code{treesit-range-rules}
+to generate the value that @code{treesit-range-settings} can have.
+The settings in the following example directly translates to
+operations shown above.
 
 @example
 @group
@@ -1512,51 +1520,66 @@ Multiple Languages
             (treesit-range-rules
              :embed 'javascript
              :host 'html
-             '((script_element (raw_text) @@cap))
+             '((script_element (raw_text) @@capture))
 @end group
 
 @group
              :embed 'css
              :host 'html
-             '((style_element (raw_text) @@cap))))
+             '((style_element (raw_text) @@capture))))
 @end group
 @end example
 
-@c FIXME: This is NOT how we document series of 3 arguments!  It is
-@c better to use ``&rest query-specs'' instead, and then tell that
-@c each query-spec is a triplet of :keyword, value, and the query
-@c itself.  But then the doc string of the function and its advertised
-@c calling sequence, should be changed accordingly.
-@defun treesit-range-rules :keyword value query...
+@defun treesit-range-rules &rest query-specs
 This function is used to set @var{treesit-range-settings}.  It
 takes care of compiling queries and other post-processing, and outputs
 a value that @var{treesit-range-settings} can have.
 
-It takes a series of one or more @var{query}s in either the string,
-s-expression or compiled form.  Each @var{query} should be preceded by
-a pair of @var{:keyword} and @var{value} that configure the query (and
-only that query).
-
-@c FIXME: The notion of ``host language'' was never explained.  We do
-@c mention ``embedded language'', but without a @dfn and without an
-@c index entry to find it; that should also be fixed.
-For each query, the @code{:embed} keyword specifies the embedded
-language, and the @code{:host} keyword specified the host language.
-@c FIXME: The next sentence is not clear: what does it mean ``to set
-@c ranges in the embedded language''?
-Emacs queries the @var{query} in the host language and uses the result
-to set ranges for the embedded language.
-
-@c FIXME: ``It only needs to ensure...'' is not clear.  What does
-@c ``only'' refer to? does it mean that's the only purpose of such a
-@c function?
-A @var{query} can also be a function that takes two arguments,
-@var{start} and @var{end}, and sets the range for parsers.  It only
-needs to ensure ranges between @var{start} and @var{end} is correct.
-@c FIXME: This should be at the beginning of the description.
-When @var{query} is a function, it doesn't need keywords before it.
+It takes a series of @var{query-spec}s, where each @var{query-spec} is
+of the form @w{@code{@var{:keyword} @var{value} @dots{} @var{query}}}.
+Each @var{query} is a tree-sitter query in either the string,
+s-expression or compiled form, or a function.
+
+If @var{query} is a tree-sitter qurey, it should be preceded by 2
+pairs of @var{:keyword} and @var{value}, where the @code{:embed}
+keyword specifies the @dfn{embedded language}, and the @code{:host}
+keyword specified the @dfn{host language}.
+
+@code{treesit-update-ranges} uses @var{query} to figure out how to set
+the ranges for parsers for the embedded language.  It queries
+@var{query} in a host language parser, computes the ranges in which
+the captured nodes span, and applies these ranges to embedded
+language parsers.
+
+If @var{query} is a function, it doesn't need any @var{keyword} and
+@var{value} pair.  It should be a function that takes 2 arguments,
+@var{start} and @var{end}, and sets the ranges for parsers in the
+current buffer in the region between @var{start} and @var{end}.  It is
+fine for this function to set ranges in a larger region that
+encompasses the region between @var{start} and @var{end}.
 @end defun
 
+@defvar treesit-range-settings
+This variable helps @code{treesit-update-ranges} to update ranges for
+parsers in the buffer.  It is a list of @var{setting}s where the exact
+format of a @var{setting} is considered internal.  You should use
+@code{treesit-range-rules} to generate a value that this variable can
+have.
+
+@c Because the format is internal, we don't document them here.  Though
+@c we do have it explained in the docstring.  We also expose the fact
+@c that it is a list of settings, so one could combine two of them with
+@c append.
+@end defvar
+
+
+@defvar treesit-language-at-point-function
+This variable's value should be a function that takes a single
+argument, @var{pos}, which is a buffer position, and returns the
+language of the buffer text at @var{pos}.  This variable is used by
+@code{treesit-language-at}.
+@end defvar
+
 @node Tree-sitter major modes
 @section Developing major modes with tree-sitter
 @cindex major mode, developing with tree-sitter
@@ -1564,8 +1587,8 @@ Tree-sitter major modes
 This section covers some general guidelines on developing tree-sitter
 integration for a major mode.
 
-In general, a major mode supporting tree-sitter features should
-roughly follow this pattern:
+A major mode supporting tree-sitter features should roughly follow
+this pattern:
 
 @example
 @group
@@ -1593,8 +1616,9 @@ Tree-sitter major modes
 checks whether the user turned on tree-sitter for @var{mode}
 (according to @code{treesit-settings}), whether Emacs was built with
 tree-sitter, whether the buffer's size is not too large for
-tree-sitter to handle it, and whether support for @var{language} is
-available in tree-sitter.
+tree-sitter to handle it, and whether language definition for
+@var{language} is available on the system (@pxref{Language
+Definitions}).
 
 When the user sets @var{mode} to @var{demand} in @code{treesit-settings},
 this function emits a warning if tree-sitter cannot be activated.  If
@@ -1605,7 +1629,7 @@ Tree-sitter major modes
 @code{treesit-settings}.
 
 If all the necessary conditions are met, this function returns
-non-@code{nil}; otherwise it return @code{nil}.
+non-@code{nil}; otherwise it returns @code{nil}.
 @end defun
 
 Next, the major mode should set up tree-sitter variables and call
@@ -1633,6 +1657,9 @@ Tree-sitter major modes
 @pxref{Parser-based Font Lock}, @pxref{Parser-based Indentation}, and
 @pxref{List Motion}.
 
+For supporting mixing of multiple languages in a major mode,
+@pxref{Multiple Languages}.
+
 @node Tree-sitter C API
 @section Tree-sitter C API Correspondence
 
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 7c2aeae40d..515caf568c 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -363,42 +363,47 @@ treesit-range-settings
 arguments, START and END.  It should ensure parsers' ranges are
 correct in the region between START and END.
 
-The exact form of the variable is considered internal and subject
+The exact form of each setting is considered internal and subject
 to change.  Use `treesit-range-rules' to set this variable.")
 
-(defun treesit-range-rules (&rest args)
+(defun treesit-range-rules (&rest query-specs)
   "Produce settings for `treesit-range-settings'.
 
-Take a series of QUERYs in either the string, s-expression or
-compiled form.
+QUERY-SPECS contains a series of QUERY-SPEC of the form
 
-Each QUERY should be preceded by a :KEYWORD VALUE pair that
-configures the query (and only that query).  For example,
+    :KEYWORD VALUE... QUERY
+
+Each QUERY is a tree-sitter query in either the string,
+s-expression or compiled form.
+
+Each QUERY should be preceded by :KEYWORD VALUE pairs that
+configures this query.  For example,
 
     (treesit-range-rules
      :embed \\='javascript
      :host \\='html
      \\='((script_element (raw_text) @cap)))
 
-For each query, the `:embed' keyword specifies the embedded language,
-the `:host' keyword specified the host (main) language.  Emacs queries
-the QUERY in the host language and uses the result to set ranges for
-the embedded language.
+The `:embed' keyword specifies the embedded language, and the
+`:host' keyword specifies the host language.  They are used in
+this way: Emacs queries QUERY in the host language's parser,
+computes the ranges spanned by the captured nodes, and applies
+these ranges to parsers for the embedded language.
 
 QUERY can also be a function that takes two arguments, START and
-END, and sets the range for parsers.  The function only needs to
-ensure ranges between START and END is correct.  If QUERY is a
-function, it doesn't need to have the :KEYWORD VALUE pair before it.
-
-\(:KEYWORD VALUE QUERY...)"
+END.  If QUERY is a function, it doesn't need :KEYWORD VALUE
+pairs preceding it.  This function should set the ranges for
+parsers in the current buffer in the region between START and
+END.  It is OK for this function to set ranges in a larger region
+that encompasses the region between START and END."
   (let (host embed result)
-    (while args
-      (pcase (pop args)
-        (:host (let ((host-lang (pop args)))
+    (while query-specs
+      (pcase (pop query-specs)
+        (:host (let ((host-lang (pop query-specs)))
                  (unless (symbolp host-lang)
                    (signal 'treesit-error (list "Value of :host option should be a symbol" host-lang)))
                  (setq host host-lang)))
-        (:embed (let ((embed-lang (pop args)))
+        (:embed (let ((embed-lang (pop query-specs)))
                   (unless (symbolp embed-lang)
                     (signal 'treesit-error (list "Value of :embed option should be a symbol" embed-lang)))
                   (setq embed embed-lang)))
@@ -528,8 +533,8 @@ treesit-font-lock-feature-list
 (defvar-local treesit-font-lock-settings nil
   "A list of SETTINGs for treesit-based fontification.
 
-The exact format of this variable is considered internal.  One
-should always use `treesit-font-lock-rules' to set this variable.
+The exact format of each SETTING is considered internal.  Use
+`treesit-font-lock-rules' to set this variable.
 
 Each SETTING has the form:
 
@@ -549,11 +554,15 @@ treesit-font-lock-settings
 t, nil, append, prepend, keep.  See more in
 `treesit-font-lock-rules'.")
 
-(defun treesit-font-lock-rules (&rest args)
+(defun treesit-font-lock-rules (&rest query-specs)
   "Return a value suitable for `treesit-font-lock-settings'.
 
-Take a series of QUERIES in either string, s-expression or
-compiled form.  For each query, captured nodes are highlighted
+QUERY-SPECS is made of a series of QUERY-SPECs of the form
+
+   :KEYWORD VALUE... QUERY
+
+QUERY is a tree-sitter query in either the string, s-expression
+or compiled form.  For each query, captured nodes are highlighted
 with the capture name as its face.
 
 Before each QUERY there could be :KEYWORD VALUE pairs that
@@ -600,9 +609,7 @@ treesit-font-lock-rules
 
 If a capture name is both a face and a function, the face takes
 priority.  If a capture name is not a face name nor a function
-name, it is ignored.
-
-\(fn :KEYWORD VALUE QUERY...)"
+name, it is ignored."
   ;; Other tree-sitter function don't tend to be called unless
   ;; tree-sitter is enabled, which means tree-sitter must be compiled.
   ;; But this function is usually call in `defvar' which runs
@@ -615,19 +622,19 @@ treesit-font-lock-rules
           current-feature
           ;; The list this function returns.
           (result nil))
-      (while args
-        (let ((token (pop args)))
+      (while query-specs
+        (let ((token (pop query-specs)))
           (pcase token
             ;; (1) Process keywords.
             (:language
-             (let ((lang (pop args)))
+             (let ((lang (pop query-specs)))
                (when (or (not (symbolp lang)) (null lang))
                  (signal 'treesit-font-lock-error
                          `("Value of :language should be a symbol"
                            ,lang)))
                (setq current-language lang)))
             (:override
-             (let ((flag (pop args)))
+             (let ((flag (pop query-specs)))
                (when (not (memq flag '(t nil append prepend keep)))
                  (signal 'treesit-font-lock-error
                          `("Value of :override should be one of t, nil, append, prepend, keep"
@@ -637,7 +644,7 @@ treesit-font-lock-rules
                            ,flag)))
                (setq current-override flag)))
             (:feature
-             (let ((var (pop args)))
+             (let ((var (pop query-specs)))
                (when (or (not (symbolp var))
                          (memq var '(t nil)))
                  (signal 'treesit-font-lock-error
@@ -1563,7 +1570,6 @@ treesit-inspect-node-at-point
           (message "%s" treesit--inspect-name)
         (message "No node at point")))))
 
-;; FIXME: in the next doc string, what is FIELD-NAME?
 (define-minor-mode treesit-inspect-mode
   "Minor mode that displays in the mode-line the node which starts at point.
 
@@ -1571,8 +1577,10 @@ treesit-inspect-mode
 
     PARENT FIELD-NAME: (NODE FIELD-NAME: (CHILD (...)))
 
-where NODE, CHILD, etc, are nodes which begin at point.
-PARENT is the parent of NODE.  NODE is displayed in bold typeface.
+where NODE, CHILD, etc, are nodes which begin at point.  PARENT
+is the parent of NODE.  NODE is displayed in bold typeface.
+FIELD-NAMEs are field names of NODE and CHILD, etc (see Info
+node `(elisp)Language Definitions', heading \"Field names\").
 
 If no node starts at point, i.e., point is in the middle of a
 node, then the mode line displays the earliest node that spans point,

commit d4e8c90b66b4aba66ff1a12a0894a33af91feb0e
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Nov 5 10:49:46 2022 +0200

    ; Minor fixes to documentation
    
    * lisp/treesit.el (treesit-ready-p, treesit-inspect-mode)
    (treesit-range-settings, treesit-range-rules)
    (treesit--merge-ranges, treesit-update-ranges)
    (treesit-font-lock-rules, treesit-font-lock-feature-list)
    (treesit-font-lock-contextual-post-process)
    (treesit-font-lock-recompute-features): Doc fixes.
    * lisp/progmodes/js.el (js--fontify-template-string): Doc fix.
    
    * doc/lispref/modes.texi (Parser-based Indentation):
    * doc/lispref/positions.texi (List Motion):
    * doc/lispref/parsing.texi (Tree-sitter major modes):
    * doc/lispref/parsing.texi (Multiple Languages): Fix wording and
    markup.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index c1b092247b..77b6f9a2fb 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -4841,8 +4841,8 @@ Parser-based Indentation
 position of the first non-whitespace character after the beginning of
 the line.  The argument @var{node} is the largest (highest-in-tree)
 node that starts at that position; and @var{parent} is the parent of
-@var{node}.  However, when that position is on a whitespace or inside
-a multi-line string, no node that starts at that position, so
+@var{node}.  However, when that position is in a whitespace or inside
+a multi-line string, no node can start at that position, so
 @var{node} is @code{nil}.  In that case, @var{parent} would be the
 smallest node that spans that position.
 
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index a5b9a42211..92c7bf6dad 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -1318,7 +1318,6 @@ Pattern Matching
 
 @node Multiple Languages
 @section Parsing Text in Multiple Languages
-
 @cindex multiple languages, parsing with tree-sitter
 @cindex parsing multiple languages with tree-sitter
 Sometimes, the source of a programming language could contain snippets
@@ -1329,6 +1328,14 @@ Multiple Languages
 (@pxref{tree-sitter narrowing, narrowing}), the recommended way is
 instead to set regions of buffer text in which a parser will operate.
 
+@c FIXME: This text should be expanded, as it doesn't explain who do
+@c the other functions in this node related to supporting multiple
+@c languages.
+Specifically, a multi-language major mode should set
+@code{treesit-language-at-point-function} and
+@code{treesit-range-settings} for Emacs to handle multiple languages
+in the same buffer.
+
 @defun treesit-parser-set-included-ranges parser ranges
 This function sets up @var{parser} to operate on @var{ranges}.  The
 @var{parser} will only read the text of the specified ranges.  Each
@@ -1420,11 +1427,12 @@ Multiple Languages
 @end defun
 
 @defun treesit-update-ranges &optional beg end
-This function is used by fontification and indentation to update
-ranges before using any parser.  It makes sure the parsers' range are
+This function is used by fontifications and indentation to update
+ranges before using any parser.  It makes sure the parsers' ranges are
 set correctly between @var{beg} and @var{end}, according to
 @code{treesit-range-settings}.  If omitted, @var{beg} defaults to the
-beginning of the buffer, and @var{end} defaults to the end.
+beginning of the buffer, and @var{end} defaults to the end of the
+buffer.
 @end defun
 
 @vindex treesit-language-at-point-function
@@ -1496,7 +1504,7 @@ Multiple Languages
 Emacs can automate the above process in @code{treesit-update-ranges}.
 For it to work, a Lisp program should set
 @code{treesit-range-settings} to the output of
-@code{treesit-range-rules}, like the following.
+@code{treesit-range-rules}, like in the following example:
 
 @example
 @group
@@ -1514,30 +1522,41 @@ Multiple Languages
 @end group
 @end example
 
+@c FIXME: This is NOT how we document series of 3 arguments!  It is
+@c better to use ``&rest query-specs'' instead, and then tell that
+@c each query-spec is a triplet of :keyword, value, and the query
+@c itself.  But then the doc string of the function and its advertised
+@c calling sequence, should be changed accordingly.
 @defun treesit-range-rules :keyword value query...
 This function is used to set @var{treesit-range-settings}.  It
 takes care of compiling queries and other post-processing, and outputs
-a value that @var{treesit-range-settings} accepts.
-
-It takes a series of @var{queries} in either string, s-expression or
-compiled form.  Before each QUERY there must be @var{:keyword}
-@var{value} pairs that configure the query (and only that query).
-
-For each query, @code{:embed} keyword specifies the embedded language,
-and @code{:host} keyword specified the host language.  Emacs queries
-the @var{query} in the host language and uses the result to set ranges
-for the embedded language.
-
+a value that @var{treesit-range-settings} can have.
+
+It takes a series of one or more @var{query}s in either the string,
+s-expression or compiled form.  Each @var{query} should be preceded by
+a pair of @var{:keyword} and @var{value} that configure the query (and
+only that query).
+
+@c FIXME: The notion of ``host language'' was never explained.  We do
+@c mention ``embedded language'', but without a @dfn and without an
+@c index entry to find it; that should also be fixed.
+For each query, the @code{:embed} keyword specifies the embedded
+language, and the @code{:host} keyword specified the host language.
+@c FIXME: The next sentence is not clear: what does it mean ``to set
+@c ranges in the embedded language''?
+Emacs queries the @var{query} in the host language and uses the result
+to set ranges for the embedded language.
+
+@c FIXME: ``It only needs to ensure...'' is not clear.  What does
+@c ``only'' refer to? does it mean that's the only purpose of such a
+@c function?
 A @var{query} can also be a function that takes two arguments,
 @var{start} and @var{end}, and sets the range for parsers.  It only
 needs to ensure ranges between @var{start} and @var{end} is correct.
+@c FIXME: This should be at the beginning of the description.
 When @var{query} is a function, it doesn't need keywords before it.
 @end defun
 
-In summary, a multi-langauge major mode should set
-@code{treesit-language-at-function} and @code{treesit-range-settings}
-for Emacs to handle multiple languages in the same buffer.
-
 @node Tree-sitter major modes
 @section Developing major modes with tree-sitter
 @cindex major mode, developing with tree-sitter
@@ -1571,23 +1590,25 @@ Tree-sitter major modes
 
 @defun treesit-ready-p mode language &optional quiet
 This function checks for conditions for activating tree-sitter.  It
-checks whether the users turns tree-sitter on for @var{mode}
-(according to @code{treesit-settings}), whether tree-sitter is built
-with Emacs, the buffer's size, and whether @var{languag} is available.
+checks whether the user turned on tree-sitter for @var{mode}
+(according to @code{treesit-settings}), whether Emacs was built with
+tree-sitter, whether the buffer's size is not too large for
+tree-sitter to handle it, and whether support for @var{language} is
+available in tree-sitter.
 
-When user sets @var{mode} to @var{demand} in @code{treesit-settings},
+When the user sets @var{mode} to @var{demand} in @code{treesit-settings},
 this function emits a warning if tree-sitter cannot be activated.  If
-@var{quiet} is @code{message}, the warning is turned into a message,
+@var{quiet} is @code{message}, the warning is turned into a message;
 if @var{quiet} is @code{nil}, no warning or message is displayed.
 
 If @var{mode} is nil, this function doesn't check user's preference in
 @code{treesit-settings}.
 
-If all conditions are met, this function returns non-@code{nil}.
-Otherwise it return @code{nil}.
+If all the necessary conditions are met, this function returns
+non-@code{nil}; otherwise it return @code{nil}.
 @end defun
 
-Then, the major mode should setup tree-sitter variables, and call
+Next, the major mode should set up tree-sitter variables and call
 @code{treesit-major-mode-setup}.
 
 @defun treesit-major-mode-setup
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi
index 0c56ece185..a01e568de0 100644
--- a/doc/lispref/positions.texi
+++ b/doc/lispref/positions.texi
@@ -836,15 +836,15 @@ List Motion
 
 @findex treesit-beginning-of-defun
 @findex treesit-end-of-defun
-If Emacs is compiled with tree-sitter, it can use the parsed
+If Emacs is compiled with tree-sitter, it can use the tree-sitter parser
 information to move across syntax constructs.  A major mode can set
 @code{treesit-defun-type-regexp} and get navigation functionality for
 free, by using @code{treesit-beginning-of-defun} and
 @code{treesit-end-of-defun}.
 
 @defvar treesit-defun-type-regexp
-This is a regexp matching the node type of defun nodes.  (For
-``node'', ``node type'', @pxref{Parsing Program Source}.)
+The value of this variable is a regexp matching the node type of defun
+nodes.  (For ``node'', ``node type'', @pxref{Parsing Program Source}.)
 
 For example, @code{python-mode} sets this variable to a regexp that
 matches either @code{function_definition} or @code{class_definition}.
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index ab8239db9e..a3f0bc0ed3 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3588,7 +3588,7 @@ js--treesit-font-lock-settings
 
 (defun js--fontify-template-string (node override start end &rest _)
   "Fontify template string but not substitution inside it.
-NODE is the template_string node.  START and END marks the region
+NODE is the template_string node.  START and END mark the region
 to be fontified.
 
 OVERRIDE is the override flag described in
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 64a93aa670..7c2aeae40d 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -353,18 +353,15 @@ treesit-query-range
 (defvar-local treesit-range-settings nil
   "A list of range settings.
 
-A list of list of the form
-
-    (QUERY LANGUAGE)
-
+Each element of the list is of the form (QUERY LANGUAGE).
 When updating the range of each parser in the buffer,
-`treesit-update-ranges' queries each QUERY, and set LANGUAGE's
+`treesit-update-ranges' queries each QUERY, and sets LANGUAGE's
 range to the range spanned by captured nodes.  QUERY must be a
 compiled query.
 
 QUERY can also be a function, in which case it is called with 2
-arguments, START and END.  It should ensure parsers' range are
-correct in that region.
+arguments, START and END.  It should ensure parsers' ranges are
+correct in the region between START and END.
 
 The exact form of the variable is considered internal and subject
 to change.  Use `treesit-range-rules' to set this variable.")
@@ -372,26 +369,26 @@ treesit-range-settings
 (defun treesit-range-rules (&rest args)
   "Produce settings for `treesit-range-settings'.
 
-Take a series of QUERIES in either string, s-expression or
-compiled form.  For example,
+Take a series of QUERYs in either the string, s-expression or
+compiled form.
 
-Before each QUERY there must be :KEYWORD VALUE pairs that
-configure the query (and only that query).  For example,
+Each QUERY should be preceded by a :KEYWORD VALUE pair that
+configures the query (and only that query).  For example,
 
     (treesit-range-rules
      :embed \\='javascript
      :host \\='html
      \\='((script_element (raw_text) @cap)))
 
-For each query, :embed keyword specifies the embedded language,
-and :host keyword specified the host language.  Emacs queries the
-QUERY in the host language and uses the result to set ranges for
+For each query, the `:embed' keyword specifies the embedded language,
+the `:host' keyword specified the host (main) language.  Emacs queries
+the QUERY in the host language and uses the result to set ranges for
 the embedded language.
 
 QUERY can also be a function that takes two arguments, START and
 END, and sets the range for parsers.  The function only needs to
 ensure ranges between START and END is correct.  If QUERY is a
-function, it doesn't need to have keywords before it.
+function, it doesn't need to have the :KEYWORD VALUE pair before it.
 
 \(:KEYWORD VALUE QUERY...)"
   (let (host embed result)
@@ -418,14 +415,14 @@ treesit-range-rules
     (nreverse result)))
 
 (defun treesit--merge-ranges (old-ranges new-ranges start end)
-  "Merge OLD-RANGES and NEW-RANGES.
-Each range is a list of cons of the form (BEG . END).  When
+  "Merge OLD-RANGES and NEW-RANGES, discarding ranges between START and END.
+OLD-RANGES and NEW-RANGES are lists of cons of the form (BEG . END).  When
 merging the two ranges, if a range in OLD-RANGES intersects with
 another range in NEW-RANGES, discard the one in OLD-RANGES and
 keep the one in NEW-RANGES.  Also discard any range in OLD-RANGES
 that intersects the region marked by START and END.
 
-Return the merged range list."
+Return the merged list of ranges."
   (let ((result nil))
     (while (and old-ranges new-ranges)
       (let ((new-beg (caar new-ranges))
@@ -456,12 +453,12 @@ treesit--merge-ranges
 
 (defun treesit-update-ranges (&optional beg end)
   "Update the ranges for each language in the current buffer.
-If BEG and END not omitted, only update parser ranges in that
+If BEG and END are non-nil, only update parser ranges in that
 region."
   ;; When updating ranges, we want to avoid querying the whole buffer
   ;; which could be slow in very large buffers.  Instead, we only
   ;; query for nodes that intersect with the region between BEG and
-  ;; END.  And we only update the ranges intersecting BEG and END,
+  ;; END.  Also, we only update the ranges intersecting BEG and END;
   ;; outside of that region we inherit old ranges.
   (dolist (setting treesit-range-settings)
     (let ((query (nth 0 setting))
@@ -506,7 +503,7 @@ 'treesit-font-lock-error
 (defvar-local treesit-font-lock-feature-list nil
   "A list of lists of feature symbols.
 
-End-user should use `treesit-font-lock-recompute-features' and
+Use `treesit-font-lock-recompute-features' and
 `font-lock-maximum-decoration' to configure enabled features.
 
 Each sublist represents a decoration level.
@@ -591,15 +588,15 @@ treesit-font-lock-rules
 with that face.
 
 Capture names can also be function names, in which case the
-function should have a signature
+function will be called with the following argument list:
 
     (NODE OVERRIDE START END &rest _)
 
 where NODE is the tree-sitter node object, OVERRIDE is the
-override option of that rule, and START and END marks the region
+override option of that rule, and START and END specify the region
 to be fontified.  This function should accept more arguments as
-optional arguments for future extensibility.  And this function
-shouldn't fontify text outside START and END.
+optional arguments for future extensibility, and it shouldn't
+fontify text outside the region given by START and END.
 
 If a capture name is both a face and a function, the face takes
 priority.  If a capture name is not a face name nor a function
@@ -681,13 +678,13 @@ treesit-font-lock-recompute-features
   "Enable/disable font-lock settings according to decoration level.
 
 First compute the enabled features according to
-`treesit-font-lock-feature-list' and
-`font-lock-maximum-decoration', then if ADD-LIST or REMOVE-LIST
-are not omitted, further add and remove features accordingly.
+`treesit-font-lock-feature-list' and `font-lock-maximum-decoration',
+then, if ADD-LIST or REMOVE-LIST are not omitted, further add and
+remove features accordingly.
 
-ADD-LIST and REMOVE-LIST are each list of feature symbols.  The
-same feature symbol cannot not appear in both lists.  Otherwise
-signal `treesit-font-lock-error'."
+ADD-LIST and REMOVE-LIST are each a list of feature symbols.  The
+same feature symbol cannot appear in both lists; the function
+signals the `treesit-font-lock-error' error if so."
   (when-let ((intersection (cl-intersection add-list remove-list)))
     (signal 'treesit-font-lock-error
             (list "ADD-LIST and REMOVE-LIST contain the same feature"
@@ -752,26 +749,26 @@ treesit--set-nonsticky
       (put-text-property start end 'rear-nonsticky new-prop))))
 
 ;; This post-processing tries to deal with the following scenario:
-;; User inserts "/*", then go down the buffer and inserts "*/".
-;; Before the user inserts "*/", tree-sitter cannot construct a
-;; comment node and the parse tree is incomplete, and we can't fontify
-;; the comment.  But once the user inserts the "*/", the parse-tree is
-;; complete and we want to refontify the whole comment, and possibly
-;; text after comment (the "/*" could damage the parse tree enough
-;; that makes tree-sitter unable to produce reasonable information for
-;; text after it).
+;; User inserts "/*" in a buffer under C mode, then goes down the
+;; buffer and inserts "*/".  Before the user inserts "*/", tree-sitter
+;; cannot construct a comment node and the parse tree is incomplete,
+;; and we can't fontify the comment.  But once the user inserts the
+;; "*/", the parse-tree is complete and we want to refontify the whole
+;; comment, and possibly text after comment (the "/*" could damage the
+;; parse tree enough that makes tree-sitter unable to produce
+;; reasonable information for text after it).
 ;;
 ;; So we set jit-lock-context-unfontify-pos to comment start, and
 ;; jit-lock-context will refontify text after that position in a
 ;; timer.  Refontifying those text will end up calling this function
 ;; again, and we don't want to fall into infinite recursion.  So we
-;; mark the end of the comment with a text property, so we can
-;; distinguish between initial and follow up invocation of this
+;; mark the end of the comment with a text property, to be able to
+;; distinguish between initial and follow-up invocation of this
 ;; function.
 (defun treesit-font-lock-contextual-post-process
     (node start end &optional verbose)
-  "Post-processing for contextual syntax nodes.
-NODE is a comment or string node, START and END are the region
+  "Post-process contextual syntax NODE for fontification between START and END.
+NODE is a comment or string node, START and END specify the region
 being fontified.
 
 If VERBOSE is non-nil, print debugging information."
@@ -1070,7 +1067,7 @@ treesit-simple-indent-presets
 (defun treesit--simple-indent-eval (exp)
   "Evaluate EXP.
 
-If EXPis an application and the function is a key in
+If EXP is an application and the function is a key in
 `treesit-simple-indent-presets', use the corresponding value as
 the function."
   ;; We don't want to match uncompiled lambdas, so make sure this cons
@@ -1091,7 +1088,8 @@ treesit--simple-indent-eval
            ;; Matchers only return lambdas, anchors only return
            ;; integer, so we should never see a variable.
            (signal 'treesit-indent-error
-                   '("Couldn't find the preset corresponding to %s") exp)))
+                   (list "Couldn't find the preset corresponding to expression"
+                         exp))))
         (t exp)))
 
 ;; This variable might seem unnecessary: why split
@@ -1428,20 +1426,20 @@ treesit--setting-for-mode
       (cdar applicable)))))
 
 (defun treesit-ready-p (mode language &optional quiet)
-  "Check that tree-sitter is ready to be used for MODE.
+  "Check whether tree-sitter is ready to be used for MODE and LANGUAGE.
+
+LANGUAGE is the language symbol to check for availability.
+It can also be a list of language symbols.
 
-Checks the user setting in `treesit-settings', if user sets
-`demand' for MODE, and tree-sitter is not ready, emit a warning
-and return nil.  If user chose to activate tree-sitter for MODE
-and tree-sitter is ready, return non-nil.  If QUIET is t, no
-warning is emitted in any case, if quiet is `message', message
+This function checks the user setting in `treesit-settings'.  If the
+user has set `demand' for MODE, and tree-sitter is not ready, emit a
+warning and return nil.  If the user has chosen to activate tree-sitter
+for MODE and tree-sitter is ready, return non-nil.  If QUIET is t, don't
+emit warning in either case; if quiet is `message', display a message
 instead of emitting warning.
 
 If MODE is nil, don't check for user setting and assume the
-setting is t.
-
-LANGUAGE is the language symbol we want to check for availability.
-It can also be a list of language symbols."
+setting is t."
   (let ((language-list (if (consp language)
                            language
                          (list language)))
@@ -1565,23 +1563,23 @@ treesit-inspect-node-at-point
           (message "%s" treesit--inspect-name)
         (message "No node at point")))))
 
+;; FIXME: in the next doc string, what is FIELD-NAME?
 (define-minor-mode treesit-inspect-mode
-  "Show the node that _starts_ at point in the mode-line.
+  "Minor mode that displays in the mode-line the node which starts at point.
 
-The mode-line displays
+When this mode is enabled, the mode-line displays
 
-    PARENT FIELD-NAME: (NODE FIELD_NAME: (CHILD (...)))
+    PARENT FIELD-NAME: (NODE FIELD-NAME: (CHILD (...)))
 
-NODE, CHILD, and GRAND-CHILD, etc, are nodes that have their
-beginning at point.  And PARENT is the parent of NODE.  NODE is
-displayed in bold face.
+where NODE, CHILD, etc, are nodes which begin at point.
+PARENT is the parent of NODE.  NODE is displayed in bold typeface.
 
 If no node starts at point, i.e., point is in the middle of a
-node, then just display the smallest node that spans point and
-its immediate parent.
+node, then the mode line displays the earliest node that spans point,
+and its immediate parent.
 
-This minor mode doesn't create parsers on its own.  It simply
-uses the first parser in `treesit-parser-list'."
+This minor mode doesn't create parsers on its own.  It uses the first
+parser in `treesit-parser-list'."
   :lighter nil
   (if treesit-inspect-mode
       (progn

commit 243ee7b244797aae460b9e2a7224f75599f3a9b8
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Nov 5 09:14:25 2022 +0200

    ; Fix minor issues with Tree-sitter documentation in ELisp manual
    
    * doc/lispref/parsing.texi (Multiple Languages): Add @end example.
    
    * doc/lispref/Makefile.in (srcs): Add $(srcdir)/parsing.texi.

diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index 8a61adf232..6999169689 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -111,6 +111,7 @@ srcs =
   $(srcdir)/objects.texi \
   $(srcdir)/os.texi \
   $(srcdir)/package.texi \
+  $(srcdir)/parsing.texi \
   $(srcdir)/positions.texi \
   $(srcdir)/processes.texi \
   $(srcdir)/records.texi \
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index fa06924f58..a5b9a42211 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -1512,7 +1512,7 @@ Multiple Languages
              :host 'html
              '((style_element (raw_text) @@cap))))
 @end group
-@example
+@end example
 
 @defun treesit-range-rules :keyword value query...
 This function is used to set @var{treesit-range-settings}.  It

commit 951dd2a4d98aafe88bf2c6c2f86901230e3f0cd2
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Nov 4 10:50:55 2022 -0700

    ; * lisp/treesit.el (treesit-inspect-node-at-point): Minor fix.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 3a1e010166..64a93aa670 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1552,11 +1552,10 @@ treesit-inspect-node-at-point
             (format " %s: " (treesit-node-field-name node))
           " ")
         (if (treesit-node-check node 'named) "(" "\"")
-        (or (propertize (treesit-node-type node)
-                        'face
-                        (if (treesit-node-eq node largest-node)
-                            'bold nil))
-            "N/A")
+        (propertize (or (treesit-node-type node) "N/A")
+                    'face
+                    (if (treesit-node-eq node largest-node)
+                        'bold nil))
         name
         (if (treesit-node-check node 'named) ")" "\""))))
     (setq treesit--inspect-name name)

commit c924b6afb6810d6b9585092fc5693e3c9efcd1cf
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Nov 4 10:16:33 2022 -0700

    ; * lisp/treesit.el (treesit-ready-p): Fix typo.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 8da32ad9c5..3a1e010166 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1440,7 +1440,7 @@ treesit-ready-p
 If MODE is nil, don't check for user setting and assume the
 setting is t.
 
-LANGUAGE is the language symbol we want check for availability.
+LANGUAGE is the language symbol we want to check for availability.
 It can also be a list of language symbols."
   (let ((language-list (if (consp language)
                            language

commit ce9e7204138261f71d0e1636036727d8b05ac81e
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Nov 4 10:15:42 2022 -0700

    ; Minor improvement in treesit-inspect-mode
    
    * lisp/treesit.el (treesit-inspect-node-at-point): Show the current
    node in bold.
    (treesit-inspect-mode): Update docstring.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index b17480e0d4..8da32ad9c5 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1552,7 +1552,10 @@ treesit-inspect-node-at-point
             (format " %s: " (treesit-node-field-name node))
           " ")
         (if (treesit-node-check node 'named) "(" "\"")
-        (or (treesit-node-type node)
+        (or (propertize (treesit-node-type node)
+                        'face
+                        (if (treesit-node-eq node largest-node)
+                            'bold nil))
             "N/A")
         name
         (if (treesit-node-check node 'named) ")" "\""))))
@@ -1568,11 +1571,11 @@ treesit-inspect-mode
 
 The mode-line displays
 
-    PARENT FIELD-NAME: (CHILD FIELD_NAME: (GRAND-CHILD (...)))
+    PARENT FIELD-NAME: (NODE FIELD_NAME: (CHILD (...)))
 
-CHILD, GRAND-CHILD, and GRAND-GRAND-CHILD, etc, are nodes that
-have their beginning at point.  And PARENT is the parent of
-CHILD.
+NODE, CHILD, and GRAND-CHILD, etc, are nodes that have their
+beginning at point.  And PARENT is the parent of NODE.  NODE is
+displayed in bold face.
 
 If no node starts at point, i.e., point is in the middle of a
 node, then just display the smallest node that spans point and

commit e0e3299c01d3ad7236a7a950f43f54a1bff548d8
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Nov 4 10:03:17 2022 -0700

    ; * lisp/treesit.el (treesit-update-ranges): Update all parsers.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index d7acf6a428..b17480e0d4 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -476,7 +476,11 @@ treesit-update-ranges
                             host-lang query beg end))
                (set-ranges (treesit--merge-ranges
                             old-ranges new-ranges beg end)))
-          (treesit-parser-set-included-ranges parser set-ranges))))))
+          (dolist (parser (treesit-parser-list))
+            (when (eq (treesit-parser-language parser)
+                      language)
+              (treesit-parser-set-included-ranges
+               parser set-ranges))))))))
 
 (defun treesit-parser-range-on (parser beg &optional end)
   "Check if PARSER's range covers the portion between BEG and END.

commit 784f53a2152181b687f9543ddba9c393dda1c715
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Nov 4 09:58:08 2022 -0700

    ; Replace error with signal in treesit.el
    
    (or (treesit-parser-create language)
        (error "Cannot find a parser for %s" language))
    
    is turned into
    
    (treesit-parser-create language)
    
    because treesit-parser-create never returns nil.  (We used to use
    treesit-get-parser which don't create parser automatically.)
    
    * lisp/treesit.el (treesit-buffer-root-node): Replace error with signal.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 84c3c70327..d7acf6a428 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -247,10 +247,10 @@ treesit-buffer-root-node
 for LANGUAGE."
   (if-let ((parser
             (or (if language
-                    (or (treesit-parser-create language)
-                        (error "Cannot find a parser for %s" language))
+                    (treesit-parser-create language)
                   (or (car (treesit-parser-list))
-                      (error "Buffer has no parser"))))))
+                      (signal 'treesit-error
+                              '("Buffer has no parser")))))))
       (treesit-parser-root-node parser)))
 
 (defun treesit-filter-child (node pred &optional named)

commit 673a55780d2194f74c5774de83d0dce5131e7a31
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Nov 4 09:57:32 2022 -0700

    ; Remove unused tree-sitter functions
    
    They didn't turn out to be very useful.
    
    * lisp/treesit.el (treesit-set-ranges)
    (treesit-get-ranges): Remove functions.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index d6feca2f4a..84c3c70327 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -151,29 +151,6 @@ treesit-language-at
   (when treesit-language-at-point-function
     (funcall treesit-language-at-point-function position)))
 
-(defun treesit-set-ranges (parser-or-lang ranges)
-  "Set the ranges of PARSER-OR-LANG to RANGES."
-  (treesit-parser-set-included-ranges
-   (cond ((symbolp parser-or-lang)
-          (or (treesit-parser-create parser-or-lang)
-              (error "Cannot find a parser for %s" parser-or-lang)))
-         ((treesit-parser-p parser-or-lang)
-          parser-or-lang)
-         (t (error "Expecting a parser or language, but got %s"
-                   parser-or-lang)))
-   ranges))
-
-(defun treesit-get-ranges (parser-or-lang)
-  "Get the ranges of PARSER-OR-LANG."
-  (treesit-parser-included-ranges
-   (cond ((symbolp parser-or-lang)
-          (or (treesit-parser-create parser-or-lang)
-              (error "Cannot find a parser for %s" parser-or-lang)))
-         ((treesit-parser-p parser-or-lang)
-          parser-or-lang)
-         (t (error "Expecting a parser or language, but got %s"
-                   parser-or-lang)))))
-
 ;;; Node API supplement
 
 (defun treesit-node-buffer (node)

commit 8ad4c4009e1c7360df6f59175b1a701d7f4ecfae
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Nov 4 09:56:38 2022 -0700

    Add treesit-indent-error
    
    * lisp/treesit.el (treesit-indent-error): New error.
    (treesit--simple-indent-eval): Signal treesit-indent-error.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 21b19299d8..d6feca2f4a 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -877,6 +877,10 @@ treesit-font-lock-fontify-region
 
 ;;; Indent
 
+(define-error 'treesit-indent-error
+              "Generic tree-sitter indentation error"
+              'treesit-error)
+
 (defvar treesit--indent-verbose nil
   "If non-nil, log progress when indenting.")
 
@@ -1105,7 +1109,8 @@ treesit--simple-indent-eval
              exp
            ;; Matchers only return lambdas, anchors only return
            ;; integer, so we should never see a variable.
-           (error "Couldn't find the preset corresponding to %s" exp)))
+           (signal 'treesit-indent-error
+                   '("Couldn't find the preset corresponding to %s") exp)))
         (t exp)))
 
 ;; This variable might seem unnecessary: why split

commit d9d66764e2a02db9f19f5c76ce34ac7d8bc1edc6
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Nov 4 01:31:56 2022 -0700

    Revise tree-sitter facility for multi-language buffers
    
    * doc/lispref/parsing.texi (Multiple Languages): Extend and update
    manual.
    * lisp/treesit.el (treesit-range-functions): Remove variable.
    (treesit-range-settings): New variable.
    (treesit-range-rules): New function.
    (treesit--merge-ranges): New function.
    (treesit-update-ranges): Use treesit-range-settings instead of
    treesit-range-functions.
    (treesit-font-lock-rules): Fix docstring.
    (treesit-indent)
    (treesit-indent-region): Only update ranges in a region.
    * test/src/treesit-tests.el (treesit-range): New test.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index e280ac8c64..fa06924f58 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -1419,49 +1419,30 @@ Multiple Languages
 @code{treesit-query-error} error if @var{query} is malformed.
 @end defun
 
-@defvar treesit-range-functions
-This variable holds the list of range functions.  Font-locking and
-indenting code use functions in this list to set correct ranges for
-a language parser before using it.
-
-The signature of each function in the list should be:
-
-@example
-(@var{start} @var{end} &rest @var{_})
-@end example
-
-@noindent
-where @var{start} and @var{end} specify the region that is about to be
-used.  A range function only needs to (but is not limited to) update
-ranges in that region.
-
-The functions in the list are called in order.
-@end defvar
-
-@defun treesit-update-ranges &optional start end
-This function is used by font-lock and indentation to update ranges
-before using any parser.  Each range function in
-@var{treesit-range-functions} is called in-order.  Arguments
-@var{start} and @var{end} are passed to each range function.
+@defun treesit-update-ranges &optional beg end
+This function is used by fontification and indentation to update
+ranges before using any parser.  It makes sure the parsers' range are
+set correctly between @var{beg} and @var{end}, according to
+@code{treesit-range-settings}.  If omitted, @var{beg} defaults to the
+beginning of the buffer, and @var{end} defaults to the end.
 @end defun
 
 @vindex treesit-language-at-point-function
 @defun treesit-language-at pos
 This function tries to figure out which language is responsible for
 the text at buffer position @var{pos}.  Under the hood it just calls
-@code{treesit-language-at-point-function}.
+@code{treesit-language-at-point-function}, which is a function that
+takes the same argument as this function.
 
 Various Lisp programs use this function.  For example, the indentation
 program uses this function to determine which language's rule to use
-in a multi-language buffer.  So it is important to provide
-@code{treesit-language-at-point-function} for a multi-language major
-mode.
+in a multi-language buffer.
 @end defun
 
 @heading An example
 
 Normally, in a set of languages that can be mixed together, there is a
-major language and several embedded languages.  A Lisp program usually
+main language and several embedded languages.  A Lisp program usually
 first parses the whole document with the major language's parser, sets
 ranges for the embedded languages, and then parses the embedded
 languages.
@@ -1512,6 +1493,51 @@ Multiple Languages
 to find @acronym{CSS} nodes in the @acronym{HTML} parse tree.  For how
 to write query patterns, @pxref{Pattern Matching}.
 
+Emacs can automate the above process in @code{treesit-update-ranges}.
+For it to work, a Lisp program should set
+@code{treesit-range-settings} to the output of
+@code{treesit-range-rules}, like the following.
+
+@example
+@group
+(setq-local treesit-range-settings
+            (treesit-range-rules
+             :embed 'javascript
+             :host 'html
+             '((script_element (raw_text) @@cap))
+@end group
+
+@group
+             :embed 'css
+             :host 'html
+             '((style_element (raw_text) @@cap))))
+@end group
+@example
+
+@defun treesit-range-rules :keyword value query...
+This function is used to set @var{treesit-range-settings}.  It
+takes care of compiling queries and other post-processing, and outputs
+a value that @var{treesit-range-settings} accepts.
+
+It takes a series of @var{queries} in either string, s-expression or
+compiled form.  Before each QUERY there must be @var{:keyword}
+@var{value} pairs that configure the query (and only that query).
+
+For each query, @code{:embed} keyword specifies the embedded language,
+and @code{:host} keyword specified the host language.  Emacs queries
+the @var{query} in the host language and uses the result to set ranges
+for the embedded language.
+
+A @var{query} can also be a function that takes two arguments,
+@var{start} and @var{end}, and sets the range for parsers.  It only
+needs to ensure ranges between @var{start} and @var{end} is correct.
+When @var{query} is a function, it doesn't need keywords before it.
+@end defun
+
+In summary, a multi-langauge major mode should set
+@code{treesit-language-at-function} and @code{treesit-range-settings}
+for Emacs to handle multiple languages in the same buffer.
+
 @node Tree-sitter major modes
 @section Developing major modes with tree-sitter
 @cindex major mode, developing with tree-sitter
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 7d961476cd..21b19299d8 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -373,27 +373,133 @@ treesit-query-range
 
 ;;; Range API supplement
 
-(defvar-local treesit-range-functions nil
-  "A list of range functions.
-Font-locking and indenting code uses functions in this list to
-set correct ranges for a language parser before using it.
+(defvar-local treesit-range-settings nil
+  "A list of range settings.
 
-The signature of each function should be
+A list of list of the form
 
-    (start end &rest _)
+    (QUERY LANGUAGE)
 
-where START and END marks the region that is about to be used.  A
-range function only need to (but not limited to) update ranges in
-that region.
+When updating the range of each parser in the buffer,
+`treesit-update-ranges' queries each QUERY, and set LANGUAGE's
+range to the range spanned by captured nodes.  QUERY must be a
+compiled query.
 
-Each function in the list is called in-order.")
+QUERY can also be a function, in which case it is called with 2
+arguments, START and END.  It should ensure parsers' range are
+correct in that region.
 
-(defun treesit-update-ranges (&optional start end)
+The exact form of the variable is considered internal and subject
+to change.  Use `treesit-range-rules' to set this variable.")
+
+(defun treesit-range-rules (&rest args)
+  "Produce settings for `treesit-range-settings'.
+
+Take a series of QUERIES in either string, s-expression or
+compiled form.  For example,
+
+Before each QUERY there must be :KEYWORD VALUE pairs that
+configure the query (and only that query).  For example,
+
+    (treesit-range-rules
+     :embed \\='javascript
+     :host \\='html
+     \\='((script_element (raw_text) @cap)))
+
+For each query, :embed keyword specifies the embedded language,
+and :host keyword specified the host language.  Emacs queries the
+QUERY in the host language and uses the result to set ranges for
+the embedded language.
+
+QUERY can also be a function that takes two arguments, START and
+END, and sets the range for parsers.  The function only needs to
+ensure ranges between START and END is correct.  If QUERY is a
+function, it doesn't need to have keywords before it.
+
+\(:KEYWORD VALUE QUERY...)"
+  (let (host embed result)
+    (while args
+      (pcase (pop args)
+        (:host (let ((host-lang (pop args)))
+                 (unless (symbolp host-lang)
+                   (signal 'treesit-error (list "Value of :host option should be a symbol" host-lang)))
+                 (setq host host-lang)))
+        (:embed (let ((embed-lang (pop args)))
+                  (unless (symbolp embed-lang)
+                    (signal 'treesit-error (list "Value of :embed option should be a symbol" embed-lang)))
+                  (setq embed embed-lang)))
+        (query (if (functionp query)
+                   (push (list query nil nil) result)
+                 (when (null embed)
+                   (signal 'treesit-error (list "Value of :embed option cannot be omitted")))
+                 (when (null host)
+                   (signal 'treesit-error (list "Value of :host option cannot be omitted")))
+                 (push (list (treesit-query-compile host query)
+                             embed host)
+                       result))
+               (setq host nil embed nil))))
+    (nreverse result)))
+
+(defun treesit--merge-ranges (old-ranges new-ranges start end)
+  "Merge OLD-RANGES and NEW-RANGES.
+Each range is a list of cons of the form (BEG . END).  When
+merging the two ranges, if a range in OLD-RANGES intersects with
+another range in NEW-RANGES, discard the one in OLD-RANGES and
+keep the one in NEW-RANGES.  Also discard any range in OLD-RANGES
+that intersects the region marked by START and END.
+
+Return the merged range list."
+  (let ((result nil))
+    (while (and old-ranges new-ranges)
+      (let ((new-beg (caar new-ranges))
+            (new-end (cdar new-ranges))
+            (old-beg (caar old-ranges))
+            (old-end (cdar old-ranges)))
+        (cond
+         ;; Old range intersects with START-END, discard.
+         ((and (< start old-end)
+               (< old-beg end))
+          (setq old-ranges (cdr old-ranges)))
+         ;; New range and old range don't intersect, new comes
+         ;; before, push new.
+         ((<= new-end old-beg)
+          (push (car new-ranges) result)
+          (setq new-ranges (cdr new-ranges)))
+         ;; New range and old range don't intersect, old comes
+         ;; before, push old.
+         ((<= old-end new-beg)
+          (push (car old-ranges) result)
+          (setq old-ranges (cdr old-ranges)))
+         (t ;; New and old range intersect, discard old.
+          (setq old-ranges (cdr old-ranges))))))
+    (let ((left-over (or new-ranges old-ranges)))
+      (dolist (range left-over)
+        (push range result)))
+    (nreverse result)))
+
+(defun treesit-update-ranges (&optional beg end)
   "Update the ranges for each language in the current buffer.
-Calls each range functions in `treesit-range-functions'
-in-order.  START and END are passed to each range function."
-  (dolist (range-fn treesit-range-functions)
-    (funcall range-fn (or start (point-min)) (or end (point-max)))))
+If BEG and END not omitted, only update parser ranges in that
+region."
+  ;; When updating ranges, we want to avoid querying the whole buffer
+  ;; which could be slow in very large buffers.  Instead, we only
+  ;; query for nodes that intersect with the region between BEG and
+  ;; END.  And we only update the ranges intersecting BEG and END,
+  ;; outside of that region we inherit old ranges.
+  (dolist (setting treesit-range-settings)
+    (let ((query (nth 0 setting))
+          (language (nth 1 setting))
+          (beg (or beg (point-min)))
+          (end (or end (point-max))))
+      (if (functionp query) (funcall query beg end)
+        (let* ((host-lang (treesit-query-language query))
+               (parser (treesit-parser-create language))
+               (old-ranges (treesit-parser-included-ranges parser))
+               (new-ranges (treesit-query-range
+                            host-lang query beg end))
+               (set-ranges (treesit--merge-ranges
+                            old-ranges new-ranges beg end)))
+          (treesit-parser-set-included-ranges parser set-ranges))))))
 
 (defun treesit-parser-range-on (parser beg &optional end)
   "Check if PARSER's range covers the portion between BEG and END.
@@ -469,9 +575,8 @@ treesit-font-lock-rules
   "Return a value suitable for `treesit-font-lock-settings'.
 
 Take a series of QUERIES in either string, s-expression or
-compiled form.  Same as in `treesit-font-lock-settings', for each
-query, captured nodes are highlighted with the capture name as
-its face.
+compiled form.  For each query, captured nodes are highlighted
+with the capture name as its face.
 
 Before each QUERY there could be :KEYWORD VALUE pairs that
 configure the query (and only that query).  For example,
@@ -1065,7 +1170,8 @@ treesit--indent-1
 
 (defun treesit-indent ()
   "Indent according to the result of `treesit-indent-function'."
-  (treesit-update-ranges)
+  (treesit-update-ranges (line-beginning-position)
+                         (line-end-position))
   ;; We don't return 'noindent even if no rules match, because
   ;; `indent-for-tab-command' tries to indent itself when we return
   ;; 'noindent, which leads to wrong indentation at times.
@@ -1092,7 +1198,7 @@ treesit--indent-region-batch-size
 (defun treesit-indent-region (beg end)
   "Indent the region between BEG and END.
 Similar to `treesit-indent', but indent a region instead."
-  (treesit-update-ranges)
+  (treesit-update-ranges beg end)
   (let* ((meta-len 2)
          (vector-len (* meta-len treesit--indent-region-batch-size))
          ;; This vector saves the indent meta for each line in the
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index 56ac51ff99..5e4aea3ad4 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -321,6 +321,9 @@ treesit-range
         (setq parser (treesit-parser-create 'json))
         (setq root-node (treesit-parser-root-node
                          parser)))
+
+      (should (eq (treesit-parser-included-ranges parser) nil))
+
       (should-error
        (treesit-parser-set-included-ranges
         parser '((1 . 6) (5 . 20)))
@@ -333,6 +336,32 @@ treesit-range
       (should (equal "(document (array (array (number)) (array (number) (number) (number)) (array (number) (number))))"
                      (treesit-node-string
                       (treesit-parser-root-node parser))))
+
+      (treesit-parser-set-included-ranges parser nil)
+      (should (eq (treesit-parser-included-ranges parser) nil))
+
+      ;; `treesit--merge-ranges'.
+      (let ((old-ranges '((1 . 10) ; (1) -- before (a)
+                          (20 . 30); (2) -- intersect with (b)
+                          (42 . 46) (47 . 48) ; (3) -- inside (c)
+                          (55 . 65) (70 . 75) ; (4) -- intersect start-end
+                          (80 . 90) ; (4)
+                          ))
+            (new-ranges '((10 . 15) ; (a)
+                          (18 . 25) (26 . 28) ; (b)
+                          (40 . 50) ; (c)
+                          (90 . 100) ; (d) -- after (4)
+                          ))
+            (result '((1 . 10) ; (1)
+                      (10 . 15) ; (a)
+                      (18 . 25) (26 . 28) ; (b)
+                      (40 . 50) ; (c)
+                      (80 . 90) ; (4)
+                      (90 . 100) ; (d)
+                      )))
+        (should (equal (treesit--merge-ranges
+                        old-ranges new-ranges 60 75)
+                       result)))
       ;; TODO: More tests.
       )))
 

commit f6dc55f516a88765bbd8b8c34f0ec663b8948373
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Nov 4 01:18:59 2022 -0700

    ; * lisp/progmodes/js.el (js--fontify-template-string): Fix typo.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 01da87f6be..ab8239db9e 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3588,7 +3588,7 @@ js--treesit-font-lock-settings
 
 (defun js--fontify-template-string (node override start end &rest _)
   "Fontify template string but not substitution inside it.
-NODE is the template_string node. START and END marks the region
+NODE is the template_string node.  START and END marks the region
 to be fontified.
 
 OVERRIDE is the override flag described in
@@ -3605,7 +3605,7 @@ js--fontify-template-string
                                  "template_substitution")
                           (treesit-node-start child)
                         (treesit-node-end child))))
-        (setq font-beg (max beg font-beg))
+        (setq font-beg (max start font-beg))
         (when (< font-beg end)
           (treesit-fontify-with-override
            font-beg font-end 'font-lock-string-face override)))

commit b86deb617b109bcb40e9c95b10a033a209c1d8fd
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Nov 3 22:14:50 2022 -0700

    Fix treesit-parser-set-included-ranges
    
    Track whether a parser has ranges set ourselves.  See comment in
    Ftreesit_parser_included_ranges for detail.
    
    * src/treesit.c (make_treesit_parser): Initialize has_range.
    (Ftreesit_parser_set_included_ranges): Set has_range.  Fill docstring.
    (Ftreesit_parser_included_ranges): Check has_range.
    * src/treesit.h (Lisp_TS_Parser): Add has_range.

diff --git a/src/treesit.c b/src/treesit.c
index addd308d21..48d650f1fc 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -955,6 +955,7 @@ make_treesit_parser (Lisp_Object buffer, TSParser *parser,
   lisp_parser->visible_end = BUF_ZV (XBUFFER (buffer));
   lisp_parser->timestamp = 0;
   lisp_parser->deleted = false;
+  lisp_parser->has_range = false;
   eassert (lisp_parser->visible_beg <= lisp_parser->visible_end);
   return make_lisp_ptr (lisp_parser, Lisp_Vectorlike);
 }
@@ -1340,13 +1341,15 @@ DEFUN ("treesit-parser-set-included-ranges",
 
 RANGES is a list of (BEG . END), each (BEG . END) defines a region in
 which the parser should operate.  Regions must not overlap, and the
-regions should come in order in the list.  Signal `treesit-set-range-error'
-if the argument is invalid, or something else went wrong.  If RANGES
-is nil, the PARSER is to parse the whole buffer.  */)
+regions should come in order in the list.  Signal
+`treesit-set-range-error' if the argument is invalid, or something
+else went wrong.  If RANGES is nil, the PARSER is to parse the whole
+buffer.  */)
   (Lisp_Object parser, Lisp_Object ranges)
 {
   treesit_check_parser (parser);
-  CHECK_CONS (ranges);
+  if (!NILP (ranges))
+    CHECK_CONS (ranges);
   treesit_check_range_argument (ranges);
 
   treesit_initialize ();
@@ -1357,6 +1360,7 @@ DEFUN ("treesit-parser-set-included-ranges",
   bool success;
   if (NILP (ranges))
     {
+      XTS_PARSER (parser)->has_range = false;
       /* If RANGES is nil, make parser to parse the whole document.
 	 To do that we give tree-sitter a 0 length, the range is a
 	 dummy.  */
@@ -1367,6 +1371,7 @@ DEFUN ("treesit-parser-set-included-ranges",
   else
     {
       /* Set ranges for PARSER.  */
+      XTS_PARSER (parser)->has_range = true;
 
       if (list_length (ranges) > UINT32_MAX)
 	xsignal (Qargs_out_of_range, list2 (ranges, Flength (ranges)));
@@ -1420,11 +1425,18 @@ DEFUN ("treesit-parser-included-ranges",
 {
   treesit_check_parser (parser);
   treesit_initialize ();
+
+  /* When the parser doesn't have a range set and we call
+     ts_parser_included_ranges on it, it doesn't return an empty list,
+     but rather return some garbled data. (A single range where
+     start_byte = 0, end_byte = UINT32_MAX).  So we need to track
+     whether the parser is ranged ourselves.  */
+  if (!XTS_PARSER (parser)->has_range)
+    return Qnil;
+
   uint32_t len;
   const TSRange *ranges
     = ts_parser_included_ranges (XTS_PARSER (parser)->parser, &len);
-  if (len == 0)
-    return Qnil;
 
   /* Our return value depends on the buffer state (BUF_BEGV_BYTE,
      etc), so we need to sync up.  */
diff --git a/src/treesit.h b/src/treesit.h
index d6bada5b36..169d8819d7 100644
--- a/src/treesit.h
+++ b/src/treesit.h
@@ -65,6 +65,9 @@ #define EMACS_TREESIT_H
   /* If this field is true, parser functions raises
      treesit-parser-deleted signal.  */
   bool deleted;
+  /* If this field is true, the parser has ranges set.  See
+     Ftreesit_parser_included_ranges for why we need this.  */
+  bool has_range;
 };
 
 /* A wrapper around a tree-sitter node.  */

commit c5f24f76eb1653d64c2ae90764e395cf6e050657
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Nov 3 19:39:43 2022 -0700

    ; * src/treesit.c: Minor comment change.

diff --git a/src/treesit.c b/src/treesit.c
index ad926d85b2..addd308d21 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -346,6 +346,7 @@ #define ts_tree_root_node fn_ts_tree_root_node
      parser of buffer changes.
    - lisp/emacs-lisp/cl-preloaded.el & data.c & lisp.h for parser and
      node type.
+   - print.c for printing tree-sitter objects (node, parser, query).
 
    Regarding signals: only raise signals in Lisp functions.
 

commit b028d4f7dfbd72790679423a8dcce9994b07834d
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Nov 3 19:37:55 2022 -0700

    ; Tree-sitter: Don't refontify if entity contained in the region
    
    * lisp/treesit.el (treesit-font-lock-contextual-post-process): Only
    refontify when NODE-START < region START.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index d6058cdc43..7d961476cd 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -696,7 +696,7 @@ treesit-font-lock-contextual-post-process
     (when verbose
       (message "Contextual: region: %s-%s, node: %s-%s"
                start end node-start node-end))
-    (when (<= node-end end)
+    (when (and (< node-start start) (<= node-end end))
       (if (get-text-property node-end-1 prop-sym)
           ;; We are called from a refontification by jit-lock-context,
           ;; caused by a previous call to this function.

commit e3663d0e9c6ec32a70226947767850924b90bba7
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Nov 3 11:53:49 2022 -0700

    Add contextual tree-sitter font-lock to ts-mode and js-mode
    
    * lisp/progmodes/js.el (js--treesit-font-lock-settings)
    * lisp/progmodes/ts-mode.el (ts-mode--font-lock-settings): Capture
    commend and strings.  Add empty lines.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 92a8599d7f..01da87f6be 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3451,10 +3451,13 @@ js--treesit-keywords
 
 (defvar js--treesit-font-lock-settings
   (treesit-font-lock-rules
+
    :language 'javascript
    :override t
    :feature 'comment
-   `((comment) @font-lock-comment-face)
+   `((comment) @font-lock-comment-face
+     (comment) @contextual)
+
    :language 'javascript
    :override t
    :feature 'constant
@@ -3463,18 +3466,23 @@ js--treesit-font-lock-settings
 
      [(true) (false) (null)] @font-lock-constant-face
      (number) @font-lock-constant-face)
+
    :language 'javascript
    :override t
    :feature 'keyword
    `([,@js--treesit-keywords] @font-lock-keyword-face
      [(this) (super)] @font-lock-keyword-face)
+
    :language 'javascript
    :override t
    :feature 'string
    `((regex pattern: (regex_pattern)) @font-lock-string-face
      (string) @font-lock-string-face
+     (string) @contextual
      (template_string) @js--fontify-template-string
+     (template_string) @contextual
      (template_substitution ["${" "}"] @font-lock-builtin-face))
+
    :language 'javascript
    :override t
    :feature 'declaration
@@ -3503,6 +3511,7 @@ js--treesit-font-lock-settings
              (identifier)
              @font-lock-function-name-face)
       value: (array (number) (function))))
+
    :language 'javascript
    :override t
    :feature 'identifier
@@ -3514,6 +3523,7 @@ js--treesit-font-lock-settings
 
      (arrow_function
       parameter: (identifier) @font-lock-variable-name-face))
+
    :language 'javascript
    :override t
    :feature 'expression
@@ -3533,6 +3543,7 @@ js--treesit-font-lock-settings
       left: [(identifier) @font-lock-variable-name-face
              (member_expression
               property: (property_identifier) @font-lock-variable-name-face)]))
+
    :language 'javascript
    :override t
    :feature 'property
@@ -3547,11 +3558,13 @@ js--treesit-font-lock-settings
      ((shorthand_property_identifier) @font-lock-variable-name-face)
 
      ((shorthand_property_identifier_pattern) @font-lock-variable-name-face))
+
    :language 'javascript
    :override t
    :feature 'pattern
    `((pair_pattern key: (property_identifier) @font-lock-variable-name-face)
      (array_pattern (identifier) @font-lock-variable-name-face))
+
    :language 'javascript
    :override t
    :feature 'jsx
diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el
index 20118bc3db..a7dee1ead8 100644
--- a/lisp/progmodes/ts-mode.el
+++ b/lisp/progmodes/ts-mode.el
@@ -100,10 +100,13 @@ ts-mode--keywords
 
 (defvar ts-mode--font-lock-settings
   (treesit-font-lock-rules
+
    :language 'tsx
    :override t
    :feature 'comment
-   `((comment) @font-lock-comment-face)
+   `((comment) @font-lock-comment-face
+     (comment) @contextual)
+
    :language 'tsx
    :override t
    :feature 'constant
@@ -112,18 +115,23 @@ ts-mode--font-lock-settings
 
      [(true) (false) (null)] @font-lock-constant-face
      (number) @font-lock-constant-face)
+
    :language 'tsx
    :override t
    :feature 'keyword
    `([,@ts-mode--keywords] @font-lock-keyword-face
      [(this) (super)] @font-lock-keyword-face)
+
    :language 'tsx
    :override t
    :feature 'string
    `((regex pattern: (regex_pattern)) @font-lock-string-face
      (string) @font-lock-string-face
+     (string) @contextual
      (template_string) @js--fontify-template-string
+     (template_string) @contextual
      (template_substitution ["${" "}"] @font-lock-builtin-face))
+
    :language 'tsx
    :override t
    :feature 'declaration
@@ -153,6 +161,7 @@ ts-mode--font-lock-settings
              (identifier)
              (identifier) @font-lock-function-name-face)
       value: (array (number) (function))))
+
    :language 'tsx
    :override t
    :feature 'identifier
@@ -183,6 +192,7 @@ ts-mode--font-lock-settings
       [(_ (identifier) @font-lock-variable-name-face)
        (_ (_ (identifier) @font-lock-variable-name-face))
        (_ (_ (_ (identifier) @font-lock-variable-name-face)))]))
+
    :language 'tsx
    :override t
    :feature 'expression
@@ -197,6 +207,7 @@ ts-mode--font-lock-settings
       [(identifier) @font-lock-function-name-face
        (member_expression
         property: (property_identifier) @font-lock-function-name-face)]))
+
    :language 'tsx
    :override t
    :feature 'property
@@ -215,6 +226,7 @@ ts-mode--font-lock-settings
 
      ((shorthand_property_identifier_pattern)
       @font-lock-variable-name-face))
+
    :language 'tsx
    :override t
    :feature 'pattern
@@ -222,6 +234,7 @@ ts-mode--font-lock-settings
       key: (property_identifier) @font-lock-variable-name-face)
 
      (array_pattern (identifier) @font-lock-variable-name-face))
+
    :language 'tsx
    :override t
    :feature 'jsx

commit f9f9b43df5bdadb54a1ba14e1624aa254d9f092d
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Nov 3 11:44:35 2022 -0700

    Minor change to tree-sitter imenu function of js-mode
    
    If someone don’t like the labels, they can set them to empty strings.
    
    * lisp/progmodes/js.el (js--treesit-imenu-type-alist): Add space.
    (js--treesit-imenu-label): Remove space.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index c77c0fb90b..92a8599d7f 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3620,10 +3620,10 @@ js-treesit-current-defun
 
 ;; Keep this private since we might later change it or generalize it.
 (defvar js--treesit-imenu-type-alist
-  '((variable . "V")
-    (function . "F")
-    (class . "C")
-    (method . "M"))
+  '((variable . "V ")
+    (function . "F ")
+    (class . "C ")
+    (method . "M "))
   "Maps imenu label types to their \"symbol\".
 Symbols are prefixed to each label in imenu (see
 `js--treesit-imenu-label').")
@@ -3632,7 +3632,7 @@ js--treesit-imenu-label
   "Format label for imenu.
 TYPE can be `variable', `function', `class', `method'.
 NAME is a string."
-  (format "%s %s" (alist-get type js--treesit-imenu-type-alist)
+  (format "%s%s" (alist-get type js--treesit-imenu-type-alist)
           name))
 
 (defun js--treesit-imenu-1 (node)

commit 5416ae5990337f5fb2b3e0fbf9c4575508da808e
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Nov 3 11:41:42 2022 -0700

    ; Update guides in /admin/notes/tree-sitter
    
    * admin/notes/tree-sitter/html-manual/Language-Definitions.html
    * admin/notes/tree-sitter/html-manual/Multiple-Languages.html
    * admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html
    * admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html
    * admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html
    * admin/notes/tree-sitter/html-manual/Pattern-Matching.html
    * admin/notes/tree-sitter/html-manual/Retrieving-Node.html
    * admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html
    * admin/notes/tree-sitter/html-manual/Using-Parser.html
    * admin/notes/tree-sitter/starter-guide: Update to reflect changes
    made recently.

diff --git a/admin/notes/tree-sitter/html-manual/Language-Definitions.html b/admin/notes/tree-sitter/html-manual/Language-Definitions.html
index ba3eeb9eeb..6df676b168 100644
--- a/admin/notes/tree-sitter/html-manual/Language-Definitions.html
+++ b/admin/notes/tree-sitter/html-manual/Language-Definitions.html
@@ -66,14 +66,17 @@
 </div>
 <hr>
 <span id="Tree_002dsitter-Language-Definitions"></span><h3 class="section">37.1 Tree-sitter Language Definitions</h3>
+<span id="index-language-definitions_002c-for-tree_002dsitter"></span>
 
 <span id="Loading-a-language-definition"></span><h3 class="heading">Loading a language definition</h3>
+<span id="index-loading-language-definition-for-tree_002dsitter"></span>
 
+<span id="index-language-argument_002c-for-tree_002dsitter"></span>
 <p>Tree-sitter relies on language definitions to parse text in that
-language. In Emacs, A language definition is represented by a symbol.
-For example, C language definition is represented as <code>c</code>, and
-<code>c</code> can be passed to tree-sitter functions as the <var>language</var>
-argument.
+language.  In Emacs, a language definition is represented by a symbol.
+For example, the C language definition is represented as the symbol
+<code>c</code>, and <code>c</code> can be passed to tree-sitter functions as the
+<var>language</var> argument.
 </p>
 <span id="index-treesit_002dextra_002dload_002dpath"></span>
 <span id="index-treesit_002dload_002dlanguage_002derror"></span>
@@ -81,55 +84,92 @@
 <p>Tree-sitter language definitions are distributed as dynamic libraries.
 In order to use a language definition in Emacs, you need to make sure
 that the dynamic library is installed on the system.  Emacs looks for
-language definitions under load paths in
-<code>treesit-extra-load-path</code>, <code>user-emacs-directory</code>/tree-sitter,
-and system default locations for dynamic libraries, in that order.
-Emacs tries each extensions in <code>treesit-load-suffixes</code>.  If Emacs
-cannot find the library or has problem loading it, Emacs signals
-<code>treesit-load-language-error</code>.  The signal data is a list of
-specific error messages.
+language definitions in several places, in the following order:
+</p>
+<ul>
+<li> first, in the list of directories specified by the variable
+<code>treesit-extra-load-path</code>;
+</li><li> then, in the <samp>tree-sitter</samp> subdirectory of the directory
+specified by <code>user-emacs-directory</code> (see <a href="Init-File.html">The Init File</a>);
+</li><li> and finally, in the system&rsquo;s default locations for dynamic libraries.
+</li></ul>
+
+<p>In each of these directories, Emacs looks for a file with file-name
+extensions specified by the variable <code>treesit-load-suffixes</code>.
+</p>
+<p>If Emacs cannot find the library or has problems loading it, Emacs
+signals the <code>treesit-load-language-error</code> error.  The data of
+that signal could be one of the following:
+</p>
+<dl compact="compact">
+<dt><span><code>(not-found <var>error-msg</var> &hellip;)</code></span></dt>
+<dd><p>This means that Emacs could not find the language definition library.
+</p></dd>
+<dt><span><code>(symbol-error <var>error-msg</var>)</code></span></dt>
+<dd><p>This means that Emacs could not find in the library the expected function
+that every language definition library should export.
+</p></dd>
+<dt><span><code>(version-mismatch <var>error-msg</var>)</code></span></dt>
+<dd><p>This means that the version of language definition library is incompatible
+with that of the tree-sitter library.
+</p></dd>
+</dl>
+
+<p>In all of these cases, <var>error-msg</var> might provide additional
+details about the failure.
 </p>
 <dl class="def">
-<dt id="index-treesit_002dlanguage_002davailable_002dp"><span class="category">Function: </span><span><strong>treesit-language-available-p</strong> <em>language</em><a href='#index-treesit_002dlanguage_002davailable_002dp' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function checks whether the dynamic library for <var>language</var> is
-present on the system, and return non-nil if it is.
+<dt id="index-treesit_002dlanguage_002davailable_002dp"><span class="category">Function: </span><span><strong>treesit-language-available-p</strong> <em>language &amp;optional detail</em><a href='#index-treesit_002dlanguage_002davailable_002dp' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function returns non-<code>nil</code> if the language definitions for
+<var>language</var> exist and can be loaded.
+</p>
+<p>If <var>detail</var> is non-<code>nil</code>, return <code>(t . nil)</code> when
+<var>language</var> is available, and <code>(nil . <var>data</var>)</code> when it&rsquo;s
+unavailable.  <var>data</var> is the signal data of
+<code>treesit-load-language-error</code>.
 </p></dd></dl>
 
 <span id="index-treesit_002dload_002dname_002doverride_002dlist"></span>
-<p>By convention, the dynamic library for <var>language</var> is
-<code>libtree-sitter-<var>language</var>.<var>ext</var></code>, where <var>ext</var> is the
-system-specific extension for dynamic libraries. Also by convention,
+<p>By convention, the file name of the dynamic library for <var>language</var> is
+<samp>libtree-sitter-<var>language</var>.<var>ext</var></samp>, where <var>ext</var> is the
+system-specific extension for dynamic libraries.  Also by convention,
 the function provided by that library is named
-<code>tree_sitter_<var>language</var></code>.  If a language definition doesn&rsquo;t
-follow this convention, you should add an entry
+<code>tree_sitter_<var>language</var></code>.  If a language definition library
+doesn&rsquo;t follow this convention, you should add an entry
 </p>
 <div class="example">
 <pre class="example">(<var>language</var> <var>library-base-name</var> <var>function-name</var>)
 </pre></div>
 
-<p>to <code>treesit-load-name-override-list</code>, where
-<var>library-base-name</var> is the base filename for the dynamic library
-(conventionally <code>libtree-sitter-<var>language</var></code>), and
+<p>to the list in the variable <code>treesit-load-name-override-list</code>, where
+<var>library-base-name</var> is the basename of the dynamic library&rsquo;s file name,
+(usually, <samp>libtree-sitter-<var>language</var></samp>), and
 <var>function-name</var> is the function provided by the library
-(conventionally <code>tree_sitter_<var>language</var></code>). For example,
+(usually, <code>tree_sitter_<var>language</var></code>).  For example,
 </p>
 <div class="example">
 <pre class="example">(cool-lang &quot;libtree-sitter-coool&quot; &quot;tree_sitter_cooool&quot;)
 </pre></div>
 
-<p>for a language too cool to abide by conventions.
+<p>for a language that considers itself too &ldquo;cool&rdquo; to abide by
+conventions.
 </p>
+<span id="index-language_002ddefinition-version_002c-compatibility"></span>
 <dl class="def">
 <dt id="index-treesit_002dlanguage_002dversion"><span class="category">Function: </span><span><strong>treesit-language-version</strong> <em>&amp;optional min-compatible</em><a href='#index-treesit_002dlanguage_002dversion' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>Tree-sitter library has a <em>language version</em>, a language
-definition&rsquo;s version needs to match this version to be compatible.
-</p>
-<p>This function returns tree-sitter library’s language version.  If
-<var>min-compatible</var> is non-nil, it returns the minimal compatible
-version.
+<dd><p>This function returns the version of the language-definition
+Application Binary Interface (<acronym>ABI</acronym>) supported by the
+tree-sitter library.  By default, it returns the latest ABI version
+supported by the library, but if <var>min-compatible</var> is
+non-<code>nil</code>, it returns the oldest ABI version which the library
+still can support.  Language definition libraries must be built for
+ABI versions between the oldest and the latest versions supported by
+the tree-sitter library, otherwise the library will be unable to load
+them.
 </p></dd></dl>
 
 <span id="Concrete-syntax-tree"></span><h3 class="heading">Concrete syntax tree</h3>
+<span id="index-syntax-tree_002c-concrete"></span>
 
 <p>A syntax tree is what a parser generates.  In a syntax tree, each node
 represents a piece of text, and is connected to each other by a
@@ -155,31 +195,34 @@
 +------------+   +--------------+   +------------+
 </pre></div>
 
-<p>We can also represent it in s-expression:
+<p>We can also represent it as an s-expression:
 </p>
 <div class="example">
 <pre class="example">(root (expression (number) (operator) (number)))
 </pre></div>
 
 <span id="Node-types"></span><h4 class="subheading">Node types</h4>
-
-<span id="index-tree_002dsitter-node-type"></span>
-<span id="tree_002dsitter-node-type"></span><span id="index-tree_002dsitter-named-node"></span>
-<span id="tree_002dsitter-named-node"></span><span id="index-tree_002dsitter-anonymous-node"></span>
-<p>Names like <code>root</code>, <code>expression</code>, <code>number</code>,
-<code>operator</code> are nodes&rsquo; <em>type</em>.  However, not all nodes in a
-syntax tree have a type.  Nodes that don&rsquo;t are <em>anonymous nodes</em>,
-and nodes with a type are <em>named nodes</em>.  Anonymous nodes are
-tokens with fixed spellings, including punctuation characters like
-bracket &lsquo;<samp>]</samp>&rsquo;, and keywords like <code>return</code>.
+<span id="index-node-types_002c-in-a-syntax-tree"></span>
+
+<span id="index-type-of-node_002c-tree_002dsitter"></span>
+<span id="tree_002dsitter-node-type"></span><span id="index-named-node_002c-tree_002dsitter"></span>
+<span id="tree_002dsitter-named-node"></span><span id="index-anonymous-node_002c-tree_002dsitter"></span>
+<p>Names like <code>root</code>, <code>expression</code>, <code>number</code>, and
+<code>operator</code> specify the <em>type</em> of the nodes.  However, not all
+nodes in a syntax tree have a type.  Nodes that don&rsquo;t have a type are
+known as <em>anonymous nodes</em>, and nodes with a type are <em>named
+nodes</em>.  Anonymous nodes are tokens with fixed spellings, including
+punctuation characters like bracket &lsquo;<samp>]</samp>&rsquo;, and keywords like
+<code>return</code>.
 </p>
 <span id="Field-names"></span><h4 class="subheading">Field names</h4>
 
+<span id="index-field-name_002c-tree_002dsitter"></span>
 <span id="index-tree_002dsitter-node-field-name"></span>
-<span id="tree_002dsitter-node-field-name"></span><p>To make the syntax tree easier to
-analyze, many language definitions assign <em>field names</em> to child
-nodes.  For example, a <code>function_definition</code> node could have a
-<code>declarator</code> and a <code>body</code>:
+<span id="tree_002dsitter-node-field-name"></span><p>To make the syntax tree easier to analyze, many language definitions
+assign <em>field names</em> to child nodes.  For example, a
+<code>function_definition</code> node could have a <code>declarator</code> and a
+<code>body</code>:
 </p>
 <div class="example">
 <pre class="example">(function_definition
@@ -189,39 +232,40 @@
 
 <dl class="def">
 <dt id="index-treesit_002dinspect_002dmode"><span class="category">Command: </span><span><strong>treesit-inspect-mode</strong><a href='#index-treesit_002dinspect_002dmode' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This minor mode displays the node that <em>starts</em> at point in
-mode-line.  The mode-line will display
+<dd><p>This minor mode displays on the mode-line the node that <em>starts</em>
+at point.  The mode-line will display
 </p>
 <div class="example">
-<pre class="example"><var>parent</var> <var>field-name</var>: (<var>child</var> (<var>grand-child</var> (...)))
+<pre class="example"><var>parent</var> <var>field</var>: (<var>child</var> (<var>grandchild</var> (&hellip;)))
 </pre></div>
 
-<p><var>child</var>, <var>grand-child</var>, and <var>grand-grand-child</var>, etc, are
-nodes that have their beginning at point.  And <var>parent</var> is the
-parent of <var>child</var>.
+<p><var>child</var>, <var>grand</var>, <var>grand-grandchild</var>, etc., are nodes that
+begin at point.  <var>parent</var> is the parent node of <var>child</var>.
 </p>
 <p>If there is no node that starts at point, i.e., point is in the middle
 of a node, then the mode-line only displays the smallest node that
-spans point, and its immediate parent.
+spans the position of point, and its immediate parent.
 </p>
 <p>This minor mode doesn&rsquo;t create parsers on its own.  It simply uses the
 first parser in <code>(treesit-parser-list)</code> (see <a href="Using-Parser.html">Using Tree-sitter Parser</a>).
 </p></dd></dl>
 
 <span id="Reading-the-grammar-definition"></span><h3 class="heading">Reading the grammar definition</h3>
+<span id="index-reading-grammar-definition_002c-tree_002dsitter"></span>
 
 <p>Authors of language definitions define the <em>grammar</em> of a
-language, and this grammar determines how does a parser construct a
-concrete syntax tree out of the text.  In order to use the syntax
-tree effectively, we need to read the <em>grammar file</em>.
+programming language, which determines how a parser constructs a
+concrete syntax tree out of the program text.  In order to use the
+syntax tree effectively, you need to consult the <em>grammar file</em>.
 </p>
-<p>The grammar file is usually <code>grammar.js</code> in a language
-definition’s project repository.  The link to a language definition’s
-home page can be found in tree-sitter’s homepage
-(<a href="https://tree-sitter.github.io/tree-sitter">https://tree-sitter.github.io/tree-sitter</a>).
+<p>The grammar file is usually <samp>grammar.js</samp> in a language
+definition&rsquo;s project repository.  The link to a language definition&rsquo;s
+home page can be found on
+<a href="https://tree-sitter.github.io/tree-sitter">tree-sitter&rsquo;s
+homepage</a>.
 </p>
-<p>The grammar is written in JavaScript syntax.  For example, the rule
-matching a <code>function_definition</code> node looks like
+<p>The grammar definition is written in JavaScript.  For example, the
+rule matching a <code>function_definition</code> node looks like
 </p>
 <div class="example">
 <pre class="example">function_definition: $ =&gt; seq(
@@ -231,12 +275,12 @@
 )
 </pre></div>
 
-<p>The rule is represented by a function that takes a single argument
+<p>The rules are represented by functions that take a single argument
 <var>$</var>, representing the whole grammar.  The function itself is
-constructed by other functions: the <code>seq</code> function puts together a
-sequence of children; the <code>field</code> function annotates a child with
-a field name.  If we write the above definition in BNF syntax, it
-would look like
+constructed by other functions: the <code>seq</code> function puts together
+a sequence of children; the <code>field</code> function annotates a child
+with a field name.  If we write the above definition in the so-called
+<em>Backus-Naur Form</em> (<acronym>BNF</acronym>) syntax, it would look like
 </p>
 <div class="example">
 <pre class="example">function_definition :=
@@ -252,66 +296,77 @@
   body: (compound_statement))
 </pre></div>
 
-<p>Below is a list of functions that one will see in a grammar
-definition.  Each function takes other rules as arguments and returns
-a new rule.
+<p>Below is a list of functions that one can see in a grammar definition.
+Each function takes other rules as arguments and returns a new rule.
 </p>
-<ul>
-<li> <code>seq(rule1, rule2, ...)</code> matches each rule one after another.
-
-</li><li> <code>choice(rule1, rule2, ...)</code> matches one of the rules in its
-arguments.
-
-</li><li> <code>repeat(rule)</code> matches <var>rule</var> for <em>zero or more</em> times.
+<dl compact="compact">
+<dt><span><code>seq(<var>rule1</var>, <var>rule2</var>, &hellip;)</code></span></dt>
+<dd><p>matches each rule one after another.
+</p></dd>
+<dt><span><code>choice(<var>rule1</var>, <var>rule2</var>, &hellip;)</code></span></dt>
+<dd><p>matches one of the rules in its arguments.
+</p></dd>
+<dt><span><code>repeat(<var>rule</var>)</code></span></dt>
+<dd><p>matches <var>rule</var> for <em>zero or more</em> times.
 This is like the &lsquo;<samp>*</samp>&rsquo; operator in regular expressions.
-
-</li><li> <code>repeat1(rule)</code> matches <var>rule</var> for <em>one or more</em> times.
+</p></dd>
+<dt><span><code>repeat1(<var>rule</var>)</code></span></dt>
+<dd><p>matches <var>rule</var> for <em>one or more</em> times.
 This is like the &lsquo;<samp>+</samp>&rsquo; operator in regular expressions.
-
-</li><li> <code>optional(rule)</code> matches <var>rule</var> for <em>zero or one</em> time.
+</p></dd>
+<dt><span><code>optional(<var>rule</var>)</code></span></dt>
+<dd><p>matches <var>rule</var> for <em>zero or one</em> time.
 This is like the &lsquo;<samp>?</samp>&rsquo; operator in regular expressions.
-
-</li><li> <code>field(name, rule)</code> assigns field name <var>name</var> to the child
-node matched by <var>rule</var>.
-
-</li><li> <code>alias(rule, alias)</code> makes nodes matched by <var>rule</var> appear as
-<var>alias</var> in the syntax tree generated by the parser.  For example,
-
+</p></dd>
+<dt><span><code>field(<var>name</var>, <var>rule</var>)</code></span></dt>
+<dd><p>assigns field name <var>name</var> to the child node matched by <var>rule</var>.
+</p></dd>
+<dt><span><code>alias(<var>rule</var>, <var>alias</var>)</code></span></dt>
+<dd><p>makes nodes matched by <var>rule</var> appear as <var>alias</var> in the syntax
+tree generated by the parser.  For example,
+</p>
 <div class="example">
 <pre class="example">alias(preprocessor_call_exp, call_expression)
 </pre></div>
 
-<p>makes any node matched by <code>preprocessor_call_exp</code> to appear as
+<p>makes any node matched by <code>preprocessor_call_exp</code> appear as
 <code>call_expression</code>.
-</p></li></ul>
+</p></dd>
+</dl>
 
-<p>Below are grammar functions less interesting for a reader of a
+<p>Below are grammar functions of lesser importance for reading a
 language definition.
 </p>
-<ul>
-<li> <code>token(rule)</code> marks <var>rule</var> to produce a single leaf node.
-That is, instead of generating a parent node with individual child
-nodes under it, everything is combined into a single leaf node.
-
-</li><li> Normally, grammar rules ignore preceding whitespaces,
-<code>token.immediate(rule)</code> changes <var>rule</var> to match only when
-there is no preceding whitespaces.
-
-</li><li> <code>prec(n, rule)</code> gives <var>rule</var> a level <var>n</var> precedence.
-
-</li><li> <code>prec.left([n,] rule)</code> marks <var>rule</var> as left-associative,
-optionally with level <var>n</var>.
-
-</li><li> <code>prec.right([n,] rule)</code> marks <var>rule</var> as right-associative,
-optionally with level <var>n</var>.
-
-</li><li> <code>prec.dynamic(n, rule)</code> is like <code>prec</code>, but the precedence
-is applied at runtime instead.
-</li></ul>
-
-<p>The tree-sitter project talks about writing a grammar in more detail:
-<a href="https://tree-sitter.github.io/tree-sitter/creating-parsers">https://tree-sitter.github.io/tree-sitter/creating-parsers</a>.
-Read especially &ldquo;The Grammar DSL&rdquo; section.
+<dl compact="compact">
+<dt><span><code>token(<var>rule</var>)</code></span></dt>
+<dd><p>marks <var>rule</var> to produce a single leaf node.  That is, instead of
+generating a parent node with individual child nodes under it,
+everything is combined into a single leaf node.
+</p></dd>
+<dt><span><code>token.immediate(<var>rule</var>)</code></span></dt>
+<dd><p>Normally, grammar rules ignore preceding whitespace; this
+changes <var>rule</var> to match only when there is no preceding
+whitespaces.
+</p></dd>
+<dt><span><code>prec(<var>n</var>, <var>rule</var>)</code></span></dt>
+<dd><p>gives <var>rule</var> the level-<var>n</var> precedence.
+</p></dd>
+<dt><span><code>prec.left([<var>n</var>,] <var>rule</var>)</code></span></dt>
+<dd><p>marks <var>rule</var> as left-associative, optionally with level <var>n</var>.
+</p></dd>
+<dt><span><code>prec.right([<var>n</var>,] <var>rule</var>)</code></span></dt>
+<dd><p>marks <var>rule</var> as right-associative, optionally with level <var>n</var>.
+</p></dd>
+<dt><span><code>prec.dynamic(<var>n</var>, <var>rule</var>)</code></span></dt>
+<dd><p>this is like <code>prec</code>, but the precedence is applied at runtime
+instead.
+</p></dd>
+</dl>
+
+<p>The documentation of the tree-sitter project has
+<a href="https://tree-sitter.github.io/tree-sitter/creating-parsers">more
+about writing a grammar</a>.  Read especially &ldquo;The Grammar DSL&rdquo;
+section.
 </p>
 </div>
 <hr>
diff --git a/admin/notes/tree-sitter/html-manual/Multiple-Languages.html b/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
index 1ee2df7f44..eac142921f 100644
--- a/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
+++ b/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
@@ -33,7 +33,7 @@
 <link href="Index.html" rel="index" title="Index">
 <link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
 <link href="Parsing-Program-Source.html" rel="up" title="Parsing Program Source">
-<link href="Tree_002dsitter-C-API.html" rel="next" title="Tree-sitter C API">
+<link href="Tree_002dsitter-major-modes.html" rel="next" title="Tree-sitter major modes">
 <link href="Pattern-Matching.html" rel="prev" title="Pattern Matching">
 <style type="text/css">
 <!--
@@ -63,27 +63,29 @@
 <div class="section" id="Multiple-Languages">
 <div class="header">
 <p>
-Next: <a href="Tree_002dsitter-C-API.html" accesskey="n" rel="next">Tree-sitter C API Correspondence</a>, Previous: <a href="Pattern-Matching.html" accesskey="p" rel="prev">Pattern Matching Tree-sitter Nodes</a>, Up: <a href="Parsing-Program-Source.html" accesskey="u" rel="up">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+Next: <a href="Tree_002dsitter-major-modes.html" accesskey="n" rel="next">Developing major modes with tree-sitter</a>, Previous: <a href="Pattern-Matching.html" accesskey="p" rel="prev">Pattern Matching Tree-sitter Nodes</a>, Up: <a href="Parsing-Program-Source.html" accesskey="u" rel="up">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
 <span id="Parsing-Text-in-Multiple-Languages"></span><h3 class="section">37.6 Parsing Text in Multiple Languages</h3>
 
-<p>Sometimes, the source of a programming language could contain sources
-of other languages, HTML + CSS + JavaScript is one example.  In that
-case, we need to assign individual parsers to text segments written in
-different languages.  Traditionally this is achieved by using
-narrowing.  While tree-sitter works with narrowing (see <a href="Using-Parser.html#tree_002dsitter-narrowing">narrowing</a>), the recommended way is to set ranges in which
-a parser will operate.
+<span id="index-multiple-languages_002c-parsing-with-tree_002dsitter"></span>
+<span id="index-parsing-multiple-languages-with-tree_002dsitter"></span>
+<p>Sometimes, the source of a programming language could contain snippets
+of other languages; <acronym>HTML</acronym> + <acronym>CSS</acronym> + JavaScript is one
+example.  In that case, text segments written in different languages
+need to be assigned different parsers.  Traditionally, this is
+achieved by using narrowing.  While tree-sitter works with narrowing
+(see <a href="Using-Parser.html#tree_002dsitter-narrowing">narrowing</a>), the recommended way is
+instead to set regions of buffer text in which a parser will operate.
 </p>
 <dl class="def">
 <dt id="index-treesit_002dparser_002dset_002dincluded_002dranges"><span class="category">Function: </span><span><strong>treesit-parser-set-included-ranges</strong> <em>parser ranges</em><a href='#index-treesit_002dparser_002dset_002dincluded_002dranges' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function sets the range of <var>parser</var> to <var>ranges</var>.  Then
-<var>parser</var> will only read the text covered in each range.  Each
-range in <var>ranges</var> is a list of cons <code>(<var>beg</var>
-. <var>end</var>)</code>.
+<dd><p>This function sets up <var>parser</var> to operate on <var>ranges</var>.  The
+<var>parser</var> will only read the text of the specified ranges.  Each
+range in <var>ranges</var> is a list of the form <code>(<var>beg</var>&nbsp;.&nbsp;<var>end</var>)</code><!-- /@w -->.
 </p>
-<p>Each range in <var>ranges</var> must come in order and not overlap.  That
-is, in pseudo code:
+<p>The ranges in <var>ranges</var> must come in order and must not overlap.
+That is, in pseudo code:
 </p>
 <div class="example">
 <pre class="example">(cl-loop for idx from 1 to (1- (length ranges))
@@ -95,12 +97,12 @@
 
 <span id="index-treesit_002drange_002dinvalid"></span>
 <p>If <var>ranges</var> violates this constraint, or something else went
-wrong, this function signals a <code>treesit-range-invalid</code>.  The
-signal data contains a specific error message and the ranges we are
-trying to set.
+wrong, this function signals the <code>treesit-range-invalid</code> error.
+The signal data contains a specific error message and the ranges we
+are trying to set.
 </p>
 <p>This function can also be used for disabling ranges.  If <var>ranges</var>
-is nil, the parser is set to parse the whole buffer.
+is <code>nil</code>, the parser is set to parse the whole buffer.
 </p>
 <p>Example:
 </p>
@@ -114,9 +116,9 @@
 <dt id="index-treesit_002dparser_002dincluded_002dranges"><span class="category">Function: </span><span><strong>treesit-parser-included-ranges</strong> <em>parser</em><a href='#index-treesit_002dparser_002dincluded_002dranges' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This function returns the ranges set for <var>parser</var>.  The return
 value is the same as the <var>ranges</var> argument of
-<code>treesit-parser-included-ranges</code>: a list of cons
-<code>(<var>beg</var> . <var>end</var>)</code>.  And if <var>parser</var> doesn&rsquo;t have any
-ranges, the return value is nil.
+<code>treesit-parser-included-ranges</code>: a list of cons cells of the form
+<code>(<var>beg</var>&nbsp;.&nbsp;<var>end</var>)</code><!-- /@w -->.  If <var>parser</var> doesn&rsquo;t have any
+ranges, the return value is <code>nil</code>.
 </p>
 <div class="example">
 <pre class="example">(treesit-parser-included-ranges parser)
@@ -131,7 +133,7 @@
 <var>parser-or-lang</var> could be either a parser or a language.  If it is
 a language, this function looks for the first parser in
 <code>(treesit-parser-list)</code> for that language in the current buffer,
-and set range for it.
+and sets the ranges for it.
 </p></dd></dl>
 
 <dl class="def">
@@ -145,68 +147,76 @@
 <dl class="def">
 <dt id="index-treesit_002dquery_002drange"><span class="category">Function: </span><span><strong>treesit-query-range</strong> <em>source query &amp;optional beg end</em><a href='#index-treesit_002dquery_002drange' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This function matches <var>source</var> with <var>query</var> and returns the
-ranges of captured nodes.  The return value has the same shape of
-other functions: a list of <code>(<var>beg</var> . <var>end</var>)</code>.
+ranges of captured nodes.  The return value is a list of cons cells of
+the form <code>(<var>beg</var>&nbsp;.&nbsp;<var>end</var>)</code><!-- /@w -->, where <var>beg</var> and
+<var>end</var> specify the beginning and the end of a region of text.
 </p>
 <p>For convenience, <var>source</var> can be a language symbol, a parser, or a
-node.  If a language symbol, this function matches in the root node of
-the first parser using that language; if a parser, this function
-matches in the root node of that parser; if a node, this function
-matches in that node.
-</p>
-<p>Parameter <var>query</var> is the query used to capture nodes
-(see <a href="Pattern-Matching.html">Pattern Matching Tree-sitter Nodes</a>). The capture names don&rsquo;t matter.  Parameter
-<var>beg</var> and <var>end</var>, if both non-nil, limits the range in which
-this function queries.
-</p>
-<p>Like other query functions, this function raises an
-<var>treesit-query-error</var> if <var>query</var> is malformed.
-</p></dd></dl>
-
-<dl class="def">
-<dt id="index-treesit_002dlanguage_002dat"><span class="category">Function: </span><span><strong>treesit-language-at</strong> <em>point</em><a href='#index-treesit_002dlanguage_002dat' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function tries to figure out which language is responsible for
-the text at <var>point</var>.  It goes over each parser in
-<code>(treesit-parser-list)</code> and see if that parser&rsquo;s range covers
-<var>point</var>.
+node.  If it&rsquo;s a language symbol, this function matches in the root
+node of the first parser using that language; if a parser, this
+function matches in the root node of that parser; if a node, this
+function matches in that node.
+</p>
+<p>The argument <var>query</var> is the query used to capture nodes
+(see <a href="Pattern-Matching.html">Pattern Matching Tree-sitter Nodes</a>).  The capture names don&rsquo;t matter.  The
+arguments <var>beg</var> and <var>end</var>, if both non-<code>nil</code>, limit the
+range in which this function queries.
+</p>
+<p>Like other query functions, this function raises the
+<code>treesit-query-error</code> error if <var>query</var> is malformed.
 </p></dd></dl>
 
 <dl class="def">
 <dt id="index-treesit_002drange_002dfunctions"><span class="category">Variable: </span><span><strong>treesit-range-functions</strong><a href='#index-treesit_002drange_002dfunctions' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>A list of range functions.  Font-locking and indenting code uses
-functions in this alist to set correct ranges for a language parser
-before using it.
+<dd><p>This variable holds the list of range functions.  Font-locking and
+indenting code use functions in this list to set correct ranges for
+a language parser before using it.
 </p>
-<p>The signature of each function should be
+<p>The signature of each function in the list should be:
 </p>
 <div class="example">
 <pre class="example">(<var>start</var> <var>end</var> &amp;rest <var>_</var>)
 </pre></div>
 
-<p>where <var>start</var> and <var>end</var> marks the region that is about to be
-used.  A range function only need to (but not limited to) update
+<p>where <var>start</var> and <var>end</var> specify the region that is about to be
+used.  A range function only needs to (but is not limited to) update
 ranges in that region.
 </p>
-<p>Each function in the list is called in-order.
+<p>The functions in the list are called in order.
 </p></dd></dl>
 
 <dl class="def">
 <dt id="index-treesit_002dupdate_002dranges"><span class="category">Function: </span><span><strong>treesit-update-ranges</strong> <em>&amp;optional start end</em><a href='#index-treesit_002dupdate_002dranges' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function is used by font-lock and indent to update ranges before
-using any parser.  Each range function in
+<dd><p>This function is used by font-lock and indentation to update ranges
+before using any parser.  Each range function in
 <var>treesit-range-functions</var> is called in-order.  Arguments
 <var>start</var> and <var>end</var> are passed to each range function.
 </p></dd></dl>
 
+<span id="index-treesit_002dlanguage_002dat_002dpoint_002dfunction"></span>
+<dl class="def">
+<dt id="index-treesit_002dlanguage_002dat"><span class="category">Function: </span><span><strong>treesit-language-at</strong> <em>pos</em><a href='#index-treesit_002dlanguage_002dat' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function tries to figure out which language is responsible for
+the text at buffer position <var>pos</var>.  Under the hood it just calls
+<code>treesit-language-at-point-function</code>.
+</p>
+<p>Various Lisp programs use this function.  For example, the indentation
+program uses this function to determine which language&rsquo;s rule to use
+in a multi-language buffer.  So it is important to provide
+<code>treesit-language-at-point-function</code> for a multi-language major
+mode.
+</p></dd></dl>
+
 <span id="An-example"></span><h3 class="heading">An example</h3>
 
 <p>Normally, in a set of languages that can be mixed together, there is a
-major language and several embedded languages. We first parse the
-whole document with the major language’s parser, set ranges for the
-embedded languages, then parse the embedded languages.
+major language and several embedded languages.  A Lisp program usually
+first parses the whole document with the major language&rsquo;s parser, sets
+ranges for the embedded languages, and then parses the embedded
+languages.
 </p>
-<p>Suppose we want to parse a very simple document that mixes HTML, CSS
-and JavaScript:
+<p>Suppose we need to parse a very simple document that mixes
+<acronym>HTML</acronym>, <acronym>CSS</acronym> and JavaScript:
 </p>
 <div class="example">
 <pre class="example">&lt;html&gt;
@@ -215,22 +225,25 @@
 &lt;/html&gt;
 </pre></div>
 
-<p>We first parse with HTML, then set ranges for CSS and JavaScript:
+<p>We first parse with <acronym>HTML</acronym>, then set ranges for <acronym>CSS</acronym>
+and JavaScript:
 </p>
 <div class="example">
 <pre class="example">;; Create parsers.
 (setq html (treesit-get-parser-create 'html))
 (setq css (treesit-get-parser-create 'css))
 (setq js (treesit-get-parser-create 'javascript))
+</pre><pre class="example">
 
-;; Set CSS ranges.
+</pre><pre class="example">;; Set CSS ranges.
 (setq css-range
       (treesit-query-range
        'html
        &quot;(style_element (raw_text) @capture)&quot;))
 (treesit-parser-set-included-ranges css css-range)
+</pre><pre class="example">
 
-;; Set JavaScript ranges.
+</pre><pre class="example">;; Set JavaScript ranges.
 (setq js-range
       (treesit-query-range
        'html
@@ -238,15 +251,15 @@
 (treesit-parser-set-included-ranges js js-range)
 </pre></div>
 
-<p>We use a query pattern <code>(style_element (raw_text) @capture)</code> to
-find CSS nodes in the HTML parse tree. For how to write query
-patterns, see <a href="Pattern-Matching.html">Pattern Matching Tree-sitter Nodes</a>.
+<p>We use a query pattern <code><span class="nolinebreak">(style_element</span>&nbsp;<span class="nolinebreak">(raw_text)</span>&nbsp;@capture)</code><!-- /@w -->
+to find <acronym>CSS</acronym> nodes in the <acronym>HTML</acronym> parse tree.  For how
+to write query patterns, see <a href="Pattern-Matching.html">Pattern Matching Tree-sitter Nodes</a>.
 </p>
 </div>
 <hr>
 <div class="header">
 <p>
-Next: <a href="Tree_002dsitter-C-API.html">Tree-sitter C API Correspondence</a>, Previous: <a href="Pattern-Matching.html">Pattern Matching Tree-sitter Nodes</a>, Up: <a href="Parsing-Program-Source.html">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+Next: <a href="Tree_002dsitter-major-modes.html">Developing major modes with tree-sitter</a>, Previous: <a href="Pattern-Matching.html">Pattern Matching Tree-sitter Nodes</a>, Up: <a href="Parsing-Program-Source.html">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
 </div>
 
 
diff --git a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html
index c91152edc0..4f2933c985 100644
--- a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html
+++ b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html
@@ -66,47 +66,78 @@
 </div>
 <hr>
 <span id="Parser_002dbased-Font-Lock-1"></span><h4 class="subsection">24.6.10 Parser-based Font Lock</h4>
+<span id="index-parser_002dbased-font_002dlock"></span>
 
 
 <p>Besides simple syntactic font lock and regexp-based font lock, Emacs
-also provides complete syntactic font lock with the help of a parser,
-currently provided by the tree-sitter library (see <a href="Parsing-Program-Source.html">Parsing Program Source</a>).
+also provides complete syntactic font lock with the help of a parser.
+Currently, Emacs uses the tree-sitter library (see <a href="Parsing-Program-Source.html">Parsing Program Source</a>) for this purpose.
 </p>
-<dl class="def">
-<dt id="index-treesit_002dfont_002dlock_002denable"><span class="category">Function: </span><span><strong>treesit-font-lock-enable</strong><a href='#index-treesit_002dfont_002dlock_002denable' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function enables parser-based font lock in the current buffer.
-</p></dd></dl>
-
-<p>Parser-based font lock and other font lock mechanism are not mutually
+<p>Parser-based font lock and other font lock mechanisms are not mutually
 exclusive.  By default, if enabled, parser-based font lock runs first,
-then the simple syntactic font lock (if enabled), then regexp-based
-font lock.
+replacing syntactic font lock, then the regexp-based font lock.
 </p>
 <p>Although parser-based font lock doesn&rsquo;t share the same customization
-variables with regexp-based font lock, parser-based font lock uses
-similar customization schemes.  The tree-sitter counterpart of
-<var>font-lock-keywords</var> is <var>treesit-font-lock-settings</var>.
+variables with regexp-based font lock, it uses similar customization
+schemes.  The tree-sitter counterpart of <var>font-lock-keywords</var> is
+<var>treesit-font-lock-settings</var>.
+</p>
+<span id="index-tree_002dsitter-fontifications_002c-overview"></span>
+<span id="index-fontifications-with-tree_002dsitter_002c-overview"></span>
+<p>In general, tree-sitter fontification works as follows:
+</p>
+<ul>
+<li> A Lisp program (usually, part of a major mode) provides a <em>query</em>
+consisting of <em>patterns</em>, each pattern associated with a
+<em>capture name</em>.
+
+</li><li> The tree-sitter library finds the nodes in the parse tree
+that match these patterns, tags the nodes with the corresponding
+capture names, and returns them to the Lisp program.
+
+</li><li> The Lisp program uses the returned nodes to highlight the portions of
+buffer text corresponding to each node as appropriate, using the
+tagged capture names of the nodes to determine the correct
+fontification.  For example, a node tagged <code>font-lock-keyword</code>
+would be highlighted in <code>font-lock-keyword</code> face.
+</li></ul>
+
+<p>For more information about queries, patterns, and capture names, see
+<a href="Pattern-Matching.html">Pattern Matching Tree-sitter Nodes</a>.
+</p>
+<p>To setup tree-sitter fontification, a major mode should first set
+<code>treesit-font-lock-settings</code> with the output of
+<code>treesit-font-lock-rules</code>, then call
+<code>treesit-major-mode-setup</code>.
 </p>
 <dl class="def">
 <dt id="index-treesit_002dfont_002dlock_002drules"><span class="category">Function: </span><span><strong>treesit-font-lock-rules</strong> <em>:keyword value query...</em><a href='#index-treesit_002dfont_002dlock_002drules' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This function is used to set <var>treesit-font-lock-settings</var>.  It
-takes care of compiling queries and other post-processing and outputs
-a value that <var>treesit-font-lock-settings</var> accepts.  An example:
+takes care of compiling queries and other post-processing, and outputs
+a value that <var>treesit-font-lock-settings</var> accepts.  Here&rsquo;s an
+example:
 </p>
 <div class="example">
 <pre class="example">(treesit-font-lock-rules
  :language 'javascript
+ :feature 'constant
  :override t
  '((true) @font-lock-constant-face
    (false) @font-lock-constant-face)
  :language 'html
+ :feature 'script
  &quot;(script_element) @font-lock-builtin-face&quot;)
 </pre></div>
 
 <p>This function takes a list of text or s-exp queries.  Before each
-query, there are <var>:keyword</var> and <var>value</var> pairs that configure
-that query.  The <code>:lang</code> keyword sets the query’s language and
-every query must specify the language.  Other keywords are optional:
+query, there are <var>:keyword</var>-<var>value</var> pairs that configure
+that query.  The <code>:lang</code> keyword sets the query&rsquo;s language and
+every query must specify the language.  The <code>:feature</code> keyword
+sets the feature name of the query.  Users can control which features
+are enabled with <code>font-lock-maximum-decoration</code> and
+<code>treesit-font-lock-feature-list</code> (see below).
+</p>
+<p>Other keywords are optional:
 </p>
 <table>
 <thead><tr><th width="15%">Keyword</th><th width="15%">Value</th><th width="60%">Description</th></tr></thead>
@@ -115,43 +146,92 @@
 <tr><td width="15%"></td><td width="15%"><code>append</code></td><td width="60%">Append the new face to existing ones</td></tr>
 <tr><td width="15%"></td><td width="15%"><code>prepend</code></td><td width="60%">Prepend the new face to existing ones</td></tr>
 <tr><td width="15%"></td><td width="15%"><code>keep</code></td><td width="60%">Fill-in regions without an existing face</td></tr>
-<tr><td width="15%"><code>:toggle</code></td><td width="15%"><var>symbol</var></td><td width="60%">If non-nil, its value should be a variable name.  The variable&rsquo;s value
-(nil/non-nil) disables/enables the query during fontification.</td></tr>
-<tr><td width="15%"></td><td width="15%">nil</td><td width="60%">Always enable this query.</td></tr>
-<tr><td width="15%"><code>:level</code></td><td width="15%"><var>integer</var></td><td width="60%">If non-nil, its value should be the decoration level for this query.
-Decoration level is controlled by <code>font-lock-maximum-decoration</code>.</td></tr>
-<tr><td width="15%"></td><td width="15%">nil</td><td width="60%">Always enable this query.</td></tr>
 </table>
 
-<p>Note that a query is applied only when both <code>:toggle</code> and
-<code>:level</code> permit it.  <code>:level</code> is used for global,
-coarse-grained control, whereas <code>:toggle</code> is for local,
-fine-grained control.
-</p>
-<p>Capture names in <var>query</var> should be face names like
+<p>Lisp programs mark patterns in the query with capture names (names
+that starts with <code>@</code>), and tree-sitter will return matched nodes
+tagged with those same capture names.  For the purpose of
+fontification, capture names in <var>query</var> should be face names like
 <code>font-lock-keyword-face</code>.  The captured node will be fontified
-with that face.  Capture names can also be function names, in which
-case the function is called with (<var>start</var> <var>end</var> <var>node</var>),
-where <var>start</var> and <var>end</var> are the start and end position of the
-node in buffer, and <var>node</var> is the node itself.  If a capture name
-is both a face and a function, the face takes priority.  If a capture
-name is not a face name nor a function name, it is ignored.
+with that face.
+</p>
+<span id="index-treesit_002dfontify_002dwith_002doverride"></span>
+<p>Capture names can also be function names, in which case the function
+is called with 4 arguments: <var>node</var> and <var>override</var>, <var>start</var>
+and <var>end</var>, where <var>node</var> is the node itself, <var>override</var> is
+the override property of the rule which captured this node, and
+<var>start</var> and <var>end</var> limits the region in which this function
+should fontify.  (If this function wants to respect the <var>override</var>
+argument, it can use <code>treesit-fontify-with-override</code>.)
+</p>
+<p>Beyond the 4 arguments presented, this function should accept more
+arguments as optional arguments for future extensibility.
+</p>
+<p>If a capture name is both a face and a function, the face takes
+priority.  If a capture name is neither a face nor a function, it is
+ignored.
 </p></dd></dl>
 
+<p>Contextual entities, like multi-line strings, or <code>/* */</code> style
+comments, need special care, because change in these entities might
+cause change in a large portion of the buffer.  For example, inserting
+the closing comment delimiter <code>*/</code> will change all the text
+between it and the opening delimiter to comment face.  Such entities
+should be captured in a special name <code>contextual</code>, so Emacs can
+correctly update their fontification.  Here is an example for
+comments:
+</p>
+<div class="example">
+<pre class="example">(treesit-font-lock-rules
+ :language 'javascript
+ :feature 'comment
+ :override t
+ '((comment) @font-lock-comment-face)
+   (comment) @contextual))
+</pre></div>
+
 <dl class="def">
-<dt id="index-treesit_002dfont_002dlock_002dsettings"><span class="category">Variable: </span><span><strong>treesit-font-lock-settings</strong><a href='#index-treesit_002dfont_002dlock_002dsettings' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>A list of <var>setting</var>s for tree-sitter font lock.  The exact format
-of this variable is considered internal.  One should always use
-<code>treesit-font-lock-rules</code> to set this variable.
+<dt id="index-treesit_002dfont_002dlock_002dfeature_002dlist"><span class="category">Variable: </span><span><strong>treesit-font-lock-feature-list</strong><a href='#index-treesit_002dfont_002dlock_002dfeature_002dlist' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This is a list of lists of feature symbols.  Each element of the list
+is a list that represents a decoration level.
+<code>font-lock-maximum-decoration</code> controls which levels are
+activated.
 </p>
-<p>Each <var>setting</var> is of form
+<p>Each element of the list is a list of the form <code>(<var>feature</var>&nbsp;&hellip;)</code><!-- /@w -->, where each <var>feature</var> corresponds to the
+<code>:feature</code> value of a query defined in
+<code>treesit-font-lock-rules</code>.  Removing a feature symbol from this
+list disables the corresponding query during font-lock.
 </p>
-<div class="example">
-<pre class="example">(<var>language</var> <var>query</var>)
+<p>Common feature names, for many programming languages, include
+function-name, type, variable-name (left-hand-side or <acronym>LHS</acronym> of
+assignments), builtin, constant, keyword, string-interpolation,
+comment, doc, string, operator, preprocessor, escape-sequence, and key
+(in key-value pairs).  Major modes are free to subdivide or extend
+these common features.
+</p>
+<p>For example, the value of this variable could be:
+</p><div class="example">
+<pre class="example">((comment string doc) ; level 1
+ (function-name keyword type builtin constant) ; level 2
+ (variable-name string-interpolation key)) ; level 3
 </pre></div>
 
-<p>Each <var>setting</var> controls one parser (often of different language).
-And <var>language</var> is the language symbol (see <a href="Language-Definitions.html">Tree-sitter Language Definitions</a>); <var>query</var> is the query (see <a href="Pattern-Matching.html">Pattern Matching Tree-sitter Nodes</a>).
+<p>Major modes should set this variable before calling
+<code>treesit-major-mode-setup</code>.
+</p>
+<span id="index-treesit_002dfont_002dlock_002drecompute_002dfeatures"></span>
+<p>For this variable to take effect, a Lisp program should call
+<code>treesit-font-lock-recompute-features</code> (which resets
+<code>treesit-font-lock-settings</code> accordingly), or
+<code>treesit-major-mode-setup</code> (which calls
+<code>treesit-font-lock-recompute-features</code>).
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dfont_002dlock_002dsettings"><span class="category">Variable: </span><span><strong>treesit-font-lock-settings</strong><a href='#index-treesit_002dfont_002dlock_002dsettings' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>A list of settings for tree-sitter based font lock.  The exact format
+of this variable is considered internal.  One should always use
+<code>treesit-font-lock-rules</code> to set this variable.
 </p></dd></dl>
 
 <p>Multi-language major modes should provide range functions in
diff --git a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html
index 691c8fba8c..2fdb50df7c 100644
--- a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html
+++ b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html
@@ -66,170 +66,176 @@
 </div>
 <hr>
 <span id="Parser_002dbased-Indentation-1"></span><h4 class="subsection">24.7.2 Parser-based Indentation</h4>
+<span id="index-parser_002dbased-indentation"></span>
 
 
-<p>When built with the tree-sitter library (see <a href="Parsing-Program-Source.html">Parsing Program Source</a>), Emacs could parse program source and produce a syntax tree.
-And this syntax tree can be used for indentation.  For maximum
-flexibility, we could write a custom indent function that queries the
-syntax tree and indents accordingly for each language, but that would
-be a lot of work.  It is more convenient to use the simple indentation
-engine described below: we only need to write some indentation rules
+<p>When built with the tree-sitter library (see <a href="Parsing-Program-Source.html">Parsing Program Source</a>), Emacs is capable of parsing the program source and producing
+a syntax tree.  This syntax tree can be used for guiding the program
+source indentation commands.  For maximum flexibility, it is possible
+to write a custom indentation function that queries the syntax tree
+and indents accordingly for each language, but that is a lot of work.
+It is more convenient to use the simple indentation engine described
+below: then the major mode needs only to write some indentation rules
 and the engine takes care of the rest.
 </p>
-<p>To enable the indentation engine, set the value of
+<p>To enable the parser-based indentation engine, either set
+<var>treesit-simple-indent-rules</var> and call
+<code>treesit-major-mode-setup</code>, or equivalently, set the value of
 <code>indent-line-function</code> to <code>treesit-indent</code>.
 </p>
 <dl class="def">
 <dt id="index-treesit_002dindent_002dfunction"><span class="category">Variable: </span><span><strong>treesit-indent-function</strong><a href='#index-treesit_002dindent_002dfunction' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This variable stores the actual function called by
 <code>treesit-indent</code>.  By default, its value is
-<code>treesit-simple-indent</code>.  In the future we might add other
+<code>treesit-simple-indent</code>.  In the future we might add other,
 more complex indentation engines.
 </p></dd></dl>
 
 <span id="Writing-indentation-rules"></span><h3 class="heading">Writing indentation rules</h3>
+<span id="index-indentation-rules_002c-for-parser_002dbased-indentation"></span>
 
 <dl class="def">
 <dt id="index-treesit_002dsimple_002dindent_002drules"><span class="category">Variable: </span><span><strong>treesit-simple-indent-rules</strong><a href='#index-treesit_002dsimple_002dindent_002drules' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This local variable stores indentation rules for every language. It is
-a list of
-</p>
-<div class="example">
-<pre class="example">(<var>language</var> . <var>rules</var>)
-</pre></div>
-
-<p>where <var>language</var> is a language symbol, and <var>rules</var> is a list
-of
-</p>
-<div class="example">
-<pre class="example">(<var>matcher</var> <var>anchor</var> <var>offset</var>)
-</pre></div>
-
-<p>First Emacs passes the node at point to <var>matcher</var>, if it return
-non-nil, this rule applies.  Then Emacs passes the node to
-<var>anchor</var>, it returns a point.  Emacs takes the column number of
-that point, add <var>offset</var> to it, and the result is the indent for
-the current line.
+<dd><p>This local variable stores indentation rules for every language.  It is
+a list of the form: <code>(<var>language</var>&nbsp;.&nbsp;<var>rules</var>)</code><!-- /@w -->, where
+<var>language</var> is a language symbol, and <var>rules</var> is a list of the
+form <code>(<var>matcher</var>&nbsp;<var>anchor</var>&nbsp;<var>offset</var>)</code><!-- /@w -->.
+</p>
+<p>First, Emacs passes the smallest tree-sitter node at the beginning of
+the current line to <var>matcher</var>; if it returns non-<code>nil</code>, this
+rule is applicable.  Then Emacs passes the node to <var>anchor</var>, which
+returns a buffer position.  Emacs takes the column number of that
+position, adds <var>offset</var> to it, and the result is the indentation
+column for the current line.
 </p>
 <p>The <var>matcher</var> and <var>anchor</var> are functions, and Emacs provides
-convenient presets for them.  You can skip over to
-<code>treesit-simple-indent-presets</code> below, those presets should be
-more than enough.
-</p>
-<p>A <var>matcher</var> or an <var>anchor</var> is a function that takes three
-arguments (<var>node</var> <var>parent</var> <var>bol</var>).  Argument <var>bol</var> is
-the point at where we are indenting: the position of the first
-non-whitespace character from the beginning of line; <var>node</var> is the
-largest (highest-in-tree) node that starts at that point; <var>parent</var>
-is the parent of <var>node</var>.  A <var>matcher</var> returns nil/non-nil, and
-<var>anchor</var> returns a point.
+convenient defaults for them.
+</p>
+<p>Each <var>matcher</var> or <var>anchor</var> is a function that takes three
+arguments: <var>node</var>, <var>parent</var>, and <var>bol</var>.  The argument
+<var>bol</var> is the buffer position whose indentation is required: the
+position of the first non-whitespace character after the beginning of
+the line.  The argument <var>node</var> is the largest (highest-in-tree)
+node that starts at that position; and <var>parent</var> is the parent of
+<var>node</var>.  However, when that position is on a whitespace or inside
+a multi-line string, no node that starts at that position, so
+<var>node</var> is <code>nil</code>.  In that case, <var>parent</var> would be the
+smallest node that spans that position.
+</p>
+<p>Emacs finds <var>bol</var>, <var>node</var> and <var>parent</var> and
+passes them to each <var>matcher</var> and <var>anchor</var>.  <var>matcher</var>
+should return non-<code>nil</code> if the rule is applicable, and
+<var>anchor</var> should return a buffer position.
 </p></dd></dl>
 
 <dl class="def">
 <dt id="index-treesit_002dsimple_002dindent_002dpresets"><span class="category">Variable: </span><span><strong>treesit-simple-indent-presets</strong><a href='#index-treesit_002dsimple_002dindent_002dpresets' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This is a list of presets for <var>matcher</var>s and <var>anchor</var>s in
-<code>treesit-simple-indent-rules</code>.  Each of them represent a function
-that takes <var>node</var>, <var>parent</var> and <var>bol</var> as arguments.
-</p>
-<div class="example">
-<pre class="example">no-node
-</pre></div>
-
-<p>This matcher matches the case where <var>node</var> is nil, i.e., there is
-no node that starts at <var>bol</var>.  This is the case when <var>bol</var> is
-at an empty line or inside a multi-line string, etc.
-</p>
-<div class="example">
-<pre class="example">(parent-is <var>type</var>)
-</pre></div>
-
-<p>This matcher matches if <var>parent</var>&rsquo;s type is <var>type</var>.
-</p>
-<div class="example">
-<pre class="example">(node-is <var>type</var>)
-</pre></div>
-
-<p>This matcher matches if <var>node</var>&rsquo;s type is <var>type</var>.
-</p>
-<div class="example">
-<pre class="example">(query <var>query</var>)
-</pre></div>
-
-<p>This matcher matches if querying <var>parent</var> with <var>query</var>
-captures <var>node</var>.  The capture name does not matter.
-</p>
-<div class="example">
-<pre class="example">(match <var>node-type</var> <var>parent-type</var>
-       <var>node-field</var> <var>node-index-min</var> <var>node-index-max</var>)
-</pre></div>
-
-<p>This matcher checks if <var>node</var>&rsquo;s type is <var>node-type</var>,
-<var>parent</var>&rsquo;s type is <var>parent-type</var>, <var>node</var>&rsquo;s field name in
-<var>parent</var> is <var>node-field</var>, and <var>node</var>&rsquo;s index among its
-siblings is between <var>node-index-min</var> and <var>node-index-max</var>.  If
-the value of a constraint is nil, this matcher doesn&rsquo;t check for that
-constraint.  For example, to match the first child where parent is
-<code>argument_list</code>, use
+<dd><p>This is a list of defaults for <var>matcher</var>s and <var>anchor</var>s in
+<code>treesit-simple-indent-rules</code>.  Each of them represents a function
+that takes 3 arguments: <var>node</var>, <var>parent</var> and <var>bol</var>.  The
+available default functions are:
+</p>
+<dl compact="compact">
+<dt id='index-no_002dnode'><span><code>no-node</code><a href='#index-no_002dnode' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This matcher is a function that is called with 3 arguments:
+<var>node</var>, <var>parent</var>, and <var>bol</var>, and returns non-<code>nil</code>,
+indicating a match, if <var>node</var> is <code>nil</code>, i.e., there is no
+node that starts at <var>bol</var>.  This is the case when <var>bol</var> is on
+an empty line or inside a multi-line string, etc.
+</p>
+</dd>
+<dt id='index-parent_002dis'><span><code>parent-is</code><a href='#index-parent_002dis' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This matcher is a function of one argument, <var>type</var>; it returns a
+function that is called with 3 arguments: <var>node</var>, <var>parent</var>,
+and <var>bol</var>, and returns non-<code>nil</code> (i.e., a match) if
+<var>parent</var>&rsquo;s type matches regexp <var>type</var>.
+</p>
+</dd>
+<dt id='index-node_002dis'><span><code>node-is</code><a href='#index-node_002dis' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This matcher is a function of one argument, <var>type</var>; it returns a
+function that is called with 3 arguments: <var>node</var>, <var>parent</var>,
+and <var>bol</var>, and returns non-<code>nil</code> if <var>node</var>&rsquo;s type matches
+regexp <var>type</var>.
+</p>
+</dd>
+<dt id='index-query'><span><code>query</code><a href='#index-query' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This matcher is a function of one argument, <var>query</var>; it returns a
+function that is called with 3 arguments: <var>node</var>, <var>parent</var>,
+and <var>bol</var>, and returns non-<code>nil</code> if querying <var>parent</var>
+with <var>query</var> captures <var>node</var> (see <a href="Pattern-Matching.html">Pattern Matching Tree-sitter Nodes</a>).
+</p>
+</dd>
+<dt id='index-match'><span><code>match</code><a href='#index-match' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This matcher is a function of 5 arguments: <var>node-type</var>,
+<var>parent-type</var>, <var>node-field</var>, <var>node-index-min</var>, and
+<var>node-index-max</var>).  It returns a function that is called with 3
+arguments: <var>node</var>, <var>parent</var>, and <var>bol</var>, and returns
+non-<code>nil</code> if <var>node</var>&rsquo;s type matches regexp <var>node-type</var>,
+<var>parent</var>&rsquo;s type matches regexp <var>parent-type</var>, <var>node</var>&rsquo;s
+field name in <var>parent</var> matches regexp <var>node-field</var>, and
+<var>node</var>&rsquo;s index among its siblings is between <var>node-index-min</var>
+and <var>node-index-max</var>.  If the value of an argument is <code>nil</code>,
+this matcher doesn&rsquo;t check that argument.  For example, to match the
+first child where parent is <code>argument_list</code>, use
 </p>
 <div class="example">
 <pre class="example">(match nil &quot;argument_list&quot; nil nil 0 0)
 </pre></div>
 
-<div class="example">
-<pre class="example">first-sibling
-</pre></div>
-
-<p>This anchor returns the start of the first child of <var>parent</var>.
-</p>
-<div class="example">
-<pre class="example">parent
-</pre></div>
-
-<p>This anchor returns the start of <var>parent</var>.
-</p>
-<div class="example">
-<pre class="example">parent-bol
-</pre></div>
-
-<p>This anchor returns the beginning of non-space characters on the line
-where <var>parent</var> is on.
-</p>
-<div class="example">
-<pre class="example">prev-sibling
-</pre></div>
-
-<p>This anchor returns the start of the previous sibling of <var>node</var>.
-</p>
-<div class="example">
-<pre class="example">no-indent
-</pre></div>
-
-<p>This anchor returns the start of <var>node</var>, i.e., no indent.
-</p>
-<div class="example">
-<pre class="example">prev-line
-</pre></div>
-
-<p>This anchor returns the first non-whitespace charater on the previous
-line.
-</p></dd></dl>
+</dd>
+<dt id='index-first_002dsibling'><span><code>first-sibling</code><a href='#index-first_002dsibling' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This anchor is a function that is called with 3 arguments: <var>node</var>,
+<var>parent</var>, and <var>bol</var>, and returns the start of the first child
+of <var>parent</var>.
+</p>
+</dd>
+<dt id='index-parent'><span><code>parent</code><a href='#index-parent' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This anchor is a function that is called with 3 arguments: <var>node</var>,
+<var>parent</var>, and <var>bol</var>, and returns the start of <var>parent</var>.
+</p>
+</dd>
+<dt id='index-parent_002dbol'><span><code>parent-bol</code><a href='#index-parent_002dbol' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This anchor is a function that is called with 3 arguments: <var>node</var>,
+<var>parent</var>, and <var>bol</var>, and returns the first non-space character
+on the line of <var>parent</var>.
+</p>
+</dd>
+<dt id='index-prev_002dsibling'><span><code>prev-sibling</code><a href='#index-prev_002dsibling' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This anchor is a function that is called with 3 arguments: <var>node</var>,
+<var>parent</var>, and <var>bol</var>, and returns the start of the previous
+sibling of <var>node</var>.
+</p>
+</dd>
+<dt id='index-no_002dindent'><span><code>no-indent</code><a href='#index-no_002dindent' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This anchor is a function that is called with 3 arguments: <var>node</var>,
+<var>parent</var>, and <var>bol</var>, and returns the start of <var>node</var>.
+</p>
+</dd>
+<dt id='index-prev_002dline'><span><code>prev-line</code><a href='#index-prev_002dline' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This anchor is a function that is called with 3 arguments: <var>node</var>,
+<var>parent</var>, and <var>bol</var>, and returns the first non-whitespace
+charater on the previous line.
+</p></dd>
+</dl>
+
+</dd></dl>
 
 <span id="Indentation-utilities"></span><h3 class="heading">Indentation utilities</h3>
+<span id="index-utility-functions-for-parser_002dbased-indentation"></span>
 
-<p>Here are some utility functions that can help writing indentation
-rules.
+<p>Here are some utility functions that can help writing parser-based
+indentation rules.
 </p>
 <dl class="def">
 <dt id="index-treesit_002dcheck_002dindent"><span class="category">Function: </span><span><strong>treesit-check-indent</strong> <em>mode</em><a href='#index-treesit_002dcheck_002dindent' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function checks current buffer&rsquo;s indentation against major mode
-<var>mode</var>.  It indents the current buffer in <var>mode</var> and compares
-the indentation with the current indentation.  Then it pops up a diff
-buffer showing the difference.  Correct indentation (target) is in
-green, current indentation is in red.
-</p></dd></dl>
-
-<p>It is also helpful to use <code>treesit-inspect-mode</code> when writing
-indentation rules.
+<dd><p>This function checks the current buffer&rsquo;s indentation against major
+mode <var>mode</var>.  It indents the current buffer according to
+<var>mode</var> and compares the results with the current indentation.
+Then it pops up a buffer showing the differences.  Correct
+indentation (target) is shown in green color, current indentation is
+shown in red color.  </p></dd></dl>
+
+<p>It is also helpful to use <code>treesit-inspect-mode</code> (see <a href="Language-Definitions.html">Tree-sitter Language Definitions</a>) when writing indentation rules.
 </p>
 </div>
 <hr>
diff --git a/admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html b/admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html
index 81b42f7f52..ea22421ac4 100644
--- a/admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html
+++ b/admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html
@@ -68,53 +68,50 @@
 <hr>
 <span id="Parsing-Program-Source-1"></span><h2 class="chapter">37 Parsing Program Source</h2>
 
+<span id="index-syntax-tree_002c-from-parsing-program-source"></span>
 <p>Emacs provides various ways to parse program source text and produce a
-<em>syntax tree</em>.  In a syntax tree, text is no longer a
-one-dimensional stream but a structured tree of nodes, where each node
-representing a piece of text.  Thus a syntax tree can enable
-interesting features like precise fontification, indentation,
+<em>syntax tree</em>.  In a syntax tree, text is no longer considered a
+one-dimensional stream of characters, but a structured tree of nodes,
+where each node representing a piece of text.  Thus, a syntax tree can
+enable interesting features like precise fontification, indentation,
 navigation, structured editing, etc.
 </p>
 <p>Emacs has a simple facility for parsing balanced expressions
-(see <a href="Parsing-Expressions.html">Parsing Expressions</a>).  There is also SMIE library for generic
-navigation and indentation (see <a href="SMIE.html">Simple Minded Indentation Engine</a>).
+(see <a href="Parsing-Expressions.html">Parsing Expressions</a>).  There is also the SMIE library for
+generic navigation and indentation (see <a href="SMIE.html">Simple Minded Indentation Engine</a>).
 </p>
-<p>Emacs also provides integration with tree-sitter library
-(<a href="https://tree-sitter.github.io/tree-sitter">https://tree-sitter.github.io/tree-sitter</a>) if compiled with
-it.  The tree-sitter library implements an incremental parser and has
-support from a wide range of programming languages.
+<p>In addition to those, Emacs also provides integration with
+<a href="https://tree-sitter.github.io/tree-sitter">the tree-sitter
+library</a>) if support for it was compiled in.  The tree-sitter library
+implements an incremental parser and has support from a wide range of
+programming languages.
 </p>
 <dl class="def">
 <dt id="index-treesit_002davailable_002dp"><span class="category">Function: </span><span><strong>treesit-available-p</strong><a href='#index-treesit_002davailable_002dp' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function returns non-nil if tree-sitter features are available
-for this Emacs instance.
+<dd><p>This function returns non-<code>nil</code> if tree-sitter features are
+available for the current Emacs session.
 </p></dd></dl>
 
-<p>For tree-sitter integration with existing Emacs features,
-see <a href="Parser_002dbased-Font-Lock.html">Parser-based Font Lock</a>, <a href="Parser_002dbased-Indentation.html">Parser-based Indentation</a>, and
-<a href="List-Motion.html">Moving over Balanced Expressions</a>.
-</p>
-<p>About naming convention: use &ldquo;tree-sitter&rdquo; when referring to it as a
-noun, like <code>python-use-tree-sitter</code>, but use &ldquo;treesit&rdquo; for
-prefixes, like <code>python-treesit-indent-function</code>.
-</p>
-<p>To access the syntax tree of the text in a buffer, we need to first
-load a language definition and create a parser with it.  Next, we can
-query the parser for specific nodes in the syntax tree.  Then, we can
-access various information about the node, and we can pattern-match a
-node with a powerful syntax.  Finally, we explain how to work with
-source files that mixes multiple languages.  The following sections
-explain how to do each of the tasks in detail.
+<p>To be able to parse the program source using the tree-sitter library
+and access the syntax tree of the program, a Lisp program needs to
+load a language definition library, and create a parser for that
+language and the current buffer.  After that, the Lisp program can
+query the parser about specific nodes of the syntax tree.  Then, it
+can access various kinds of information about each node, and search
+for nodes using a powerful pattern-matching syntax.  This chapter
+explains how to do all this, and also how a Lisp program can work with
+source files that mix multiple programming languages.
 </p>
 
 <ul class="section-toc">
 <li><a href="Language-Definitions.html" accesskey="1">Tree-sitter Language Definitions</a></li>
 <li><a href="Using-Parser.html" accesskey="2">Using Tree-sitter Parser</a></li>
 <li><a href="Retrieving-Node.html" accesskey="3">Retrieving Node</a></li>
-<li><a href="Accessing-Node.html" accesskey="4">Accessing Node Information</a></li>
+<li><a href="Accessing-Node-Information.html" accesskey="4">Accessing Node Information</a></li>
 <li><a href="Pattern-Matching.html" accesskey="5">Pattern Matching Tree-sitter Nodes</a></li>
 <li><a href="Multiple-Languages.html" accesskey="6">Parsing Text in Multiple Languages</a></li>
-<li><a href="Tree_002dsitter-C-API.html" accesskey="7">Tree-sitter C API Correspondence</a></li>
+<li><a href="Tree_002dsitter-major-modes.html" accesskey="7">Developing major modes with tree-sitter</a></li>
+<li><a href="Tree_002dsitter-C-API.html" accesskey="8">Tree-sitter C API Correspondence</a></li>
 </ul>
 </div>
 <hr>
diff --git a/admin/notes/tree-sitter/html-manual/Pattern-Matching.html b/admin/notes/tree-sitter/html-manual/Pattern-Matching.html
index e14efe7162..21eb4702b1 100644
--- a/admin/notes/tree-sitter/html-manual/Pattern-Matching.html
+++ b/admin/notes/tree-sitter/html-manual/Pattern-Matching.html
@@ -34,7 +34,7 @@
 <link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
 <link href="Parsing-Program-Source.html" rel="up" title="Parsing Program Source">
 <link href="Multiple-Languages.html" rel="next" title="Multiple Languages">
-<link href="Accessing-Node.html" rel="prev" title="Accessing Node">
+<link href="Accessing-Node-Information.html" rel="prev" title="Accessing Node Information">
 <style type="text/css">
 <!--
 a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
@@ -63,32 +63,32 @@
 <div class="section" id="Pattern-Matching">
 <div class="header">
 <p>
-Next: <a href="Multiple-Languages.html" accesskey="n" rel="next">Parsing Text in Multiple Languages</a>, Previous: <a href="Accessing-Node.html" accesskey="p" rel="prev">Accessing Node Information</a>, Up: <a href="Parsing-Program-Source.html" accesskey="u" rel="up">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+Next: <a href="Multiple-Languages.html" accesskey="n" rel="next">Parsing Text in Multiple Languages</a>, Previous: <a href="Accessing-Node-Information.html" accesskey="p" rel="prev">Accessing Node Information</a>, Up: <a href="Parsing-Program-Source.html" accesskey="u" rel="up">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
 <span id="Pattern-Matching-Tree_002dsitter-Nodes"></span><h3 class="section">37.5 Pattern Matching Tree-sitter Nodes</h3>
+<span id="index-pattern-matching-with-tree_002dsitter-nodes"></span>
 
-<p>Tree-sitter let us pattern match with a small declarative language.
-Pattern matching consists of two steps: first tree-sitter matches a
-<em>pattern</em> against nodes in the syntax tree, then it <em>captures</em>
-specific nodes in that pattern and returns the captured nodes.
+<span id="index-capturing_002c-tree_002dsitter-node"></span>
+<p>Tree-sitter lets Lisp programs match patterns using a small
+declarative language.  This pattern matching consists of two steps:
+first tree-sitter matches a <em>pattern</em> against nodes in the syntax
+tree, then it <em>captures</em> specific nodes that matched the pattern
+and returns the captured nodes.
 </p>
 <p>We describe first how to write the most basic query pattern and how to
-capture nodes in a pattern, then the pattern-match function, finally
-more advanced pattern syntax.
+capture nodes in a pattern, then the pattern-matching function, and
+finally the more advanced pattern syntax.
 </p>
 <span id="Basic-query-syntax"></span><h3 class="heading">Basic query syntax</h3>
 
-<span id="index-Tree_002dsitter-query-syntax"></span>
-<span id="index-Tree_002dsitter-query-pattern"></span>
+<span id="index-tree_002dsitter-query-pattern-syntax"></span>
+<span id="index-pattern-syntax_002c-tree_002dsitter-query"></span>
+<span id="index-query_002c-tree_002dsitter"></span>
 <p>A <em>query</em> consists of multiple <em>patterns</em>.  Each pattern is an
 s-expression that matches a certain node in the syntax node.  A
-pattern has the following shape:
+pattern has the form <code>(<var>type</var>&nbsp;(<var>child</var>&hellip;))</code><!-- /@w -->
 </p>
-<div class="example">
-<pre class="example">(<var>type</var> <var>child</var>...)
-</pre></div>
-
 <p>For example, a pattern that matches a <code>binary_expression</code> node that
 contains <code>number_literal</code> child nodes would look like
 </p>
@@ -96,19 +96,20 @@
 <pre class="example">(binary_expression (number_literal))
 </pre></div>
 
-<p>To <em>capture</em> a node in the query pattern above, append
-<code>@capture-name</code> after the node pattern you want to capture.  For
-example,
+<p>To <em>capture</em> a node using the query pattern above, append
+<code>@<var>capture-name</var></code> after the node pattern you want to
+capture.  For example,
 </p>
 <div class="example">
 <pre class="example">(binary_expression (number_literal) @number-in-exp)
 </pre></div>
 
 <p>captures <code>number_literal</code> nodes that are inside a
-<code>binary_expression</code> node with capture name <code>number-in-exp</code>.
+<code>binary_expression</code> node with the capture name
+<code>number-in-exp</code>.
 </p>
-<p>We can capture the <code>binary_expression</code> node too, with capture
-name <code>biexp</code>:
+<p>We can capture the <code>binary_expression</code> node as well, with, for
+example, the capture name <code>biexp</code>:
 </p>
 <div class="example">
 <pre class="example">(binary_expression
@@ -117,34 +118,40 @@
 
 <span id="Query-function"></span><h3 class="heading">Query function</h3>
 
-<p>Now we can introduce the query functions.
+<span id="index-query-functions_002c-tree_002dsitter"></span>
+<p>Now we can introduce the <em>query functions</em>.
 </p>
 <dl class="def">
 <dt id="index-treesit_002dquery_002dcapture"><span class="category">Function: </span><span><strong>treesit-query-capture</strong> <em>node query &amp;optional beg end node-only</em><a href='#index-treesit_002dquery_002dcapture' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function matches patterns in <var>query</var> in <var>node</var>.
-Parameter <var>query</var> can be either a string, a s-expression, or a
+<dd><p>This function matches patterns in <var>query</var> within <var>node</var>.
+The argument <var>query</var> can be either a string, a s-expression, or a
 compiled query object.  For now, we focus on the string syntax;
 s-expression syntax and compiled query are described at the end of the
 section.
 </p>
-<p>Parameter <var>node</var> can also be a parser or a language symbol.  A
+<p>The argument <var>node</var> can also be a parser or a language symbol.  A
 parser means using its root node, a language symbol means find or
 create a parser for that language in the current buffer, and use the
 root node.
 </p>
-<p>The function returns all captured nodes in a list of
-<code>(<var>capture_name</var> . <var>node</var>)</code>.  If <var>node-only</var> is
-non-nil, a list of node is returned instead.  If <var>beg</var> and
-<var>end</var> are both non-nil, this function only pattern matches nodes
-in that range.
+<p>The function returns all the captured nodes in a list of the form
+<code>(<var><span class="nolinebreak">capture_name</span></var>&nbsp;.&nbsp;<var>node</var>)</code><!-- /@w -->.  If <var>node-only</var> is
+non-<code>nil</code>, it returns the list of nodes instead.  By default the
+entire text of <var>node</var> is searched, but if <var>beg</var> and <var>end</var>
+are both non-<code>nil</code>, they specify the region of buffer text where
+this function should match nodes.  Any matching node whose span
+overlaps with the region between <var>beg</var> and <var>end</var> are captured,
+it doesn&rsquo;t have to be completely in the region.
 </p>
 <span id="index-treesit_002dquery_002derror"></span>
-<p>This function raise a <var>treesit-query-error</var> if <var>query</var> is
-malformed.  The signal data contains a description of the specific
-error.  You can use <code>treesit-query-validate</code> to debug the query.
+<span id="index-treesit_002dquery_002dvalidate"></span>
+<p>This function raises the <code>treesit-query-error</code> error if
+<var>query</var> is malformed.  The signal data contains a description of
+the specific error.  You can use <code>treesit-query-validate</code> to
+validate and debug the query.
 </p></dd></dl>
 
-<p>For example, suppose <var>node</var>&rsquo;s content is <code>1 + 2</code>, and
+<p>For example, suppose <var>node</var>&rsquo;s text is <code>1 + 2</code>, and
 <var>query</var> is
 </p>
 <div class="example">
@@ -153,7 +160,7 @@
         (number_literal) @number-in-exp) @biexp&quot;)
 </pre></div>
 
-<p>Querying that query would return
+<p>Matching that query would return
 </p>
 <div class="example">
 <pre class="example">(treesit-query-capture node query)
@@ -162,8 +169,8 @@
        (number-in-exp . <var>&lt;node for &quot;2&quot;&gt;</var>))
 </pre></div>
 
-<p>As we mentioned earlier, a <var>query</var> could contain multiple
-patterns. For example, it could have two top-level patterns:
+<p>As mentioned earlier, <var>query</var> could contain multiple patterns.
+For example, it could have two top-level patterns:
 </p>
 <div class="example">
 <pre class="example">(setq query
@@ -173,15 +180,15 @@
 
 <dl class="def">
 <dt id="index-treesit_002dquery_002dstring"><span class="category">Function: </span><span><strong>treesit-query-string</strong> <em>string query language</em><a href='#index-treesit_002dquery_002dstring' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function parses <var>string</var> with <var>language</var>, pattern matches
-its root node with <var>query</var>, and returns the result.
+<dd><p>This function parses <var>string</var> with <var>language</var>, matches its
+root node with <var>query</var>, and returns the result.
 </p></dd></dl>
 
 <span id="More-query-syntax"></span><h3 class="heading">More query syntax</h3>
 
-<p>Besides node type and capture, tree-sitter&rsquo;s query syntax can express
-anonymous node, field name, wildcard, quantification, grouping,
-alternation, anchor, and predicate.
+<p>Besides node type and capture, tree-sitter&rsquo;s pattern syntax can
+express anonymous node, field name, wildcard, quantification,
+grouping, alternation, anchor, and predicate.
 </p>
 <span id="Anonymous-node"></span><h4 class="subheading">Anonymous node</h4>
 
@@ -194,9 +201,9 @@
 
 <span id="Wild-card"></span><h4 class="subheading">Wild card</h4>
 
-<p>In a query pattern, &lsquo;<samp>(_)</samp>&rsquo; matches any named node, and &lsquo;<samp>_</samp>&rsquo;
-matches any named and anonymous node.  For example, to capture any
-named child of a <code>binary_expression</code> node, the pattern would be
+<p>In a pattern, &lsquo;<samp>(_)</samp>&rsquo; matches any named node, and &lsquo;<samp>_</samp>&rsquo; matches
+any named and anonymous node.  For example, to capture any named child
+of a <code>binary_expression</code> node, the pattern would be
 </p>
 <div class="example">
 <pre class="example">(binary_expression (_) @in_biexp)
@@ -204,7 +211,9 @@
 
 <span id="Field-name"></span><h4 class="subheading">Field name</h4>
 
-<p>We can capture child nodes that has specific field names:
+<p>It is possible to capture child nodes that have specific field names.
+In the pattern below, <code>declarator</code> and <code>body</code> are field
+names, indicated by the colon following them.
 </p>
 <div class="example">
 <pre class="example">(function_definition
@@ -212,8 +221,8 @@
   body: (_) @func-body)
 </pre></div>
 
-<p>We can also capture a node that doesn&rsquo;t have certain field, say, a
-<code>function_definition</code> without a <code>body</code> field.
+<p>It is also possible to capture a node that doesn&rsquo;t have a certain
+field, say, a <code>function_definition</code> without a <code>body</code> field.
 </p>
 <div class="example">
 <pre class="example">(function_definition !body) @func-no-body
@@ -221,19 +230,20 @@
 
 <span id="Quantify-node"></span><h4 class="subheading">Quantify node</h4>
 
+<span id="index-quantify-node_002c-tree_002dsitter"></span>
 <p>Tree-sitter recognizes quantification operators &lsquo;<samp>*</samp>&rsquo;, &lsquo;<samp>+</samp>&rsquo; and
 &lsquo;<samp>?</samp>&rsquo;.  Their meanings are the same as in regular expressions:
 &lsquo;<samp>*</samp>&rsquo; matches the preceding pattern zero or more times, &lsquo;<samp>+</samp>&rsquo;
 matches one or more times, and &lsquo;<samp>?</samp>&rsquo; matches zero or one time.
 </p>
-<p>For example, this pattern matches <code>type_declaration</code> nodes
-that has <em>zero or more</em> <code>long</code> keyword.
+<p>For example, the following pattern matches <code>type_declaration</code>
+nodes that has <em>zero or more</em> <code>long</code> keyword.
 </p>
 <div class="example">
 <pre class="example">(type_declaration &quot;long&quot;*) @long-type
 </pre></div>
 
-<p>And this pattern matches a type declaration that has zero or one
+<p>The following pattern matches a type declaration that has zero or one
 <code>long</code> keyword:
 </p>
 <div class="example">
@@ -242,8 +252,8 @@
 
 <span id="Grouping"></span><h4 class="subheading">Grouping</h4>
 
-<p>Similar to groups in regular expression, we can bundle patterns into a
-group and apply quantification operators to it.  For example, to
+<p>Similar to groups in regular expression, we can bundle patterns into
+groups and apply quantification operators to them.  For example, to
 express a comma separated list of identifiers, one could write
 </p>
 <div class="example">
@@ -253,9 +263,9 @@
 <span id="Alternation"></span><h4 class="subheading">Alternation</h4>
 
 <p>Again, similar to regular expressions, we can express &ldquo;match anyone
-from this group of patterns&rdquo; in the query pattern.  The syntax is a
-list of patterns enclosed in square brackets.  For example, to capture
-some keywords in C, the query pattern would be
+from this group of patterns&rdquo; in a pattern.  The syntax is a list of
+patterns enclosed in square brackets.  For example, to capture some
+keywords in C, the pattern would be
 </p>
 <div class="example">
 <pre class="example">[
@@ -277,11 +287,13 @@
 <div class="example">
 <pre class="example">;; Anchor the child with the end of its parent.
 (compound_expression (_) @last-child .)
+</pre><pre class="example">
 
-;; Anchor the child with the beginning of its parent.
+</pre><pre class="example">;; Anchor the child with the beginning of its parent.
 (compound_expression . (_) @first-child)
+</pre><pre class="example">
 
-;; Anchor two adjacent children.
+</pre><pre class="example">;; Anchor two adjacent children.
 (compound_expression
  (_) @prev-child
  .
@@ -293,8 +305,8 @@
 </p>
 <span id="Predicate"></span><h4 class="subheading">Predicate</h4>
 
-<p>We can add predicate constraints to a pattern.  For example, if we use
-the following query pattern
+<p>It is possible to add predicate constraints to a pattern.  For
+example, with the following pattern:
 </p>
 <div class="example">
 <pre class="example">(
@@ -303,33 +315,35 @@
 )
 </pre></div>
 
-<p>Then tree-sitter only matches arrays where the first element equals to
+<p>tree-sitter only matches arrays where the first element equals to
 the last element.  To attach a predicate to a pattern, we need to
-group then together.  A predicate always starts with a &lsquo;<samp>#</samp>&rsquo;.
+group them together.  A predicate always starts with a &lsquo;<samp>#</samp>&rsquo;.
 Currently there are two predicates, <code>#equal</code> and <code>#match</code>.
 </p>
 <dl class="def">
 <dt id="index-equal-1"><span class="category">Predicate: </span><span><strong>equal</strong> <em>arg1 arg2</em><a href='#index-equal-1' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>Matches if <var>arg1</var> equals to <var>arg2</var>.  Arguments can be either a
-string or a capture name.  Capture names represent the text that the
+<dd><p>Matches if <var>arg1</var> equals to <var>arg2</var>.  Arguments can be either
+strings or capture names.  Capture names represent the text that the
 captured node spans in the buffer.
 </p></dd></dl>
 
 <dl class="def">
-<dt id="index-match"><span class="category">Predicate: </span><span><strong>match</strong> <em>regexp capture-name</em><a href='#index-match' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>Matches if the text that <var>capture-name</var>’s node spans in the buffer
+<dt id="index-match-1"><span class="category">Predicate: </span><span><strong>match</strong> <em>regexp capture-name</em><a href='#index-match-1' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>Matches if the text that <var>capture-name</var>&rsquo;s node spans in the buffer
 matches regular expression <var>regexp</var>.  Matching is case-sensitive.
 </p></dd></dl>
 
-<p>Note that a predicate can only refer to capture names appeared in the
-same pattern.  Indeed, it makes little sense to refer to capture names
-in other patterns anyway.
+<p>Note that a predicate can only refer to capture names that appear in
+the same pattern.  Indeed, it makes little sense to refer to capture
+names in other patterns.
 </p>
 <span id="S_002dexpression-patterns"></span><h3 class="heading">S-expression patterns</h3>
 
-<p>Besides strings, Emacs provides a s-expression based syntax for query
-patterns. It largely resembles the string-based syntax.  For example,
-the following pattern
+<span id="index-tree_002dsitter-patterns-as-sexps"></span>
+<span id="index-patterns_002c-tree_002dsitter_002c-in-sexp-form"></span>
+<p>Besides strings, Emacs provides a s-expression based syntax for
+tree-sitter patterns.  It largely resembles the string-based syntax.
+For example, the following query
 </p>
 <div class="example">
 <pre class="example">(treesit-query-capture
@@ -353,9 +367,8 @@
          [&quot;return&quot; &quot;break&quot;] @keyword))
 </pre></div>
 
-<p>Most pattern syntax can be written directly as strange but
-never-the-less valid s-expressions.  Only a few of them needs
-modification:
+<p>Most patterns can be written directly as strange but nevertheless
+valid s-expressions.  Only a few of them needs modification:
 </p>
 <ul>
 <li> Anchor &lsquo;<samp>.</samp>&rsquo; is written as <code>:anchor</code>.
@@ -386,42 +399,50 @@
 
 <span id="Compiling-queries"></span><h3 class="heading">Compiling queries</h3>
 
-<p>If a query will be used repeatedly, especially in tight loops, it is
-important to compile that query, because a compiled query is much
-faster than an uncompiled one.  A compiled query can be used anywhere
-a query is accepted.
+<span id="index-compiling-tree_002dsitter-queries"></span>
+<span id="index-queries_002c-compiling"></span>
+<p>If a query is intended to be used repeatedly, especially in tight
+loops, it is important to compile that query, because a compiled query
+is much faster than an uncompiled one.  A compiled query can be used
+anywhere a query is accepted.
 </p>
 <dl class="def">
 <dt id="index-treesit_002dquery_002dcompile"><span class="category">Function: </span><span><strong>treesit-query-compile</strong> <em>language query</em><a href='#index-treesit_002dquery_002dcompile' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This function compiles <var>query</var> for <var>language</var> into a compiled
 query object and returns it.
 </p>
-<p>This function raise a <var>treesit-query-error</var> if <var>query</var> is
-malformed.  The signal data contains a description of the specific
-error.  You can use <code>treesit-query-validate</code> to debug the query.
+<p>This function raises the <code>treesit-query-error</code> error if
+<var>query</var> is malformed.  The signal data contains a description of
+the specific error.  You can use <code>treesit-query-validate</code> to
+validate and debug the query.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dquery_002dlanguage"><span class="category">Function: </span><span><strong>treesit-query-language</strong> <em>query</em><a href='#index-treesit_002dquery_002dlanguage' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function return the language of <var>query</var>.
 </p></dd></dl>
 
 <dl class="def">
 <dt id="index-treesit_002dquery_002dexpand"><span class="category">Function: </span><span><strong>treesit-query-expand</strong> <em>query</em><a href='#index-treesit_002dquery_002dexpand' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function expands the s-expression <var>query</var> into a string
-query.
+<dd><p>This function converts the s-expression <var>query</var> into the string
+format.
 </p></dd></dl>
 
 <dl class="def">
 <dt id="index-treesit_002dpattern_002dexpand"><span class="category">Function: </span><span><strong>treesit-pattern-expand</strong> <em>pattern</em><a href='#index-treesit_002dpattern_002dexpand' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function expands the s-expression <var>pattern</var> into a string
-pattern.
+<dd><p>This function converts the s-expression <var>pattern</var> into the string
+format.
 </p></dd></dl>
 
-<p>Finally, tree-sitter project&rsquo;s documentation about
-pattern-matching can be found at
+<p>For more details, read the tree-sitter project&rsquo;s documentation about
+pattern-matching, which can be found at
 <a href="https://tree-sitter.github.io/tree-sitter/using-parsers#pattern-matching-with-queries">https://tree-sitter.github.io/tree-sitter/using-parsers#pattern-matching-with-queries</a>.
 </p>
 </div>
 <hr>
 <div class="header">
 <p>
-Next: <a href="Multiple-Languages.html">Parsing Text in Multiple Languages</a>, Previous: <a href="Accessing-Node.html">Accessing Node Information</a>, Up: <a href="Parsing-Program-Source.html">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+Next: <a href="Multiple-Languages.html">Parsing Text in Multiple Languages</a>, Previous: <a href="Accessing-Node-Information.html">Accessing Node Information</a>, Up: <a href="Parsing-Program-Source.html">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
 </div>
 
 
diff --git a/admin/notes/tree-sitter/html-manual/Retrieving-Node.html b/admin/notes/tree-sitter/html-manual/Retrieving-Node.html
index 1bea0dde76..e1de200707 100644
--- a/admin/notes/tree-sitter/html-manual/Retrieving-Node.html
+++ b/admin/notes/tree-sitter/html-manual/Retrieving-Node.html
@@ -33,7 +33,7 @@
 <link href="Index.html" rel="index" title="Index">
 <link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
 <link href="Parsing-Program-Source.html" rel="up" title="Parsing Program Source">
-<link href="Accessing-Node.html" rel="next" title="Accessing Node">
+<link href="Accessing-Node-Information.html" rel="next" title="Accessing Node Information">
 <link href="Using-Parser.html" rel="prev" title="Using Parser">
 <style type="text/css">
 <!--
@@ -63,77 +63,90 @@
 <div class="section" id="Retrieving-Node">
 <div class="header">
 <p>
-Next: <a href="Accessing-Node.html" accesskey="n" rel="next">Accessing Node Information</a>, Previous: <a href="Using-Parser.html" accesskey="p" rel="prev">Using Tree-sitter Parser</a>, Up: <a href="Parsing-Program-Source.html" accesskey="u" rel="up">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+Next: <a href="Accessing-Node-Information.html" accesskey="n" rel="next">Accessing Node Information</a>, Previous: <a href="Using-Parser.html" accesskey="p" rel="prev">Using Tree-sitter Parser</a>, Up: <a href="Parsing-Program-Source.html" accesskey="u" rel="up">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
 <span id="Retrieving-Node-1"></span><h3 class="section">37.3 Retrieving Node</h3>
+<span id="index-retrieve-node_002c-tree_002dsitter"></span>
+<span id="index-tree_002dsitter_002c-find-node"></span>
+<span id="index-get-node_002c-tree_002dsitter"></span>
 
-<span id="index-tree_002dsitter-find-node"></span>
-<span id="index-tree_002dsitter-get-node"></span>
-<p>Before we continue, lets go over some conventions of tree-sitter
-functions.
+<span id="index-terminology_002c-for-tree_002dsitter-functions"></span>
+<p>Here&rsquo;s some terminology and conventions we use when documenting
+tree-sitter functions.
 </p>
 <p>We talk about a node being &ldquo;smaller&rdquo; or &ldquo;larger&rdquo;, and &ldquo;lower&rdquo; or
 &ldquo;higher&rdquo;.  A smaller and lower node is lower in the syntax tree and
-therefore spans a smaller piece of text; a larger and higher node is
-higher up in the syntax tree, containing many smaller nodes as its
-children, and therefore spans a larger piece of text.
+therefore spans a smaller portion of buffer text; a larger and higher
+node is higher up in the syntax tree, it contains many smaller nodes
+as its children, and therefore spans a larger portion of text.
 </p>
-<p>When a function cannot find a node, it returns nil.  And for the
-convenience for function chaining, all the functions that take a node
-as argument and returns a node accept the node to be nil; in that
-case, the function just returns nil.
+<p>When a function cannot find a node, it returns <code>nil</code>.  For
+convenience, all functions that take a node as argument and return
+a node, also accept the node argument of <code>nil</code> and in that case
+just return <code>nil</code>.
 </p>
 <span id="index-treesit_002dnode_002doutdated"></span>
 <p>Nodes are not automatically updated when the associated buffer is
-modified.  And there is no way to update a node once it is retrieved.
-Using an outdated node throws <code>treesit-node-outdated</code> error.
+modified, and there is no way to update a node once it is retrieved.
+Using an outdated node signals the <code>treesit-node-outdated</code> error.
 </p>
 <span id="Retrieving-node-from-syntax-tree"></span><h3 class="heading">Retrieving node from syntax tree</h3>
+<span id="index-retrieving-tree_002dsitter-nodes"></span>
+<span id="index-syntax-tree_002c-retrieving-nodes"></span>
 
 <dl class="def">
-<dt id="index-treesit_002dnode_002dat"><span class="category">Function: </span><span><strong>treesit-node-at</strong> <em>beg end &amp;optional parser-or-lang named</em><a href='#index-treesit_002dnode_002dat' class='copiable-anchor'> &para;</a></span></dt>
+<dt id="index-treesit_002dnode_002dat"><span class="category">Function: </span><span><strong>treesit-node-at</strong> <em>pos &amp;optional parser-or-lang named</em><a href='#index-treesit_002dnode_002dat' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This function returns the <em>smallest</em> node that starts at or after
-the <var>point</var>.  In other words, the start of the node is equal or
-greater than <var>point</var>.
+the buffer position <var>pos</var>.  In other words, the start of the node
+is greater or equal to <var>pos</var>.
 </p>
-<p>When <var>parser-or-lang</var> is nil, this function uses the first parser
-in <code>(treesit-parser-list)</code> in the current buffer.  If
-<var>parser-or-lang</var> is a parser object, it use that parser; if
-<var>parser-or-lang</var> is a language, it finds the first parser using
-that language in <code>(treesit-parser-list)</code> and use that.
+<p>When <var>parser-or-lang</var> is <code>nil</code> or omitted, this function uses
+the first parser in <code>(treesit-parser-list)</code> of the current
+buffer.  If <var>parser-or-lang</var> is a parser object, it uses that
+parser; if <var>parser-or-lang</var> is a language, it finds the first
+parser using that language in <code>(treesit-parser-list)</code>, and uses
+that.
 </p>
-<p>If <var>named</var> is non-nil, this function looks for a named node
+<p>If <var>named</var> is non-<code>nil</code>, this function looks for a named node
 only (see <a href="Language-Definitions.html#tree_002dsitter-named-node">named node</a>).
 </p>
+<p>When <var>pos</var> is after all the text in the buffer, technically there
+is no node after <var>pos</var>.  But for convenience, this function will
+return the last leaf node in the parse tree.  If <var>strict</var> is
+non-<code>nil</code>, this function will strictly comply to the semantics and
+return <var>nil</var>.
+</p>
 <p>Example:
-</p><div class="example">
+</p>
+<div class="example">
 <pre class="example">;; Find the node at point in a C parser's syntax tree.
 (treesit-node-at (point) 'c)
-    </pre></div>
+  &rArr; #&lt;treesit-node (primitive_type) in 23-27&gt;
+</pre></div>
 </dd></dl>
 
 <dl class="def">
 <dt id="index-treesit_002dnode_002don"><span class="category">Function: </span><span><strong>treesit-node-on</strong> <em>beg end &amp;optional parser-or-lang named</em><a href='#index-treesit_002dnode_002don' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function returns the <em>smallest</em> node that covers the span
-from <var>beg</var> to <var>end</var>.  In other words, the start of the node is
-less or equal to <var>beg</var>, and the end of the node is greater or
-equal to <var>end</var>.
+<dd><p>This function returns the <em>smallest</em> node that covers the region
+of buffer text between <var>beg</var> and <var>end</var>.  In other words, the
+start of the node is before or at <var>beg</var>, and the end of the node
+is at or after <var>end</var>.
 </p>
-<p><em>Beware</em> that calling this function on an empty line that is not
-inside any top-level construct (function definition, etc) most
+<p><em>Beware:</em> calling this function on an empty line that is not
+inside any top-level construct (function definition, etc.) most
 probably will give you the root node, because the root node is the
 smallest node that covers that empty line.  Most of the time, you want
-to use <code>treesit-node-at</code>.
+to use <code>treesit-node-at</code>, described above, instead.
 </p>
-<p>When <var>parser-or-lang</var> is nil, this function uses the first parser
-in <code>(treesit-parser-list)</code> in the current buffer.  If
-<var>parser-or-lang</var> is a parser object, it use that parser; if
+<p>When <var>parser-or-lang</var> is <code>nil</code>, this function uses the first
+parser in <code>(treesit-parser-list)</code> of the current buffer.  If
+<var>parser-or-lang</var> is a parser object, it uses that parser; if
 <var>parser-or-lang</var> is a language, it finds the first parser using
-that language in <code>(treesit-parser-list)</code> and use that.
+that language in <code>(treesit-parser-list)</code>, and uses that.
 </p>
-<p>If <var>named</var> is non-nil, this function looks for a named node only
-(see <a href="Language-Definitions.html#tree_002dsitter-named-node">named node</a>).
+<p>If <var>named</var> is non-<code>nil</code>, this function looks for a named node
+only (see <a href="Language-Definitions.html#tree_002dsitter-named-node">named node</a>).
 </p></dd></dl>
 
 <dl class="def">
@@ -145,17 +158,21 @@
 <dl class="def">
 <dt id="index-treesit_002dbuffer_002droot_002dnode"><span class="category">Function: </span><span><strong>treesit-buffer-root-node</strong> <em>&amp;optional language</em><a href='#index-treesit_002dbuffer_002droot_002dnode' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This function finds the first parser that uses <var>language</var> in
-<code>(treesit-parser-list)</code> in the current buffer, and returns the
-root node of that buffer.  If it cannot find an appropriate parser,
-nil is returned.
+<code>(treesit-parser-list)</code> of the current buffer, and returns the
+root node generated by that parser.  If it cannot find an appropriate
+parser, it returns <code>nil</code>.
 </p></dd></dl>
 
-<p>Once we have a node, we can retrieve other nodes from it, or query for
-information about this node.
+<p>Given a node, a Lisp program can retrieve other nodes starting from
+it, or query for information about this node.
 </p>
 <span id="Retrieving-node-from-other-nodes"></span><h3 class="heading">Retrieving node from other nodes</h3>
+<span id="index-syntax-tree-nodes_002c-retrieving-from-other-nodes"></span>
 
 <span id="By-kinship"></span><h4 class="subheading">By kinship</h4>
+<span id="index-kinship_002c-syntax-tree-nodes"></span>
+<span id="index-nodes_002c-by-kinship"></span>
+<span id="index-syntax-tree-nodes_002c-by-kinship"></span>
 
 <dl class="def">
 <dt id="index-treesit_002dnode_002dparent"><span class="category">Function: </span><span><strong>treesit-node-parent</strong> <em>node</em><a href='#index-treesit_002dnode_002dparent' class='copiable-anchor'> &para;</a></span></dt>
@@ -165,132 +182,162 @@
 <dl class="def">
 <dt id="index-treesit_002dnode_002dchild"><span class="category">Function: </span><span><strong>treesit-node-child</strong> <em>node n &amp;optional named</em><a href='#index-treesit_002dnode_002dchild' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This function returns the <var>n</var>&rsquo;th child of <var>node</var>.  If
-<var>named</var> is non-nil, then it only counts named nodes
-(see <a href="Language-Definitions.html#tree_002dsitter-named-node">named node</a>).  For example, in a node
-that represents a string: <code>&quot;text&quot;</code>, there are three children
-nodes: the opening quote <code>&quot;</code>, the string content <code>text</code>, and
-the enclosing quote <code>&quot;</code>.  Among these nodes, the first child is
-the opening quote <code>&quot;</code>, the first named child is the string
-content <code>text</code>.
+<var>named</var> is non-<code>nil</code>, it counts only named nodes
+(see <a href="Language-Definitions.html#tree_002dsitter-named-node">named node</a>).
+</p>
+<p>For example, in a node that represents a string <code>&quot;text&quot;</code>, there
+are three children nodes: the opening quote <code>&quot;</code>, the string text
+<code>text</code>, and the closing quote <code>&quot;</code>.  Among these nodes, the
+first child is the opening quote <code>&quot;</code>, and the first named child
+is the string text.
+</p>
+<p>This function returns <code>nil</code> if there is no <var>n</var>&rsquo;th child.
+<var>n</var> could be negative, e.g., <code>-1</code> represents the last child.
 </p></dd></dl>
 
 <dl class="def">
 <dt id="index-treesit_002dnode_002dchildren"><span class="category">Function: </span><span><strong>treesit-node-children</strong> <em>node &amp;optional named</em><a href='#index-treesit_002dnode_002dchildren' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function returns all of <var>node</var>&rsquo;s children in a list.  If
-<var>named</var> is non-nil, then it only retrieves named nodes.
+<dd><p>This function returns all of <var>node</var>&rsquo;s children as a list.  If
+<var>named</var> is non-<code>nil</code>, it retrieves only named nodes.
 </p></dd></dl>
 
 <dl class="def">
 <dt id="index-treesit_002dnext_002dsibling"><span class="category">Function: </span><span><strong>treesit-next-sibling</strong> <em>node &amp;optional named</em><a href='#index-treesit_002dnext_002dsibling' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This function finds the next sibling of <var>node</var>.  If <var>named</var> is
-non-nil, it finds the next named sibling.
+non-<code>nil</code>, it finds the next named sibling.
 </p></dd></dl>
 
 <dl class="def">
 <dt id="index-treesit_002dprev_002dsibling"><span class="category">Function: </span><span><strong>treesit-prev-sibling</strong> <em>node &amp;optional named</em><a href='#index-treesit_002dprev_002dsibling' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This function finds the previous sibling of <var>node</var>.  If
-<var>named</var> is non-nil, it finds the previous named sibling.
+<var>named</var> is non-<code>nil</code>, it finds the previous named sibling.
 </p></dd></dl>
 
 <span id="By-field-name"></span><h4 class="subheading">By field name</h4>
+<span id="index-nodes_002c-by-field-name"></span>
+<span id="index-syntax-tree-nodes_002c-by-field-name"></span>
 
 <p>To make the syntax tree easier to analyze, many language definitions
 assign <em>field names</em> to child nodes (see <a href="Language-Definitions.html#tree_002dsitter-node-field-name">field name</a>).  For example, a <code>function_definition</code> node
-could have a <code>declarator</code> and a <code>body</code>.
+could have a <code>declarator</code> node and a <code>body</code> node.
 </p>
 <dl class="def">
 <dt id="index-treesit_002dchild_002dby_002dfield_002dname"><span class="category">Function: </span><span><strong>treesit-child-by-field-name</strong> <em>node field-name</em><a href='#index-treesit_002dchild_002dby_002dfield_002dname' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function finds the child of <var>node</var> that has <var>field-name</var>
-as its field name.
+<dd><p>This function finds the child of <var>node</var> whose field name is
+<var>field-name</var>, a string.
 </p>
 <div class="example">
 <pre class="example">;; Get the child that has &quot;body&quot; as its field name.
 (treesit-child-by-field-name node &quot;body&quot;)
-    </pre></div>
+  &rArr; #&lt;treesit-node (compound_statement) in 45-89&gt;
+</pre></div>
 </dd></dl>
 
 <span id="By-position"></span><h4 class="subheading">By position</h4>
+<span id="index-nodes_002c-by-position"></span>
+<span id="index-syntax-tree-nodes_002c-by-position"></span>
 
 <dl class="def">
 <dt id="index-treesit_002dfirst_002dchild_002dfor_002dpos"><span class="category">Function: </span><span><strong>treesit-first-child-for-pos</strong> <em>node pos &amp;optional named</em><a href='#index-treesit_002dfirst_002dchild_002dfor_002dpos' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This function finds the first child of <var>node</var> that extends beyond
-<var>pos</var>.  &ldquo;Extend beyond&rdquo; means the end of the child node &gt;=
-<var>pos</var>.  This function only looks for immediate children of
-<var>node</var>, and doesn&rsquo;t look in its grand children.  If <var>named</var> is
-non-nil, it only looks for named child (see <a href="Language-Definitions.html#tree_002dsitter-named-node">named node</a>).
+buffer position <var>pos</var>.  &ldquo;Extends beyond&rdquo; means the end of the
+child node is greater or equal to <var>pos</var>.  This function only looks
+for immediate children of <var>node</var>, and doesn&rsquo;t look in its
+grandchildren.  If <var>named</var> is non-<code>nil</code>, it looks for the
+first named child (see <a href="Language-Definitions.html#tree_002dsitter-named-node">named node</a>).
 </p></dd></dl>
 
 <dl class="def">
 <dt id="index-treesit_002dnode_002ddescendant_002dfor_002drange"><span class="category">Function: </span><span><strong>treesit-node-descendant-for-range</strong> <em>node beg end &amp;optional named</em><a href='#index-treesit_002dnode_002ddescendant_002dfor_002drange' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function finds the <em>smallest</em> child/grandchild... of
-<var>node</var> that spans the range from <var>beg</var> to <var>end</var>.  It is
-similar to <code>treesit-node-at</code>.  If <var>named</var> is non-nil, it only
-looks for named child.
+<dd><p>This function finds the <em>smallest</em> descendant node of <var>node</var>
+that spans the region of text between positions <var>beg</var> and
+<var>end</var>.  It is similar to <code>treesit-node-at</code>.  If <var>named</var>
+is non-<code>nil</code>, it looks for smallest named child.
 </p></dd></dl>
 
 <span id="Searching-for-node"></span><h3 class="heading">Searching for node</h3>
 
 <dl class="def">
-<dt id="index-treesit_002dsearch_002dsubtree"><span class="category">Function: </span><span><strong>treesit-search-subtree</strong> <em>node predicate &amp;optional all backward limit</em><a href='#index-treesit_002dsearch_002dsubtree' class='copiable-anchor'> &para;</a></span></dt>
+<dt id="index-treesit_002dsearch_002dsubtree"><span class="category">Function: </span><span><strong>treesit-search-subtree</strong> <em>node predicate &amp;optional backward all limit</em><a href='#index-treesit_002dsearch_002dsubtree' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This function traverses the subtree of <var>node</var> (including
-<var>node</var>), and match <var>predicate</var> with each node along the way.
-And <var>predicate</var> is a regexp that matches (case-insensitively)
-against each node&rsquo;s type, or a function that takes a node and returns
-nil/non-nil.  If a node matches, that node is returned, if no node
-ever matches, nil is returned.
+<var>node</var> itself), looking for a node for which <var>predicate</var>
+returns non-<code>nil</code>.  <var>predicate</var> is a regexp that is matched
+(case-insensitively) against each node&rsquo;s type, or a predicate function
+that takes a node and returns non-<code>nil</code> if the node matches.  The
+function returns the first node that matches, or <code>nil</code> if none
+does.
 </p>
-<p>By default, this function only traverses named nodes, if <var>all</var> is
-non-nil, it traverses all nodes.  If <var>backward</var> is non-nil, it
-traverses backwards.  If <var>limit</var> is non-nil, it only traverses
-that number of levels down in the tree.
+<p>By default, this function only traverses named nodes, but if <var>all</var>
+is non-<code>nil</code>, it traverses all the nodes.  If <var>backward</var> is
+non-<code>nil</code>, it traverses backwards (i.e., it visits the last child first
+when traversing down the tree).  If <var>limit</var> is non-<code>nil</code>, it
+must be a number that limits the tree traversal to that many levels
+down the tree.
 </p></dd></dl>
 
 <dl class="def">
-<dt id="index-treesit_002dsearch_002dforward"><span class="category">Function: </span><span><strong>treesit-search-forward</strong> <em>start predicate &amp;optional all backward up</em><a href='#index-treesit_002dsearch_002dforward' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function is somewhat similar to <code>treesit-search-subtree</code>.
-It also traverse the parse tree and match each node with
-<var>predicate</var> (except for <var>start</var>), where <var>predicate</var> can be
-a (case-insensitive) regexp or a function.  For a tree like the below
-where <var>start</var> is marked 1, this function traverses as numbered:
+<dt id="index-treesit_002dsearch_002dforward"><span class="category">Function: </span><span><strong>treesit-search-forward</strong> <em>start predicate &amp;optional backward all</em><a href='#index-treesit_002dsearch_002dforward' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>Like <code>treesit-search-subtree</code>, this function also traverses the
+parse tree and matches each node with <var>predicate</var> (except for
+<var>start</var>), where <var>predicate</var> can be a (case-insensitive) regexp
+or a function.  For a tree like the below where <var>start</var> is marked
+S, this function traverses as numbered from 1 to 12:
 </p>
 <div class="example">
-<pre class="example">              o
+<pre class="example">              12
               |
-     3--------4-----------8
-     |        |           |
-o--o-+--1  5--+--6    9---+-----12
-|  |    |        |    |         |
-o  o    2        7  +-+-+    +--+--+
-                    |   |    |  |  |
-                    10  11   13 14 15
+     S--------3----------11
+     |        |          |
+o--o-+--o  1--+--2    6--+-----10
+|  |                  |        |
+o  o                +-+-+   +--+--+
+                    |   |   |  |  |
+                    4   5   7  8  9
 </pre></div>
 
-<p>Same as in <code>treesit-search-subtree</code>, this function only searches
-for named nodes by default.  But if <var>all</var> is non-nil, it searches
-for all nodes.  If <var>backward</var> is non-nil, it searches backwards.
+<p>Note that this function doesn&rsquo;t traverse the subtree of <var>start</var>,
+and it always traverse leaf nodes first, then upwards.
+</p>
+<p>Like <code>treesit-search-subtree</code>, this function only searches for
+named nodes by default, but if <var>all</var> is non-<code>nil</code>, it
+searches for all nodes.  If <var>backward</var> is non-<code>nil</code>, it
+searches backwards.
+</p>
+<p>While <code>treesit-search-subtree</code> traverses the subtree of a node,
+this function starts with node <var>start</var> and traverses every node
+that comes after it in the buffer position order, i.e., nodes with
+start positions greater than the end position of <var>start</var>.
 </p>
-<p>If <var>up</var> is non-nil, this function will only traverse to siblings
-and parents.  In that case, only 1 3 4 8 would be traversed.
+<p>In the tree shown above, <code>treesit-search-subtree</code> traverses node
+S (<var>start</var>) and nodes marked with <code>o</code>, where this function
+traverses the nodes marked with numbers.  This function is useful for
+answering questions like &ldquo;what is the first node after <var>start</var> in
+the buffer that satisfies some condition?&rdquo;
 </p></dd></dl>
 
 <dl class="def">
-<dt id="index-treesit_002dsearch_002dforward_002dgoto"><span class="category">Function: </span><span><strong>treesit-search-forward-goto</strong> <em>predicate side &amp;optional all backward up</em><a href='#index-treesit_002dsearch_002dforward_002dgoto' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function jumps to the start or end of the next node in buffer
-that matches <var>predicate</var>.  Parameters <var>predicate</var>, <var>all</var>,
-<var>backward</var>, and <var>up</var> are the same as in
-<code>treesit-search-forward</code>.  And <var>side</var> controls which side of
-the matched no do we stop at, it can be <code>start</code> or <code>end</code>.
+<dt id="index-treesit_002dsearch_002dforward_002dgoto"><span class="category">Function: </span><span><strong>treesit-search-forward-goto</strong> <em>node predicate &amp;optional start backward all</em><a href='#index-treesit_002dsearch_002dforward_002dgoto' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function moves point to the start or end of the next node after
+<var>node</var> in the buffer that matches <var>predicate</var>.  If <var>start</var>
+is non-<code>nil</code>, stop at the beginning rather than the end of a node.
+</p>
+<p>This function guarantees that the matched node it returns makes
+progress in terms of buffer position: the start/end position of the
+returned node is always greater than that of <var>node</var>.
+</p>
+<p>Arguments <var>predicate</var>, <var>backward</var> and <var>all</var> are the same
+as in <code>treesit-search-forward</code>.
 </p></dd></dl>
 
 <dl class="def">
 <dt id="index-treesit_002dinduce_002dsparse_002dtree"><span class="category">Function: </span><span><strong>treesit-induce-sparse-tree</strong> <em>root predicate &amp;optional process-fn limit</em><a href='#index-treesit_002dinduce_002dsparse_002dtree' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This function creates a sparse tree from <var>root</var>&rsquo;s subtree.
 </p>
-<p>Basically, it takes the subtree under <var>root</var>, and combs it so only
-the nodes that match <var>predicate</var> are left, like picking out grapes
-on the vine.  Like previous functions, <var>predicate</var> can be a regexp
-string that matches against each node&rsquo;s type case-insensitively, or a
-function that takes a node and return nil/non-nil.
+<p>It takes the subtree under <var>root</var>, and combs it so only the nodes
+that match <var>predicate</var> are left.  Like previous functions, the
+<var>predicate</var> can be a regexp string that matches against each
+node&rsquo;s type case-insensitively, or a function that takes a node and
+return non-<code>nil</code> if it matches.
 </p>
 <p>For example, for a subtree on the left that consist of both numbers
 and letters, if <var>predicate</var> is &ldquo;letter only&rdquo;, the returned tree
@@ -310,50 +357,63 @@
  e  5              e
 </pre></div>
 
-<p>If <var>process-fn</var> is non-nil, instead of returning the matched
+<p>If <var>process-fn</var> is non-<code>nil</code>, instead of returning the matched
 nodes, this function passes each node to <var>process-fn</var> and uses the
-returned value instead.  If non-nil, <var>limit</var> is the number of
+returned value instead.  If non-<code>nil</code>, <var>limit</var> is the number of
 levels to go down from <var>root</var>.
 </p>
-<p>Each node in the returned tree looks like <code>(<var>tree-sitter
-node</var> . (<var>child</var> ...))</code>.  The <var>tree-sitter node</var> of the root
-of this tree will be nil if <var>ROOT</var> doesn&rsquo;t match <var>pred</var>.  If
-no node matches <var>predicate</var>, return nil.
+<p>Each node in the returned tree looks like
+<code>(<var><span class="nolinebreak">tree-sitter-node</span></var>&nbsp;.&nbsp;(<var>child</var>&nbsp;&hellip;))</code><!-- /@w -->.  The
+<var>tree-sitter-node</var> of the root of this tree will be nil if
+<var>root</var> doesn&rsquo;t match <var>predicate</var>.  If no node matches
+<var>predicate</var>, the function returns <code>nil</code>.
 </p></dd></dl>
 
-<span id="More-convenient-functions"></span><h3 class="heading">More convenient functions</h3>
+<span id="More-convenience-functions"></span><h3 class="heading">More convenience functions</h3>
 
 <dl class="def">
-<dt id="index-treesit_002dfilter_002dchild"><span class="category">Function: </span><span><strong>treesit-filter-child</strong> <em>node pred &amp;optional named</em><a href='#index-treesit_002dfilter_002dchild' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function finds immediate children of <var>node</var> that satisfies
-<var>pred</var>.
+<dt id="index-treesit_002dfilter_002dchild"><span class="category">Function: </span><span><strong>treesit-filter-child</strong> <em>node predicate &amp;optional named</em><a href='#index-treesit_002dfilter_002dchild' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function finds immediate children of <var>node</var> that satisfy
+<var>predicate</var>.
 </p>
-<p>Function <var>pred</var> takes the child node as the argument and should
-return non-nil to indicated keeping the child.  If <var>named</var>
-non-nil, this function only searches for named nodes.
+<p>The <var>predicate</var> function takes a node as the argument and should
+return non-<code>nil</code> to indicate that the node should be kept.  If
+<var>named</var> is non-<code>nil</code>, this function only examines the named
+nodes.
 </p></dd></dl>
 
 <dl class="def">
-<dt id="index-treesit_002dparent_002duntil"><span class="category">Function: </span><span><strong>treesit-parent-until</strong> <em>node pred</em><a href='#index-treesit_002dparent_002duntil' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function repeatedly finds the parent of <var>node</var>, and returns
-the parent if it satisfies <var>pred</var> (which takes the parent as the
-argument).  If no parent satisfies <var>pred</var>, this function returns
-nil.
+<dt id="index-treesit_002dparent_002duntil"><span class="category">Function: </span><span><strong>treesit-parent-until</strong> <em>node predicate</em><a href='#index-treesit_002dparent_002duntil' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function repeatedly finds the parents of <var>node</var>, and returns
+the parent that satisfies <var>predicate</var>, a function that takes a
+node as the argument.  If no parent satisfies <var>predicate</var>, this
+function returns <code>nil</code>.
 </p></dd></dl>
 
 <dl class="def">
-<dt id="index-treesit_002dparent_002dwhile"><span class="category">Function: </span><span><strong>treesit-parent-while</strong><a href='#index-treesit_002dparent_002dwhile' class='copiable-anchor'> &para;</a></span></dt>
+<dt id="index-treesit_002dparent_002dwhile"><span class="category">Function: </span><span><strong>treesit-parent-while</strong> <em>node predicate</em><a href='#index-treesit_002dparent_002dwhile' class='copiable-anchor'> &para;</a></span></dt>
 <dd><p>This function repeatedly finds the parent of <var>node</var>, and keeps
-doing so as long as the parent satisfies <var>pred</var> (which takes the
-parent as the single argument).  I.e., this function returns the
-farthest parent that still satisfies <var>pred</var>.
+doing so as long as the nodes satisfy <var>predicate</var>, a function that
+takes a node as the argument.  That is, this function returns the
+farthest parent that still satisfies <var>predicate</var>.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dnode_002dtop_002dlevel"><span class="category">Function: </span><span><strong>treesit-node-top-level</strong> <em>node &amp;optional type</em><a href='#index-treesit_002dnode_002dtop_002dlevel' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function returns the highest parent of <var>node</var> that has the
+same type as <var>node</var>.  If no such parent exists, it returns
+<code>nil</code>.  Therefore this function is also useful for testing
+whether <var>node</var> is top-level.
+</p>
+<p>If <var>type</var> is non-<code>nil</code>, this function matches each parent&rsquo;s
+type with <var>type</var> as a regexp, rather than using <var>node</var>&rsquo;s type.
 </p></dd></dl>
 
 </div>
 <hr>
 <div class="header">
 <p>
-Next: <a href="Accessing-Node.html">Accessing Node Information</a>, Previous: <a href="Using-Parser.html">Using Tree-sitter Parser</a>, Up: <a href="Parsing-Program-Source.html">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+Next: <a href="Accessing-Node-Information.html">Accessing Node Information</a>, Previous: <a href="Using-Parser.html">Using Tree-sitter Parser</a>, Up: <a href="Parsing-Program-Source.html">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
 </div>
 
 
diff --git a/admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html b/admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html
index 77cea6b3f9..a80c232616 100644
--- a/admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html
+++ b/admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html
@@ -33,7 +33,7 @@
 <link href="Index.html" rel="index" title="Index">
 <link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
 <link href="Parsing-Program-Source.html" rel="up" title="Parsing Program Source">
-<link href="Multiple-Languages.html" rel="prev" title="Multiple Languages">
+<link href="Tree_002dsitter-major-modes.html" rel="prev" title="Tree-sitter major modes">
 <style type="text/css">
 <!--
 a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
@@ -62,23 +62,23 @@
 <div class="section" id="Tree_002dsitter-C-API">
 <div class="header">
 <p>
-Previous: <a href="Multiple-Languages.html" accesskey="p" rel="prev">Parsing Text in Multiple Languages</a>, Up: <a href="Parsing-Program-Source.html" accesskey="u" rel="up">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+Previous: <a href="Tree_002dsitter-major-modes.html" accesskey="p" rel="prev">Developing major modes with tree-sitter</a>, Up: <a href="Parsing-Program-Source.html" accesskey="u" rel="up">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
 </div>
 <hr>
-<span id="Tree_002dsitter-C-API-Correspondence"></span><h3 class="section">37.7 Tree-sitter C API Correspondence</h3>
+<span id="Tree_002dsitter-C-API-Correspondence"></span><h3 class="section">37.8 Tree-sitter C API Correspondence</h3>
 
 <p>Emacs&rsquo; tree-sitter integration doesn&rsquo;t expose every feature
-tree-sitter&rsquo;s C API provides.  Missing features include:
+provided by tree-sitter&rsquo;s C API.  Missing features include:
 </p>
 <ul>
 <li> Creating a tree cursor and navigating the syntax tree with it.
 </li><li> Setting timeout and cancellation flag for a parser.
 </li><li> Setting the logger for a parser.
-</li><li> Printing a DOT graph of the syntax tree to a file.
-</li><li> Coping and modifying a syntax tree.  (Emacs doesn&rsquo;t expose a tree
+</li><li> Printing a <acronym>DOT</acronym> graph of the syntax tree to a file.
+</li><li> Copying and modifying a syntax tree.  (Emacs doesn&rsquo;t expose a tree
 object.)
 </li><li> Using (row, column) coordinates as position.
-</li><li> Updating a node with changes. (In Emacs, retrieve a new node instead
+</li><li> Updating a node with changes.  (In Emacs, retrieve a new node instead
 of updating the existing one.)
 </li><li> Querying statics of a language definition.
 </li></ul>
@@ -87,7 +87,7 @@
 convenient and idiomatic:
 </p>
 <ul>
-<li> Instead of using byte positions, the ELisp API uses character
+<li> Instead of using byte positions, the Emacs Lisp API uses character
 positions.
 </li><li> Null nodes are converted to nil.
 </li></ul>
@@ -203,7 +203,7 @@
 <hr>
 <div class="header">
 <p>
-Previous: <a href="Multiple-Languages.html">Parsing Text in Multiple Languages</a>, Up: <a href="Parsing-Program-Source.html">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+Previous: <a href="Tree_002dsitter-major-modes.html">Developing major modes with tree-sitter</a>, Up: <a href="Parsing-Program-Source.html">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
 </div>
 
 
diff --git a/admin/notes/tree-sitter/html-manual/Using-Parser.html b/admin/notes/tree-sitter/html-manual/Using-Parser.html
index 438e3858f1..c478a39e55 100644
--- a/admin/notes/tree-sitter/html-manual/Using-Parser.html
+++ b/admin/notes/tree-sitter/html-manual/Using-Parser.html
@@ -67,12 +67,12 @@
 </div>
 <hr>
 <span id="Using-Tree_002dsitter-Parser"></span><h3 class="section">37.2 Using Tree-sitter Parser</h3>
-<span id="index-Tree_002dsitter-parser"></span>
+<span id="index-tree_002dsitter-parser_002c-using"></span>
 
-<p>This section described how to create and configure a tree-sitter
+<p>This section describes how to create and configure a tree-sitter
 parser.  In Emacs, each tree-sitter parser is associated with a
-buffer.  As we edit the buffer, the associated parser and the syntax
-tree is automatically kept up-to-date.
+buffer.  As the user edits the buffer, the associated parser and
+syntax tree are automatically kept up-to-date.
 </p>
 <dl class="def">
 <dt id="index-treesit_002dmax_002dbuffer_002dsize"><span class="category">Variable: </span><span><strong>treesit-max-buffer-size</strong><a href='#index-treesit_002dmax_002dbuffer_002dsize' class='copiable-anchor'> &para;</a></span></dt>
@@ -88,48 +88,49 @@
 <code>treesit-available-p</code> and <code>treesit-max-buffer-size</code>.
 </p></dd></dl>
 
-<span id="index-Creating-tree_002dsitter-parsers"></span>
+<span id="index-creating-tree_002dsitter-parsers"></span>
+<span id="index-tree_002dsitter-parser_002c-creating"></span>
 <dl class="def">
 <dt id="index-treesit_002dparser_002dcreate"><span class="category">Function: </span><span><strong>treesit-parser-create</strong> <em>language &amp;optional buffer no-reuse</em><a href='#index-treesit_002dparser_002dcreate' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>To create a parser, we provide a <var>buffer</var> and the <var>language</var>
-to use (see <a href="Language-Definitions.html">Tree-sitter Language Definitions</a>).  If <var>buffer</var> is nil, the
-current buffer is used.
+<dd><p>Create a parser for the specified <var>buffer</var> and <var>language</var>
+(see <a href="Language-Definitions.html">Tree-sitter Language Definitions</a>).  If <var>buffer</var> is omitted or
+<code>nil</code>, it stands for the current buffer.
 </p>
 <p>By default, this function reuses a parser if one already exists for
-<var>language</var> in <var>buffer</var>, if <var>no-reuse</var> is non-nil, this
-function always creates a new parser.
+<var>language</var> in <var>buffer</var>, but if <var>no-reuse</var> is
+non-<code>nil</code>, this function always creates a new parser.
 </p></dd></dl>
 
-<p>Given a parser, we can query information about it:
+<p>Given a parser, we can query information about it.
 </p>
 <dl class="def">
 <dt id="index-treesit_002dparser_002dbuffer"><span class="category">Function: </span><span><strong>treesit-parser-buffer</strong> <em>parser</em><a href='#index-treesit_002dparser_002dbuffer' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>Returns the buffer associated with <var>parser</var>.
+<dd><p>This function returns the buffer associated with <var>parser</var>.
 </p></dd></dl>
 
 <dl class="def">
 <dt id="index-treesit_002dparser_002dlanguage"><span class="category">Function: </span><span><strong>treesit-parser-language</strong> <em>parser</em><a href='#index-treesit_002dparser_002dlanguage' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>Returns the language that <var>parser</var> uses.
+<dd><p>This function returns the language used by <var>parser</var>.
 </p></dd></dl>
 
 <dl class="def">
 <dt id="index-treesit_002dparser_002dp"><span class="category">Function: </span><span><strong>treesit-parser-p</strong> <em>object</em><a href='#index-treesit_002dparser_002dp' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>Checks if <var>object</var> is a tree-sitter parser. Return non-nil if it
-is, return nil otherwise.
+<dd><p>This function checks if <var>object</var> is a tree-sitter parser, and
+returns non-<code>nil</code> if it is, and <code>nil</code> otherwise.
 </p></dd></dl>
 
 <p>There is no need to explicitly parse a buffer, because parsing is done
-automatically and lazily.  A parser only parses when we query for a
-node in its syntax tree.  Therefore, when a parser is first created,
-it doesn&rsquo;t parse the buffer; it waits until we query for a node for
-the first time.  Similarly, when some change is made in the buffer, a
-parser doesn&rsquo;t re-parse immediately.
+automatically and lazily.  A parser only parses when a Lisp program
+queries for a node in its syntax tree.  Therefore, when a parser is
+first created, it doesn&rsquo;t parse the buffer; it waits until the Lisp
+program queries for a node for the first time.  Similarly, when some
+change is made in the buffer, a parser doesn&rsquo;t re-parse immediately.
 </p>
 <span id="index-treesit_002dbuffer_002dtoo_002dlarge"></span>
-<p>When a parser do parse, it checks for the size of the buffer.
+<p>When a parser does parse, it checks for the size of the buffer.
 Tree-sitter can only handle buffer no larger than about 4GB.  If the
-size exceeds that, Emacs signals <code>treesit-buffer-too-large</code>
-with signal data being the buffer size.
+size exceeds that, Emacs signals the <code>treesit-buffer-too-large</code>
+error with signal data being the buffer size.
 </p>
 <p>Once a parser is created, Emacs automatically adds it to the
 internal parser list.  Every time a change is made to the buffer,
@@ -138,8 +139,9 @@
 </p>
 <dl class="def">
 <dt id="index-treesit_002dparser_002dlist"><span class="category">Function: </span><span><strong>treesit-parser-list</strong> <em>&amp;optional buffer</em><a href='#index-treesit_002dparser_002dlist' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>This function returns the parser list of <var>buffer</var>.  And
-<var>buffer</var> defaults to the current buffer.
+<dd><p>This function returns the parser list of <var>buffer</var>.  If
+<var>buffer</var> is <code>nil</code> or omitted, it defaults to the current
+buffer.
 </p></dd></dl>
 
 <dl class="def">
@@ -148,29 +150,30 @@
 </p></dd></dl>
 
 <span id="index-tree_002dsitter-narrowing"></span>
-<span id="tree_002dsitter-narrowing"></span><p>Normally, a parser &ldquo;sees&rdquo; the whole
-buffer, but when the buffer is narrowed (see <a href="Narrowing.html">Narrowing</a>), the
-parser will only see the visible region.  As far as the parser can
-tell, the hidden region is deleted.  And when the buffer is later
-widened, the parser thinks text is inserted in the beginning and in
-the end.  Although parsers respect narrowing, narrowing shouldn&rsquo;t be
-the mean to handle a multi-language buffer; instead, set the ranges in
-which a parser should operate in.  See <a href="Multiple-Languages.html">Parsing Text in Multiple Languages</a>.
+<span id="tree_002dsitter-narrowing"></span><p>Normally, a parser &ldquo;sees&rdquo; the whole buffer, but when the buffer is
+narrowed (see <a href="Narrowing.html">Narrowing</a>), the parser will only see the accessible
+portion of the buffer.  As far as the parser can tell, the hidden
+region was deleted.  When the buffer is later widened, the parser
+thinks text is inserted at the beginning and at the end.  Although
+parsers respect narrowing, modes should not use narrowing as a means
+to handle a multi-language buffer; instead, set the ranges in which the
+parser should operate.  See <a href="Multiple-Languages.html">Parsing Text in Multiple Languages</a>.
 </p>
-<p>Because a parser parses lazily, when we narrow the buffer, the parser
-is not affected immediately; as long as we don&rsquo;t query for a node
-while the buffer is narrowed, the parser is oblivious of the
-narrowing.
+<p>Because a parser parses lazily, when the user or a Lisp program
+narrows the buffer, the parser is not affected immediately; as long as
+the mode doesn&rsquo;t query for a node while the buffer is narrowed, the
+parser is oblivious of the narrowing.
 </p>
 <span id="index-tree_002dsitter-parse-string"></span>
-<dl class="def">
-<dt id="index-treesit_002dparse_002dstring"><span class="category">Function: </span><span><strong>treesit-parse-string</strong> <em>string language</em><a href='#index-treesit_002dparse_002dstring' class='copiable-anchor'> &para;</a></span></dt>
-<dd><p>Besides creating a parser for a buffer, we can also just parse a
-string.  Unlike a buffer, parsing a string is a one-time deal, and
+<span id="index-parse-string_002c-tree_002dsitter"></span>
+<p>Besides creating a parser for a buffer, a Lisp program can also parse a
+string.  Unlike a buffer, parsing a string is a one-off operation, and
 there is no way to update the result.
 </p>
-<p>This function parses <var>string</var> with <var>language</var>, and returns the
-root node of the generated syntax tree.
+<dl class="def">
+<dt id="index-treesit_002dparse_002dstring"><span class="category">Function: </span><span><strong>treesit-parse-string</strong> <em>string language</em><a href='#index-treesit_002dparse_002dstring' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function parses <var>string</var> using <var>language</var>, and returns
+the root node of the generated syntax tree.
 </p></dd></dl>
 
 </div>
diff --git a/admin/notes/tree-sitter/starter-guide b/admin/notes/tree-sitter/starter-guide
index e573603862..84118c6f57 100644
--- a/admin/notes/tree-sitter/starter-guide
+++ b/admin/notes/tree-sitter/starter-guide
@@ -78,28 +78,25 @@ Now check if Emacs is built with tree-sitter library
 
     (treesit-available-p)
 
-For your major mode, first create a tree-sitter switch:
-
-#+begin_src elisp
-(defcustom python-use-tree-sitter nil
-  "If non-nil, `python-mode' tries to use tree-sitter.
-Currently `python-mode' can utilize tree-sitter for font-locking,
-imenu, and movement functions."
-  :type 'boolean)
-#+end_src
-
-Then in other places, we decide on whether to enable tree-sitter by
-
-#+begin_src elisp
-(and python-use-tree-sitter
-     (treesit-can-enable-p))
+Users toggle tree-sitter for each major mode with a central variable,
+‘treesit-settings’.  You can check whether to enable tree-sitter with
+‘treesit-ready-p’, which takes a major-mode symbol and one or more
+language symbol. The major mode body should use a branch like this:
+
+#+begin_src emacs-lisp
+(cond
+ ;; Tree-sitter setup.
+ ((treesit-ready-p 'python-mode 'python)
+  ...)
+ (t
+  ;; Non-tree-sitter setup.
+  ...))
 #+end_src
 
 * Naming convention
 
-When referring to tree-sitter as a noun, use “tree-sitter”, like
-python-use-tree-sitter. For prefix use “treesit”, like
-python-treesit-indent.
+Use tree-sitter for text (documentation, comment), use treesit for
+symbol (variable, function).
 
 * Font-lock
 
@@ -108,10 +105,23 @@ capture names, tree-sitter finds the nodes that match these patterns,
 tag the corresponding capture names onto the nodes and return them to
 you. The query function returns a list of (capture-name . node). For
 font-lock, we use face names as capture names. And the captured node
-will be fontified in their capture name. The capture name could also
-be a function, in which case (START END NODE) is passed to the
-function for font-lock. START and END is the start and end the
-captured NODE.
+will be fontified in their capture name.
+
+The capture name could also be a function, in which case (NODE
+OVERRIDE START END) is passed to the function for fontification. START
+and END is the start and end of the region to be fontified.  The
+function should only fontify within that region.  The function should
+also allow more optional arguments with (&rest _), for future
+extensibility.  For OVERRIDE check out the docstring of
+treesit-font-lock-rules.
+
+Contextual syntax like multi-line comments and multi-line strings,
+needs special care.  Because change in this type of things can affect
+a large portion of the buffer. Think of inserting a closing comment
+delimeter, it causes all the text before it (to the opening comment
+delimeter) to change to comment face.  These things needs to be
+captured in a special name “contextual”, so that Emacs can give them
+special treatment.  Se the example below for how it looks like.
 
 ** Query syntax
 
@@ -171,52 +181,64 @@ The manual explains how to read grammar files in the bottom of section
 
 ** Debugging queires
 
-If your query has problems, it usually cannot compile. In that case
-use ‘treesit-query-validate’ to debug the query. It will pop a buffer
-containing the query (in text format) and mark the offending part in
-red.
+If your query has problems, use ‘treesit-query-validate’ to debug the
+query. It will pop a buffer containing the query (in text format) and
+mark the offending part in red.
 
 ** Code
 
-To enable tree-sitter font-lock, set ‘treesit-font-lock-settings’
-buffer-locally and call ‘treesit-font-lock-enable’. For example, see
+To enable tree-sitter font-lock, set ‘treesit-font-lock-settings’ and
+‘treesit-font-lock-feature-list’ buffer-locally and call
+‘treesit-major-mode-setup’. For example, see
 ‘python--treesit-settings’ in python.el. Below I paste a snippet of
 it.
 
 Note that like the current font-lock, if the to-be-fontified region
 already has a face (ie, an earlier match fontified part/all of the
-region), the new face is discarded rather than applied.  If you want
+region), the new face is discarded rather than applied. If you want
 later matches always override earlier matches, use the :override
 keyword.
 
+Each rule should have a :feature, like function-name,
+string-interpolation, builtin, etc. Users can then enable/disable each
+feature individually.
+
 #+begin_src elisp
 (defvar python--treesit-settings
   (treesit-font-lock-rules
+   :feature 'comment
+   :language 'python
+   '((comment) @font-lock-comment-face)
+
+   :feature 'string
    :language 'python
-   :override t
-   `(;; Queries for def and class.
-     (function_definition
-      name: (identifier) @font-lock-function-name-face)
+   '((string) @font-lock-string-face
+     (string) @contextual) ; Contextual special treatment.
 
-     (class_definition
-      name: (identifier) @font-lock-type-face)
+   :feature 'function-name
+   :language 'python
+   '((function_definition
+      name: (identifier) @font-lock-function-name-face))
 
-     ;; Comment and string.
-     (comment) @font-lock-comment-face
+   :feature 'class-name
+   :language 'python
+   '((class_definition
+      name: (identifier) @font-lock-type-face))
 
-     ...)))
+   ...))
 #+end_src
 
 Then in ‘python-mode’, enable tree-sitter font-lock:
 
 #+begin_src elisp
 (treesit-parser-create 'python)
-;; This turns off the syntax-based font-lock for comments and
-;; strings.  So it doesn’t override tree-sitter’s fontification.
-(setq-local font-lock-keywords-only t)
-(setq-local treesit-font-lock-settings
-            python--treesit-settings)
-(treesit-font-lock-enable)
+(setq-local treesit-font-lock-settings python--treesit-settings)
+(setq-local treesit-font-lock-feature-list
+            '((comment string function-name)
+              (class-name keyword builtin)
+              (string-interpolation decorator)))
+...
+(treesit-major-mode-setup)
 #+end_src
 
 Concretely, something like this:
@@ -224,29 +246,22 @@ Concretely, something like this:
 #+begin_src elisp
 (define-derived-mode python-mode prog-mode "Python"
   ...
-
-  (treesit-parser-create 'python)
-
-  (if (and python-use-tree-sitter
-           (treesit-can-enable-p))
-      ;; Tree-sitter.
-      (progn
-        (setq-local font-lock-keywords-only t)
-        (setq-local treesit-font-lock-settings
-                    python--treesit-settings)
-        (treesit-font-lock-enable))
+  (cond
+   ;; Tree-sitter.
+   ((treesit-ready-p 'python-mode 'python)
+    (treesit-parser-create 'python)
+    (setq-local treesit-font-lock-settings python--treesit-settings)
+    (setq-local treesit-font-lock-feature-list
+                '((comment string function-name)
+                  (class-name keyword builtin)
+                  (string-interpolation decorator)))
+    (treesit-major-mode-setup))
+   (t
     ;; No tree-sitter
-    (setq-local font-lock-defaults ...))
-
-  ...)
+    (setq-local font-lock-defaults ...)
+    ...)))
 #+end_src
 
-You’ll notice that tree-sitter’s font-lock doesn’t respect
-‘font-lock-maximum-decoration’, major modes are free to set
-‘treesit-font-lock-settings’ based on the value of
-‘font-lock-maximum-decoration’, or provide more fine-grained control
-through other mode-specific means. (Towards that end, the :toggle option in treesit-font-lock-rules is very useful.)
-
 * Indent
 
 Indent works like this: We have a bunch of rules that look like
@@ -262,10 +277,14 @@ previous line. We find the column number of that point (eg, 4), add
 OFFSET to it (eg, 0), and that is the column we want to indent the
 current line to (4 + 0 = 4).
 
+Matchers and anchors are functions that takes (NODE PARENT BOL &rest
+_). Matches return nil/non-nil for no match/match, and anchors return
+the anchor point. Below are some convenient builtin matchers and anchors.
+
 For MATHCER we have
 
-    (parent-is TYPE)
-    (node-is TYPE)
+    (parent-is TYPE) => matches if PARENT’s type matches TYPE as regexp
+    (node-is TYPE) => mathces NODE’s type
     (query QUERY) => matches if querying PARENT with QUERY
                      captures NODE.
 
@@ -280,9 +299,9 @@ For ANCHOR we have
     first-sibling => start of the first sibling
     parent => start of parent
     parent-bol => BOL of the line parent is on.
-    prev-sibling
-    no-indent => don’t indent
-    prev-line => same indent as previous line
+    prev-sibling => start of previous sibling
+    no-indent => current position (don’t indent)
+    prev-line => start of previous line
 
 There is also a manual section for indent: "Parser-based Indentation".
 
@@ -301,7 +320,7 @@ tells you which rule is applied in the echo area.
        ((node-is ")") parent-bol 0)
        ((node-is "]") parent-bol 0)
        ((node-is ">") parent-bol 0)
-       ((node-is ".") parent-bol ,offset)
+       ((node-is "\\.") parent-bol ,offset)
        ((parent-is "ternary_expression") parent-bol ,offset)
        ((parent-is "named_imports") parent-bol ,offset)
        ((parent-is "statement_block") parent-bol ,offset)
@@ -320,21 +339,21 @@ tells you which rule is applied in the echo area.
        ...))))
 #+end_src
 
-Then you set ‘treesit-simple-indent-rules’ to your rules, and set
-‘indent-line-function’:
+Then you set ‘treesit-simple-indent-rules’ to your rules, and call
+‘treesit-major-mode-setup’:
 
 #+begin_src elisp
 (setq-local treesit-simple-indent-rules typescript-mode-indent-rules)
-(setq-local indent-line-function #'treesit-indent)
+(treesit-major-mode-setup)
 #+end_src
 
 * Imenu
 
 Not much to say except for utilizing ‘treesit-induce-sparse-tree’.
-See ‘python--imenu-treesit-create-index-1’ in python.el for an
-example.
+See ‘js--treesit-imenu-1’ in js.el for an example.
 
-Once you have the index builder, set ‘imenu-create-index-function’.
+Once you have the index builder, set ‘imenu-create-index-function’ to
+it.
 
 * Navigation
 
@@ -344,51 +363,33 @@ You can find the end of a defun with something like
 (treesit-search-forward-goto "function_definition" 'end)
 
 where "function_definition" matches the node type of a function
-definition node, and ’end means we want to go to the end of that
-node.
-
-Something like this should suffice:
-
-#+begin_src elisp
-(defun js--treesit-beginning-of-defun (&optional arg)
-  (let ((arg (or arg 1)))
-    (if (> arg 0)
-        ;; Go backward.
-        (while (and (> arg 0)
-                    (treesit-search-forward-goto
-                     "function_definition" 'start nil t))
-          (setq arg (1- arg)))
-      ;; Go forward.
-      (while (and (< arg 0)
-                  (treesit-search-forward-goto
-                   "function_definition" 'start))
-        (setq arg (1+ arg))))))
-
-(defun xxx-end-of-defun (&optional arg)
-  (let ((arg (or arg 1)))
-    (if (< arg 0)
-        ;; Go backward.
-        (while (and (< arg 0)
-                    (treesit-search-forward-goto
-                     "function_definition" 'end nil t))
-          (setq arg (1+ arg)))
-      ;; Go forward.
-      (while (and (> arg 0)
-                  (treesit-search-forward-goto
-                   "function_definition" 'end))
-        (setq arg (1- arg))))))
-
-(setq-local beginning-of-defun-function #'xxx-beginning-of-defun)
-(setq-local end-of-defun-function #'xxx-end-of-defun)
-#+end_src
+definition node, and ’end means we want to go to the end of that node.
+
+Tree-sitter has default implementations for
+‘beginning-of-defun-function’ and ‘end-of-defun-function’.  So for
+ordinary languages, it is suffice to set ‘treesit-defun-type-regexp’
+to something that matches all the defun struct types in the language,
+and call ‘treesit-major-mode-setup’.  For example,
+
+#+begin_src emacs-lisp
+(setq-local treesit-defun-type-regexp (rx bol
+                                          (or "function" "class")
+                                          "_definition"
+                                          eol))
+(treesit-major-mode-setup)
+#+end_src>
 
 * Which-func
 
-You can find the current function by going up the tree and looking for
-the function_definition node. See ‘python-info-treesit-current-defun’
-in python.el for an example.  Since Python allows nested function
-definitions, that function keeps going until it reaches the root node,
-and records all the function names along the way.
+If you have an imenu implementation, set ‘which-func-functions’ to
+nil, and which-func will automatically use imenu’s data.
+
+If you want independent implementation for which-func, you can find
+the current function by going up the tree and looking for the
+function_definition node. See the function below for an example.
+Since Python allows nested function definitions, that function keeps
+going until it reaches the root node, and records all the function
+names along the way.
 
 #+begin_src elisp
 (defun python-info-treesit-current-defun (&optional include-type)

commit 99096528494a653d1ee9d7832ee3956a613aeb95
Author: Po Lu <luangruo@yahoo.com>
Date:   Thu Nov 3 19:14:16 2022 +0800

    More style fixes to tree-sitter code
    
    * src/treesit.c (treesit_node_uptodate_p):
    * src/treesit.h: Fix coding style.

diff --git a/src/treesit.c b/src/treesit.c
index 13b49e5aac..ad926d85b2 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1470,7 +1470,8 @@ treesit_check_node (Lisp_Object obj)
     xsignal1 (Qtreesit_node_outdated, obj);
 }
 
-bool treesit_node_uptodate_p (Lisp_Object obj)
+bool
+treesit_node_uptodate_p (Lisp_Object obj)
 {
   Lisp_Object lisp_parser = XTS_NODE (obj)->parser;
   return XTS_NODE (obj)->timestamp == XTS_PARSER (lisp_parser)->timestamp;
diff --git a/src/treesit.h b/src/treesit.h
index 7e1425fc9e..d6bada5b36 100644
--- a/src/treesit.h
+++ b/src/treesit.h
@@ -174,7 +174,7 @@ CHECK_TS_COMPILED_QUERY (Lisp_Object query)
 					Lisp_Object);
 extern Lisp_Object make_treesit_node (Lisp_Object, TSNode);
 
-bool treesit_node_uptodate_p (Lisp_Object obj);
+extern bool treesit_node_uptodate_p (Lisp_Object);
 
 extern void treesit_delete_parser (struct Lisp_TS_Parser *);
 extern void treesit_delete_query (struct Lisp_TS_Query *);

commit 6b91ea5a6159791d1d1e5006f8cbc384c0da1701
Author: Po Lu <luangruo@yahoo.com>
Date:   Thu Nov 3 19:13:18 2022 +0800

    Minor fixes to last tree-sitter change
    
    * src/treesit.c (treesit_find_override_name): Initialize
    variable.
    (Ftreesit_query_expand): Revert change to behavior.

diff --git a/src/treesit.c b/src/treesit.c
index 2d26f69aab..13b49e5aac 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -280,15 +280,14 @@ #define ts_tree_root_node fn_ts_tree_root_node
    The Emacs wrapper of tree-sitter does not expose everything the C
    API provides, most notably:
 
-   - It doesn't expose a syntax tree.  The syntax tree is placed in
-     the parser object, and updating the tree is handled at the C
-     level.
+   - It doesn't expose a syntax tree.  The syntax tree is part of the
+     parser object, and updating the tree is handled on the C level.
 
-   - The tree cursor is not exposed either.  I think Lisp is slow
-     enough to nullify any performance advantage of using a cursor,
-     though I don't have evidence.  Also I want to minimize the number
-     of new types we introduce.  Currently we only add parser and node
-     type.
+   - It doesn't expose the tree cursor, either.  Presumably, Lisp is
+     slow enough to make insignificant any performance advantages from
+     using the cursor.  Not exposing the cursor also minimizes the
+     number of new types this adds to Emacs Lisp; currently, this adds
+     only the parser and node types.
 
    - Because updating the change is handled on the C level as each
      change is made in the buffer, there is no way for Lisp to update
@@ -457,6 +456,8 @@ treesit_find_override_name (Lisp_Object language_symbol, Lisp_Object *name,
 
   CHECK_LIST (Vtreesit_load_name_override_list);
 
+  tem = Vtreesit_load_name_override_list;
+
   FOR_EACH_TAIL (tem)
     {
       Lisp_Object lang = XCAR (XCAR (tem));
@@ -1980,7 +1981,7 @@ DEFUN ("treesit-query-expand",
   (Lisp_Object query)
 {
   return Fmapconcat (Qtreesit_pattern_expand,
-		     query, empty_unibyte_string);
+		     query, build_pure_c_string (" "));
 }
 
 /* This struct is used for passing captures to be check against

commit bd8e19e1e2ccfb76c1fccc4dff1f8774185cfea4
Author: Po Lu <luangruo@yahoo.com>
Date:   Thu Oct 27 21:30:23 2022 +0800

    Stylistic changes to tree-sitter code
    
    * src/treesit.c (treesit_find_override_name)
    (treesit_load_language_push_for_each_suffix, treesit_load_language)
    (Ftreesit_langauge_available_p, treesit_record_change)
    (make_treesit_parser, make_treesit_node, make_treesit_query)
    (Ftreesit_parser_create, Ftreesit_parser_delete, Ftreesit_parser_list)
    (treesit_check_range_argument, Ftreesit_parser_included_ranges)
    (Ftreesit_node_start, Ftreesit_node_end, Ftreesit_node_check)
    (Ftreesit_node_child_by_field_name, Ftreesit_pattern_expand)
    (Ftreesit_query_expand, treesit_predicates_for_pattern)
    (treesit_predicate_capture_name_to_text, treesit_predicate_equal)
    (treesit_predicate_match, treesit_eval_predicates)
    (Ftreesit_query_capture, treesit_search_dfs, treesit_build_sparse_tree)
    (syms_of_treesit): Use FOR_EACH_TAIL (or FOR_EACH_TAIL_SAFE where not
    obviously safe), and check list heads and tails correctly; fix coding
    style of various constructs, especially:
    
      variable =
        mumble (frob (bar), (foo () + bar ()) + (baz () + quux ()))
    
    which should actually be
    
      variable
        = mumble (frob (bar), (foo () + bar ()) + (baz () + quux ()))
    
    and
    
      foo =
        mumble (frob (bar), 0)
          + (foo () + bar ())
          + (baz () + quux ())
    
    which should actually be
    
      foo = (mumble (frob (bar), 0)
             + (foo () + bar ())
             + (baz () + quux ()))
    
    * src/treesit.h: Make declaration coding style consistent.

diff --git a/src/treesit.c b/src/treesit.c
index 08740591f4..2d26f69aab 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -280,13 +280,15 @@ #define ts_tree_root_node fn_ts_tree_root_node
    The Emacs wrapper of tree-sitter does not expose everything the C
    API provides, most notably:
 
-   - It doesn't expose a syntax tree.  We put the syntax tree in the
-     parser object, and updating the tree is handled on the C level.
+   - It doesn't expose a syntax tree.  The syntax tree is placed in
+     the parser object, and updating the tree is handled at the C
+     level.
 
-   - We don't expose tree cursor either.  I think Lisp is slow enough
-     to nullify any performance advantage of using a cursor, though I
-     don't have evidence.  Also I want to minimize the number of new
-     types we introduce.  Currently we only add parser and node type.
+   - The tree cursor is not exposed either.  I think Lisp is slow
+     enough to nullify any performance advantage of using a cursor,
+     though I don't have evidence.  Also I want to minimize the number
+     of new types we introduce.  Currently we only add parser and node
+     type.
 
    - Because updating the change is handled on the C level as each
      change is made in the buffer, there is no way for Lisp to update
@@ -295,36 +297,38 @@ #define ts_tree_root_node fn_ts_tree_root_node
 
    - I didn't expose setting timeout and cancellation flag for a
      parser, mainly because I don't think they are really necessary
-     in Emacs' use cases.
-
-   - Many tree-sitter functions asks for a TSPoint, basically a (row,
-     column) location.  Emacs uses a gap buffer and keeps no
-     information about row and column position.  According to the
-     author of tree-sitter, tree-sitter only asks for (row, column)
-     position to carry it around and return back to the user later;
-     and the real position used is the byte position.  He also said
-     that he _think_ that it will work to use byte position only.
-     That's why whenever a TSPoint is asked, we pass a dummy one to
-     it.  Judging by the nature of parsing algorithms, I think it is
-     safe to use only byte position, and I don't think this will
-     change in the future.
-
-     REF: https://github.com/tree-sitter/tree-sitter/issues/445
-
-   treesit.h has some commentary on the two main data structure
-   for the parser and node.  treesit_ensure_position_synced has some
-   commentary on how do we make tree-sitter play well with narrowing
-   (tree-sitter parser only sees the visible region, so we need to
+     in Emacs's use cases.
+
+   - Many tree-sitter functions take a TSPoint, which is basically a
+     row and column.  Emacs uses a gap buffer and does not keep
+     information about the row and column position of a buffer.
+     According to the author of tree-sitter, those functions only take
+     a TSPoint so that it can be moved alongside the byte position and
+     returned to the caller afterwards, and the position actually used
+     is the specified byte position.  He also said that he _thinks_
+     that just passing a byte position will also work.  As a result, a
+     dummy value is used in place of each TSPoint.  Judging by the
+     nature of parsing algorithms, I think it is safe to use only the
+     byte position, and I don't think this will change in the future.
+
+     See: https://github.com/tree-sitter/tree-sitter/issues/445
+
+   treesit.h has some commentary on the two main data structure for
+   the parser and node.  treesit_ensure_position_synced has some
+   commentary on how we make tree-sitter play well with narrowing (the
+   tree-sitter parser only sees the visible region, so we need to
    translate positions back and forth).  Most action happens in
-   treesit_ensure_parsed, treesit_read_buffer and treesit_record_change.
+   treesit_ensure_parsed, treesit_read_buffer and
+   treesit_record_change.
 
    A complete correspondence list between tree-sitter functions and
-   exposed Lisp functions can be found in the manual (elisp)API
+   exposed Lisp functions can be found in the manual node (elisp)API
    Correspondence.
 
    Placement of CHECK_xxx functions: call CHECK_xxx before using any
-   unchecked Lisp values; these include argument of Lisp functions,
-   return value of Fsymbol_value, car of a cons.
+   unchecked Lisp values; these include arguments of Lisp functions,
+   the return value of Fsymbol_value, and that of Fcar or Fcdr on
+   user-specified conses.
 
    Initializing tree-sitter: there are two entry points to tree-sitter
    functions: 'treesit-parser-create' and
@@ -378,8 +382,8 @@ #define ts_tree_root_node fn_ts_tree_root_node
    up and the query doesn't EQ to the cache anymore, the performance
    mysteriously drops.  3) what if a user uses so many stuff that the
    default cache size (20) is not enough and we end up thrashing?
-   These are all imagined scenarios but they are not impossible :-)
- */
+   These are all imaginary scenarios but they are not impossible
+   :-) */
 
 
 /*** Initialization */
@@ -449,21 +453,28 @@ treesit_symbol_to_c_name (char *symbol_name)
 treesit_find_override_name (Lisp_Object language_symbol, Lisp_Object *name,
 			    Lisp_Object *c_symbol)
 {
+  Lisp_Object tem;
+
   CHECK_LIST (Vtreesit_load_name_override_list);
-  for (Lisp_Object list = Vtreesit_load_name_override_list;
-       !NILP (list); list = XCDR (list))
+
+  FOR_EACH_TAIL (tem)
     {
-      Lisp_Object lang = XCAR (XCAR (list));
+      Lisp_Object lang = XCAR (XCAR (tem));
       CHECK_SYMBOL (lang);
+
       if (EQ (lang, language_symbol))
 	{
-	  *name = Fnth (make_fixnum (1), XCAR (list));
+	  *name = Fnth (make_fixnum (1), XCAR (tem));
 	  CHECK_STRING (*name);
-	  *c_symbol = Fnth (make_fixnum (2), XCAR (list));
+	  *c_symbol = Fnth (make_fixnum (2), XCAR (tem));
 	  CHECK_STRING (*c_symbol);
+
 	  return true;
 	}
     }
+
+  CHECK_LIST_END (tem, Vtreesit_load_name_override_list);
+
   return false;
 }
 
@@ -475,12 +486,13 @@ treesit_find_override_name (Lisp_Object language_symbol, Lisp_Object *name,
 treesit_load_language_push_for_each_suffix (Lisp_Object lib_base_name,
 					    Lisp_Object *path_candidates)
 {
-  for (Lisp_Object suffixes = Vdynamic_library_suffixes;
-       !NILP (suffixes); suffixes = XCDR (suffixes))
-    {
-      *path_candidates = Fcons (concat2 (lib_base_name, XCAR (suffixes)),
-				*path_candidates);
-    }
+  Lisp_Object suffixes;
+
+  suffixes = Vdynamic_library_suffixes;
+
+  FOR_EACH_TAIL (suffixes)
+    *path_candidates = Fcons (concat2 (lib_base_name, XCAR (suffixes)),
+			      *path_candidates);
 }
 
 /* Load the dynamic library of LANGUAGE_SYMBOL and return the pointer
@@ -497,10 +509,10 @@ treesit_load_language (Lisp_Object language_symbol,
   CHECK_LIST (Vtreesit_extra_load_path);
 
   /* Figure out the library name and C name.  */
-  Lisp_Object lib_base_name =
-    concat2 (build_pure_c_string ("libtree-sitter-"), symbol_name);
-  Lisp_Object base_name =
-    concat2 (build_pure_c_string ("tree-sitter-"), symbol_name);
+  Lisp_Object lib_base_name
+    = concat2 (build_pure_c_string ("libtree-sitter-"), symbol_name);
+  Lisp_Object base_name
+    = concat2 (build_pure_c_string ("tree-sitter-"), symbol_name);
 
   /* Override the library name and C name, if appropriate.  */
   Lisp_Object override_name;
@@ -509,7 +521,7 @@ treesit_load_language (Lisp_Object language_symbol,
 						    &override_name,
 						    &override_c_name);
   if (found_override)
-      lib_base_name = override_name;
+    lib_base_name = override_name;
 
   /* Now we generate a list of possible library paths.  */
   Lisp_Object path_candidates = Qnil;
@@ -519,13 +531,16 @@ treesit_load_language (Lisp_Object language_symbol,
   /* This is used for reporting errors (i.e., just filenames).  */
   Lisp_Object base_candidates = path_candidates;
   /* Then push ~/.emacs.d/tree-sitter paths.  */
-  Lisp_Object lib_name =
-    Fexpand_file_name (concat2 (build_string ("tree-sitter/"), lib_base_name),
-		       Fsymbol_value (Quser_emacs_directory));
+  Lisp_Object lib_name
+    = Fexpand_file_name (concat2 (build_string ("tree-sitter/"), lib_base_name),
+			 Fsymbol_value (Quser_emacs_directory));
   treesit_load_language_push_for_each_suffix (lib_name, &path_candidates);
   /* Then push paths from treesit-extra-load-path.  */
-  for (Lisp_Object tail = Freverse (Vtreesit_extra_load_path);
-       !NILP (tail); tail = XCDR (tail))
+  Lisp_Object tail;
+
+  tail = Freverse (Vtreesit_extra_load_path);
+
+  FOR_EACH_TAIL (tail)
     {
       Lisp_Object expanded_lib = Fexpand_file_name (lib_base_name, XCAR (tail));
       treesit_load_language_push_for_each_suffix (expanded_lib,
@@ -537,8 +552,10 @@ treesit_load_language (Lisp_Object language_symbol,
      fail.  */
   dynlib_handle_ptr handle;
   char const *error;
-  for (Lisp_Object tail = path_candidates;
-       !NILP (tail); tail = XCDR (tail))
+
+  tail = path_candidates;
+
+  FOR_EACH_TAIL (tail)
     {
       char *library_name = SSDATA (XCAR (tail));
       dynlib_error ();
@@ -547,6 +564,7 @@ treesit_load_language (Lisp_Object language_symbol,
       if (error == NULL)
 	break;
     }
+
   if (error != NULL)
     {
       *signal_symbol = Qtreesit_load_language_error;
@@ -587,8 +605,7 @@ treesit_load_language (Lisp_Object language_symbol,
   return lang;
 }
 
-DEFUN ("treesit-language-available-p",
-       Ftreesit_langauge_available_p,
+DEFUN ("treesit-language-available-p", Ftreesit_langauge_available_p,
        Streesit_language_available_p,
        1, 2, 0,
        doc: /* Return non-nil if LANGUAGE exists and is loadable.
@@ -668,15 +685,17 @@ treesit_tree_edit_1 (TSTree *tree, ptrdiff_t start_byte,
 }
 
 /* Update each parser's tree after the user made an edit.  This
-function does not parse the buffer and only updates the tree.  (So it
-should be very fast.)  */
+   function does not parse the buffer and only updates the tree, so it
+   should be very fast.  */
 void
 treesit_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
 		       ptrdiff_t new_end_byte)
 {
-  for (Lisp_Object parser_list = BVAR (current_buffer, ts_parser_list);
-       !NILP (parser_list);
-       parser_list = XCDR (parser_list))
+  Lisp_Object parser_list;
+
+  parser_list = BVAR (current_buffer, ts_parser_list);
+
+  FOR_EACH_TAIL_SAFE (parser_list)
     {
       CHECK_CONS (parser_list);
       Lisp_Object lisp_parser = XCAR (parser_list);
@@ -699,15 +718,15 @@ treesit_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
 	     VISIBLE_BEG.  min(visi_end, max(visi_beg, value)) clips
 	     value into [visi_beg, visi_end], and subtracting visi_beg
 	     gives the offset from visi_beg.  */
-	  ptrdiff_t start_offset =
-	    min (visible_end,
-		 max (visible_beg, start_byte)) - visible_beg;
-	  ptrdiff_t old_end_offset =
-	    min (visible_end,
-		 max (visible_beg, old_end_byte)) - visible_beg;
-	  ptrdiff_t new_end_offset =
-	    min (visible_end,
-		 max (visible_beg, new_end_byte)) - visible_beg;
+	  ptrdiff_t start_offset = (min (visible_end,
+					 max (visible_beg, start_byte))
+				    - visible_beg);
+	  ptrdiff_t old_end_offset = (min (visible_end,
+					   max (visible_beg, old_end_byte))
+				      - visible_beg);
+	  ptrdiff_t new_end_offset = (min (visible_end,
+					   max (visible_beg, new_end_byte))
+				      - visible_beg);
 	  eassert (start_offset <= old_end_offset);
 	  eassert (start_offset <= new_end_offset);
 
@@ -721,21 +740,18 @@ treesit_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
 	     view changes.  */
 	  ptrdiff_t visi_beg_delta;
 	  if (old_end_byte > new_end_byte)
-	    {
-	      /* Move backward.  */
-	      visi_beg_delta =
-		min (visible_beg, new_end_byte)
-		     - min (visible_beg, old_end_byte);
-	    }
+	    /* Move backward.  */
+	    visi_beg_delta = (min (visible_beg, new_end_byte)
+			      - min (visible_beg, old_end_byte));
 	  else
-	    {
-	      /* Move forward.  */
-	      visi_beg_delta =
-		old_end_byte < visible_beg ? new_end_byte - old_end_byte : 0;
-	    }
+	    /* Move forward.  */
+	    visi_beg_delta = (old_end_byte < visible_beg
+			      ? new_end_byte - old_end_byte : 0);
 	  XTS_PARSER (lisp_parser)->visible_beg = visible_beg + visi_beg_delta;
-	  XTS_PARSER (lisp_parser)->visible_end
-	    = visible_end + visi_beg_delta + (new_end_offset - old_end_offset);
+	  XTS_PARSER (lisp_parser)->visible_end = (visible_end
+						   + visi_beg_delta
+						   + (new_end_offset
+						      - old_end_offset));
 	  eassert (XTS_PARSER (lisp_parser)->visible_beg >= 0);
 	  eassert (XTS_PARSER (lisp_parser)->visible_beg
 		   <= XTS_PARSER (lisp_parser)->visible_end);
@@ -826,7 +842,7 @@ treesit_check_buffer_size (struct buffer *buffer)
 }
 
 /* Parse the buffer.  We don't parse until we have to.  When we have
-to, we call this function to parse and update the tree.  */
+   to, we call this function to parse and update the tree.  */
 static void
 treesit_ensure_parsed (Lisp_Object parser)
 {
@@ -913,15 +929,18 @@ treesit_read_buffer (void *parser, uint32_t byte_index,
   return beg;
 }
 
-/*** Functions for parser and node object*/
+/*** Functions for parser and node object */
 
-/* Wrap the parser in a Lisp_Object to be used in the Lisp machine.  */
+/* Wrap the parser in a Lisp_Object to be used in the Lisp
+   machine.  */
 Lisp_Object
 make_treesit_parser (Lisp_Object buffer, TSParser *parser,
 		     TSTree *tree, Lisp_Object language_symbol)
 {
-  struct Lisp_TS_Parser *lisp_parser =
-    ALLOCATE_PSEUDOVECTOR (struct Lisp_TS_Parser, buffer, PVEC_TS_PARSER);
+  struct Lisp_TS_Parser *lisp_parser;
+
+  lisp_parser = ALLOCATE_PSEUDOVECTOR (struct Lisp_TS_Parser,
+				       buffer, PVEC_TS_PARSER);
 
   lisp_parser->language_symbol = language_symbol;
   lisp_parser->buffer = buffer;
@@ -942,8 +961,10 @@ make_treesit_parser (Lisp_Object buffer, TSParser *parser,
 Lisp_Object
 make_treesit_node (Lisp_Object parser, TSNode node)
 {
-  struct Lisp_TS_Node *lisp_node =
-    ALLOCATE_PSEUDOVECTOR (struct Lisp_TS_Node, parser, PVEC_TS_NODE);
+  struct Lisp_TS_Node *lisp_node;
+
+  lisp_node = ALLOCATE_PSEUDOVECTOR (struct Lisp_TS_Node,
+				     parser, PVEC_TS_NODE);
   lisp_node->parser = parser;
   lisp_node->node = node;
   lisp_node->timestamp = XTS_PARSER (parser)->timestamp;
@@ -956,9 +977,10 @@ make_treesit_node (Lisp_Object parser, TSNode node)
 make_treesit_query (Lisp_Object query, Lisp_Object language)
 {
   TSQueryCursor *treesit_cursor = ts_query_cursor_new ();
-  struct Lisp_TS_Query *lisp_query =
-    ALLOCATE_PSEUDOVECTOR (struct Lisp_TS_Query, source,
-			   PVEC_TS_COMPILED_QUERY);
+  struct Lisp_TS_Query *lisp_query;
+
+  lisp_query = ALLOCATE_PSEUDOVECTOR (struct Lisp_TS_Query,
+				      source, PVEC_TS_COMPILED_QUERY);
 
   lisp_query->language = language;
   lisp_query->source = query;
@@ -1178,8 +1200,9 @@ DEFUN ("treesit-parser-create",
   ts_parser_set_language (parser, lang);
 
   /* Create parser.  */
-  Lisp_Object lisp_parser
-    = make_treesit_parser (Fcurrent_buffer (), parser, NULL, language);
+  Lisp_Object lisp_parser = make_treesit_parser (Fcurrent_buffer (),
+						 parser, NULL,
+						 language);
 
   /* Update parser-list.  */
   BVAR (buf, ts_parser_list) = Fcons (lisp_parser, BVAR (buf, ts_parser_list));
@@ -1198,7 +1221,9 @@ DEFUN ("treesit-parser-delete",
 
   Lisp_Object buffer = XTS_PARSER (parser)->buffer;
   struct buffer *buf = XBUFFER (buffer);
-  BVAR (buf, ts_parser_list) = Fdelete (parser, BVAR (buf, ts_parser_list));
+
+  BVAR (buf, ts_parser_list)
+    = Fdelete (parser, BVAR (buf, ts_parser_list));
 
   XTS_PARSER (parser)->deleted = true;
   return Qnil;
@@ -1222,12 +1247,13 @@ DEFUN ("treesit-parser-list",
   /* Return a fresh list so messing with that list doesn't affect our
      internal data.  */
   Lisp_Object return_list = Qnil;
-  for (Lisp_Object tail = BVAR (buf, ts_parser_list);
-       !NILP (tail);
-       tail = XCDR (tail))
-    {
-      return_list = Fcons (XCAR (tail), return_list);
-    }
+  Lisp_Object tail;
+
+  tail = BVAR (buf, ts_parser_list);
+
+  FOR_EACH_TAIL (tail)
+    return_list = Fcons (XCAR (tail), return_list);
+
   return Freverse (return_list);
 }
 
@@ -1278,8 +1304,13 @@ treesit_check_range_argument (Lisp_Object ranges)
   ptrdiff_t point_min = BUF_BEGV (buffer);
   ptrdiff_t point_max = BUF_ZV (buffer);
   EMACS_INT last_point = point_min;
+  Lisp_Object tail;
+
+  tail = ranges;
 
-  for (Lisp_Object tail = ranges; !NILP (tail); tail = XCDR (tail))
+  CHECK_LIST (tail);
+
+  FOR_EACH_TAIL (tail)
     {
       CHECK_CONS (tail);
       Lisp_Object range = XCAR (tail);
@@ -1290,10 +1321,13 @@ treesit_check_range_argument (Lisp_Object ranges)
       EMACS_INT end = XFIXNUM (XCDR (range));
       if (!(last_point <= beg && beg <= end && end <= point_max))
 	xsignal2 (Qtreesit_range_invalid,
-		  build_pure_c_string ("RANGE is either overlapping or out-of-order or out-of-range"),
+		  build_pure_c_string ("RANGE is either overlapping,"
+				       " out-of-order or out-of-range"),
 		  ranges);
       last_point = end;
     }
+
+  CHECK_LIST_END (tail, ranges);
 }
 
 DEFUN ("treesit-parser-set-included-ranges",
@@ -1385,8 +1419,8 @@ DEFUN ("treesit-parser-included-ranges",
   treesit_check_parser (parser);
   treesit_initialize ();
   uint32_t len;
-  const TSRange *ranges =
-    ts_parser_included_ranges (XTS_PARSER (parser)->parser, &len);
+  const TSRange *ranges
+    = ts_parser_included_ranges (XTS_PARSER (parser)->parser, &len);
   if (len == 0)
     return Qnil;
 
@@ -1407,9 +1441,9 @@ DEFUN ("treesit-parser-included-ranges",
       eassert (beg_byte <= end_byte);
       eassert (end_byte <= BUF_ZV_BYTE (buffer));
 
-      Lisp_Object lisp_range =
-	Fcons (make_fixnum (buf_bytepos_to_charpos (buffer, beg_byte)) ,
-	       make_fixnum (buf_bytepos_to_charpos (buffer, end_byte)));
+      Lisp_Object lisp_range
+	= Fcons (make_fixnum (buf_bytepos_to_charpos (buffer, beg_byte)),
+		 make_fixnum (buf_bytepos_to_charpos (buffer, end_byte)));
       list = Fcons (lisp_range, list);
     }
   return Fnreverse (list);
@@ -1469,10 +1503,11 @@ DEFUN ("treesit-node-start",
   TSNode treesit_node = XTS_NODE (node)->node;
   ptrdiff_t visible_beg = XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
   uint32_t start_byte_offset = ts_node_start_byte (treesit_node);
-  struct buffer *buffer =
-    XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer);
-  ptrdiff_t start_pos =
-    buf_bytepos_to_charpos (buffer, start_byte_offset + visible_beg);
+  struct buffer *buffer
+    = XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer);
+  ptrdiff_t start_pos
+    = buf_bytepos_to_charpos (buffer,
+			      start_byte_offset + visible_beg);
   return make_fixnum (start_pos);
 }
 
@@ -1489,10 +1524,10 @@ DEFUN ("treesit-node-end",
   TSNode treesit_node = XTS_NODE (node)->node;
   ptrdiff_t visible_beg = XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
   uint32_t end_byte_offset = ts_node_end_byte (treesit_node);
-  struct buffer *buffer =
-    XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer);
-  ptrdiff_t end_pos =
-    buf_bytepos_to_charpos (buffer, end_byte_offset + visible_beg);
+  struct buffer *buffer
+    = XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer);
+  ptrdiff_t end_pos
+    = buf_bytepos_to_charpos (buffer, end_byte_offset + visible_beg);
   return make_fixnum (end_pos);
 }
 
@@ -1616,7 +1651,8 @@ DEFUN ("treesit-node-check",
   else if (EQ (property, Qhas_changes))
     result = ts_node_has_changes (treesit_node);
   else
-    signal_error ("Expecting `named', `missing', `extra', `has-changes' or `has-error', but got",
+    signal_error ("Expecting `named', `missing', `extra', "
+		  "`has-changes' or `has-error', but got",
 		  property);
   return result ? Qt : Qnil;
 }
@@ -1699,7 +1735,8 @@ DEFUN ("treesit-node-child-by-field-name",
   char *name_str = SSDATA (field_name);
   TSNode treesit_node = XTS_NODE (node)->node;
   TSNode child
-    = ts_node_child_by_field_name (treesit_node, name_str, strlen (name_str));
+    = ts_node_child_by_field_name (treesit_node, name_str,
+				   strlen (name_str));
 
   if (ts_node_is_null (child))
     return Qnil;
@@ -1905,10 +1942,10 @@ DEFUN ("treesit-pattern-expand",
     return build_pure_c_string ("#equal");
   if (EQ (pattern, intern_c_string (":match")))
     return build_pure_c_string ("#match");
-  Lisp_Object opening_delimeter =
-    build_pure_c_string (VECTORP (pattern) ? "[" : "(");
-  Lisp_Object closing_delimiter =
-    build_pure_c_string (VECTORP (pattern) ? "]" : ")");
+  Lisp_Object opening_delimeter
+    = build_pure_c_string (VECTORP (pattern) ? "[" : "(");
+  Lisp_Object closing_delimiter
+    = build_pure_c_string (VECTORP (pattern) ? "]" : ")");
   if (VECTORP (pattern) || CONSP (pattern))
     return concat3 (opening_delimeter,
 		    Fmapconcat (intern_c_string ("treesit-pattern-expand"),
@@ -1942,8 +1979,8 @@ DEFUN ("treesit-query-expand",
 See Info node `(elisp)Pattern Matching' for detailed explanation.  */)
   (Lisp_Object query)
 {
-  return Fmapconcat (intern_c_string ("treesit-pattern-expand"),
-		     query, build_pure_c_string (" "));
+  return Fmapconcat (Qtreesit_pattern_expand,
+		     query, empty_unibyte_string);
 }
 
 /* This struct is used for passing captures to be check against
@@ -1967,8 +2004,8 @@ DEFUN ("treesit-query-expand",
 treesit_predicates_for_pattern (TSQuery *query, uint32_t pattern_index)
 {
   uint32_t len;
-  const TSQueryPredicateStep *predicate_list =
-    ts_query_predicates_for_pattern (query, pattern_index, &len);
+  const TSQueryPredicateStep *predicate_list
+    = ts_query_predicates_for_pattern (query, pattern_index, &len);
   Lisp_Object result = Qnil;
   Lisp_Object predicate = Qnil;
   for (int idx = 0; idx < len; idx++)
@@ -2024,7 +2061,9 @@ treesit_predicate_capture_name_to_text (Lisp_Object name,
   if (NILP (node))
     xsignal3 (Qtreesit_query_error,
 	      build_pure_c_string ("Cannot find captured node"),
-	      name, build_pure_c_string ("A predicate can only refer to captured nodes in the same pattern"));
+	      name, build_pure_c_string ("A predicate can only refer"
+					 " to captured nodes in the "
+					 "same pattern"));
 
   struct buffer *old_buffer = current_buffer;
   set_buffer_internal (XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer));
@@ -2043,17 +2082,20 @@ treesit_predicate_equal (Lisp_Object args, struct capture_range captures)
 {
   if (XFIXNUM (Flength (args)) != 2)
     xsignal2 (Qtreesit_query_error,
-	      build_pure_c_string ("Predicate `equal' requires two arguments but only given"),
+	      build_pure_c_string ("Predicate `equal' requires "
+				   "two arguments but only given"),
 	      Flength (args));
 
   Lisp_Object arg1 = XCAR (args);
   Lisp_Object arg2 = XCAR (XCDR (args));
-  Lisp_Object text1 =
-    STRINGP (arg1) ? arg1 : treesit_predicate_capture_name_to_text (arg1,
-								    captures);
-  Lisp_Object text2 =
-    STRINGP (arg2) ? arg2 : treesit_predicate_capture_name_to_text (arg2,
-								    captures);
+  Lisp_Object text1 = (STRINGP (arg1)
+		       ? arg1
+		       : treesit_predicate_capture_name_to_text (arg1,
+								 captures));
+  Lisp_Object text2 = (STRINGP (arg2)
+		       ? arg2
+		       : treesit_predicate_capture_name_to_text (arg2,
+								 captures));
 
   return !NILP (Fstring_equal (text1, text2));
 }
@@ -2066,7 +2108,8 @@ treesit_predicate_match (Lisp_Object args, struct capture_range captures)
 {
   if (XFIXNUM (Flength (args)) != 2)
     xsignal2 (Qtreesit_query_error,
-	      build_pure_c_string ("Predicate `equal' requires two arguments but only given"),
+	      build_pure_c_string ("Predicate `equal' requires two "
+				   "arguments but only given"),
 	      Flength (args));
 
   Lisp_Object regexp = XCAR (args);
@@ -2080,10 +2123,12 @@ treesit_predicate_match (Lisp_Object args, struct capture_range captures)
      string-match does.)  */
   if (!STRINGP (regexp))
     xsignal1 (Qtreesit_query_error,
-	      build_pure_c_string ("The first argument to `match' should be a regexp string, not a capture name"));
+	      build_pure_c_string ("The first argument to `match' should "
+				   "be a regexp string, not a capture name"));
   if (!SYMBOLP (capture_name))
     xsignal1 (Qtreesit_query_error,
-	      build_pure_c_string ("The second argument to `match' should be a capture name, not a string"));
+	      build_pure_c_string ("The second argument to `match' should "
+				   "be a capture name, not a string"));
 
   if (fast_string_match (regexp, text) >= 0)
     return true;
@@ -2119,7 +2164,8 @@ treesit_eval_predicates (struct capture_range captures, Lisp_Object predicates)
       else
 	xsignal3 (Qtreesit_query_error,
 		  build_pure_c_string ("Invalid predicate"),
-		  fn, build_pure_c_string ("Currently Emacs only supports equal and match predicate"));
+		  fn, build_pure_c_string ("Currently Emacs only supports"
+					   " equal and match predicate"));
     }
   /* If all predicates passed, add captures to result list.  */
   return pass;
@@ -2231,12 +2277,14 @@ DEFUN ("treesit-query-capture",
   treesit_initialize ();
 
   /* Extract C values from Lisp objects.  */
-  TSNode treesit_node = XTS_NODE (lisp_node)->node;
-  Lisp_Object lisp_parser = XTS_NODE (lisp_node)->parser;
-  ptrdiff_t visible_beg =
-    XTS_PARSER (XTS_NODE (lisp_node)->parser)->visible_beg;
-  const TSLanguage *lang =
-    ts_parser_language (XTS_PARSER (lisp_parser)->parser);
+  TSNode treesit_node
+    = XTS_NODE (lisp_node)->node;
+  Lisp_Object lisp_parser
+    = XTS_NODE (lisp_node)->parser;
+  ptrdiff_t visible_beg
+    = XTS_PARSER (XTS_NODE (lisp_node)->parser)->visible_beg;
+  const TSLanguage *lang
+    = ts_parser_language (XTS_PARSER (lisp_parser)->parser);
 
   /* Initialize query objects.  At the end of this block, we should
      have a working TSQuery and a TSQueryCursor.  */
@@ -2266,10 +2314,11 @@ DEFUN ("treesit-query-capture",
       uint32_t error_offset;
       TSQueryError error_type;
       treesit_query = ts_query_new (lang, query_string, strlen (query_string),
-			       &error_offset, &error_type);
+				    &error_offset, &error_type);
       if (treesit_query == NULL)
 	xsignal (Qtreesit_query_error,
-		 treesit_compose_query_signal_data (error_offset, error_type));
+		 treesit_compose_query_signal_data (error_offset,
+						    error_type));
       cursor = ts_query_cursor_new ();
       needs_to_free_query_and_cursor = true;
     }
@@ -2321,9 +2370,9 @@ DEFUN ("treesit-query-capture",
 	  Lisp_Object cap;
 	  if (NILP (node_only))
 	    {
-	      const char *capture_name =
-		ts_query_capture_name_for_id (treesit_query, capture.index,
-					      &capture_name_len);
+	      const char *capture_name
+		= ts_query_capture_name_for_id (treesit_query, capture.index,
+						&capture_name_len);
 	      cap = Fcons (intern_c_string_1 (capture_name, capture_name_len),
 			   captured_node);
 	    }
@@ -2333,16 +2382,15 @@ DEFUN ("treesit-query-capture",
 	  result = Fcons (cap, result);
 	}
       /* Get predicates.  */
-      Lisp_Object predicates =
-	treesit_predicates_for_pattern (treesit_query, match.pattern_index);
+      Lisp_Object predicates
+	= treesit_predicates_for_pattern (treesit_query,
+					  match.pattern_index);
 
       /* captures_lisp = Fnreverse (captures_lisp); */
       struct capture_range captures_range = { result, prev_result };
       if (!treesit_eval_predicates (captures_range, predicates))
-	{
-	  /* Predicates didn't pass, roll back.  */
-	  result = prev_result;
-	}
+	/* Predicates didn't pass, roll back.  */
+	result = prev_result;
     }
   if (needs_to_free_query_and_cursor)
     {
@@ -2355,8 +2403,7 @@ DEFUN ("treesit-query-capture",
 /*** Navigation */
 
 /* Return the next/previous named/unnamed sibling of NODE.  FORWARD
-   controls the direction and NAMED controls the nameness.
- */
+   controls the direction and NAMED controls the nameness.  */
 static TSNode
 treesit_traverse_sibling_helper (TSNode node, bool forward, bool named)
 {
@@ -2457,13 +2504,15 @@ treesit_search_dfs (TSNode *root, Lisp_Object pred, Lisp_Object parser,
     return false;
   else
     {
-      int count =
-	named ? ts_node_named_child_count (node) : ts_node_child_count (node);
+      int count = (named
+		   ? ts_node_named_child_count (node)
+		   : ts_node_child_count (node));
       for (int offset = 0; offset < count; offset++)
 	{
 	  uint32_t idx = forward ? offset : count - offset - 1;
-	  TSNode child =
-	    named ? ts_node_named_child (node, idx) : ts_node_child (node, idx);
+	  TSNode child = (named
+			  ? ts_node_named_child (node, idx)
+			  : ts_node_child (node, idx));
 
 	  if (!ts_node_is_null (child)
 	      && treesit_search_dfs (&child, pred, parser, named,
@@ -2661,11 +2710,9 @@ treesit_build_sparse_tree (TSTreeCursor *cursor, Lisp_Object parent,
     }
   /* Before we go, reverse children in the sparse tree.  */
   if (match)
-    {
-      /* When match == true, "parent" is actually the node we added in
-	 this layer (parent = this).  */
-      Fsetcdr (parent, Fnreverse (Fcdr (parent)));
-    }
+    /* When match == true, "parent" is actually the node we added in
+       this layer (parent = this).  */
+    Fsetcdr (parent, Fnreverse (Fcdr (parent)));
 }
 
 DEFUN ("treesit-induce-sparse-tree",
@@ -2789,6 +2836,7 @@ syms_of_treesit (void)
   DEFSYM (Quser_emacs_directory,
 	  "user-emacs-directory");
   DEFSYM (Qtreesit_parser_deleted, "treesit-parser-deleted");
+  DEFSYM (Qtreesit_pattern_expand, "treesit-pattern-expand");
 
   DEFSYM (Qor, "or");
 
@@ -2893,6 +2941,6 @@ syms_of_treesit (void)
   defsubr (&Streesit_search_subtree);
   defsubr (&Streesit_search_forward);
   defsubr (&Streesit_induce_sparse_tree);
-#endif	/* HAVE_TREE_SITTER */
+#endif /* HAVE_TREE_SITTER */
   defsubr (&Streesit_available_p);
 }
diff --git a/src/treesit.h b/src/treesit.h
index bb8ca20e19..7e1425fc9e 100644
--- a/src/treesit.h
+++ b/src/treesit.h
@@ -169,16 +169,10 @@ CHECK_TS_COMPILED_QUERY (Lisp_Object query)
 	      Qtreesit_compiled_query_p, query);
 }
 
-void
-treesit_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
-		       ptrdiff_t new_end_byte);
-
-Lisp_Object
-make_treesit_parser (Lisp_Object buffer, TSParser *parser,
-		     TSTree *tree, Lisp_Object language_symbol);
-
-Lisp_Object
-make_treesit_node (Lisp_Object parser, TSNode node);
+extern void treesit_record_change (ptrdiff_t, ptrdiff_t, ptrdiff_t);
+extern Lisp_Object make_treesit_parser (Lisp_Object, TSParser *, TSTree *,
+					Lisp_Object);
+extern Lisp_Object make_treesit_node (Lisp_Object, TSNode);
 
 bool treesit_node_uptodate_p (Lisp_Object obj);
 

commit 88d54756d46101b97b7fde97b4bc3b62f7bd6c06
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Nov 2 17:47:14 2022 -0700

    Check for outdated tree-sitter node when printing
    
    * src/print.c (print_vectorlike): Check for outdated node.
    * src/treesit.c (treesit_check_node): Use the new function.
    (treesit_node_uptodate_p): New function.
    * src/treesit.h: Declare new function.

diff --git a/src/print.c b/src/print.c
index a41ffa6cf0..1749d79299 100644
--- a/src/print.c
+++ b/src/print.c
@@ -2026,7 +2026,15 @@ print_vectorlike (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag,
     case PVEC_TS_NODE:
       /* Prints #<treesit-node (identifier) in 12-15> or
          #<treesit-node "keyword" in 28-31>. */
-      print_c_string ("#<treesit-node ", printcharfun);
+      print_c_string ("#<treesit-node", printcharfun);
+      if (!treesit_node_uptodate_p (obj))
+	{
+	  print_c_string ("-outdated>", printcharfun);
+	  break;
+	}
+      printchar (' ', printcharfun);
+      /* Now the node must be up-to-date, and calling functions like
+	 Ftreesit_node_start will not signal.  */
       bool named = treesit_named_node_p (XTS_NODE (obj)->node);
       const char *delim1 = named ? "(" : "\"";
       const char *delim2 = named ? ")" : "\"";
diff --git a/src/treesit.c b/src/treesit.c
index 9324b8b100..08740591f4 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1431,11 +1431,16 @@ treesit_check_positive_integer (Lisp_Object obj)
 treesit_check_node (Lisp_Object obj)
 {
   CHECK_TS_NODE (obj);
-  Lisp_Object lisp_parser = XTS_NODE (obj)->parser;
-  if (XTS_NODE (obj)->timestamp != XTS_PARSER (lisp_parser)->timestamp)
+  if (!treesit_node_uptodate_p (obj))
     xsignal1 (Qtreesit_node_outdated, obj);
 }
 
+bool treesit_node_uptodate_p (Lisp_Object obj)
+{
+  Lisp_Object lisp_parser = XTS_NODE (obj)->parser;
+  return XTS_NODE (obj)->timestamp == XTS_PARSER (lisp_parser)->timestamp;
+}
+
 DEFUN ("treesit-node-type",
        Ftreesit_node_type, Streesit_node_type, 1, 1, 0,
        doc: /* Return the NODE's type as a string.
diff --git a/src/treesit.h b/src/treesit.h
index 60f1a0ceaf..bb8ca20e19 100644
--- a/src/treesit.h
+++ b/src/treesit.h
@@ -180,6 +180,8 @@ make_treesit_parser (Lisp_Object buffer, TSParser *parser,
 Lisp_Object
 make_treesit_node (Lisp_Object parser, TSNode node);
 
+bool treesit_node_uptodate_p (Lisp_Object obj);
+
 extern void treesit_delete_parser (struct Lisp_TS_Parser *);
 extern void treesit_delete_query (struct Lisp_TS_Query *);
 extern bool treesit_named_node_p (TSNode);

commit 32e87f09c8c2711c421363d0361693dcfbe5a688
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Nov 2 17:23:29 2022 -0700

    ; * src/print.c (print_vectorlike): Fix comment for tree-sitter.

diff --git a/src/print.c b/src/print.c
index a6cb0191c7..a41ffa6cf0 100644
--- a/src/print.c
+++ b/src/print.c
@@ -2024,8 +2024,8 @@ print_vectorlike (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag,
       printchar ('>', printcharfun);
       break;
     case PVEC_TS_NODE:
-      /* Prints #<treesit-node (identifier) in #<buffer xxx>> or
-         #<treesit-node "keyword" in #<buffer xxx>>. */
+      /* Prints #<treesit-node (identifier) in 12-15> or
+         #<treesit-node "keyword" in 28-31>. */
       print_c_string ("#<treesit-node ", printcharfun);
       bool named = treesit_named_node_p (XTS_NODE (obj)->node);
       const char *delim1 = named ? "(" : "\"";

commit 69ab588bb54178df0d3be6b4c04dabb49f5a2ac9
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Nov 2 17:03:03 2022 -0700

    Pass region start and end to tree-sitter fontification functions
    
    * doc/lispref/modes.texi (Parser-based Font Lock): Update manual.
    * lisp/progmodes/js.el (js--fontify-template-string)
    * lisp/progmodes/python.el (python--treesit-fontify-string): Update
    function to only fontify within the region.
    * lisp/treesit.el (treesit-font-lock-rules): Update docstring.
    (treesit-font-lock-fontify-region): Pass START and END to
    fontification functions.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index c6f848ffb2..c1b092247b 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3979,13 +3979,15 @@ Parser-based Font Lock
 
 @findex treesit-fontify-with-override
 Capture names can also be function names, in which case the function
-is called with 2 arguments: @var{node} and @var{override}, where
-@var{node} is the node itself, and @var{override} is the override
-property of the rule which captured this node.  (If this function
-wants to respect the @var{override} argument, it can use
-@code{treesit-fontify-with-override}.)  Beyond the 2 arguments
-presented, this function should accept more arguments as optional
-arguments for future extensibility.
+is called with 4 arguments: @var{node} and @var{override}, @var{start}
+and @var{end}, where @var{node} is the node itself, @var{override} is
+the override property of the rule which captured this node, and
+@var{start} and @var{end} limits the region in which this function
+should fontify.  (If this function wants to respect the @var{override}
+argument, it can use @code{treesit-fontify-with-override}.)
+
+Beyond the 4 arguments presented, this function should accept more
+arguments as optional arguments for future extensibility.
 
 If a capture name is both a face and a function, the face takes
 priority.  If a capture name is neither a face nor a function, it is
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 76d4ec748a..c77c0fb90b 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3573,9 +3573,10 @@ js--treesit-font-lock-settings
       @font-lock-constant-face)))
   "Tree-sitter font-lock settings.")
 
-(defun js--fontify-template-string (node override &rest _)
+(defun js--fontify-template-string (node override start end &rest _)
   "Fontify template string but not substitution inside it.
-BEG, END, NODE refers to the template_string node.
+NODE is the template_string node. START and END marks the region
+to be fontified.
 
 OVERRIDE is the override flag described in
 `treesit-font-lock-rules'."
@@ -3585,16 +3586,17 @@ js--fontify-template-string
   ;; closing "`".  That's why we have to track BEG instead of just
   ;; fontifying each child.
   (let ((child (treesit-node-child node 0))
-        (beg (treesit-node-start node)))
+        (font-beg (treesit-node-start node)))
     (while child
-      (if (equal (treesit-node-type child) "template_substitution")
+      (let ((font-end (if (equal (treesit-node-type child)
+                                 "template_substitution")
+                          (treesit-node-start child)
+                        (treesit-node-end child))))
+        (setq font-beg (max beg font-beg))
+        (when (< font-beg end)
           (treesit-fontify-with-override
-           beg (treesit-node-start child)
-           'font-lock-string-face override)
-        (treesit-fontify-with-override
-         beg (treesit-node-end child)
-         'font-lock-string-face override))
-      (setq beg (treesit-node-end child)
+           font-beg font-end 'font-lock-string-face override)))
+      (setq font-beg (treesit-node-end child)
             child (treesit-node-next-sibling child)))))
 
 (defun js-treesit-current-defun ()
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 603cdb14e1..8db96b117f 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1015,11 +1015,12 @@ python--treesit-exceptions
     "VMSError" "WindowsError"
     ))
 
-(defun python--treesit-fontify-string (node override &rest _)
+(defun python--treesit-fontify-string (node override start end &rest _)
   "Fontify string.
-NODE is the leading quote in the string.  Do not fontify the initial
-f for f-strings.  OVERRIDE is the override flag described in
-`treesit-font-lock-rules'."
+NODE is the leading quote in the string.  Do not fontify the
+initial f for f-strings.  OVERRIDE is the override flag described
+in `treesit-font-lock-rules'.  START and END marks the region to
+be fontified."
   (let* ((string (treesit-node-parent node))
          (string-beg (treesit-node-start string))
          (string-end (treesit-node-end string))
@@ -1033,7 +1034,8 @@ python--treesit-fontify-string
                  'font-lock-string-face)))
     (when (eq (char-after string-beg) ?f)
       (cl-incf string-beg))
-    (treesit-fontify-with-override string-beg string-end face override)))
+    (treesit-fontify-with-override
+     (max start string-beg) (min end string-end) face override)))
 
 (defvar python--treesit-settings
   (treesit-font-lock-rules
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 6a7ba87e83..d6058cdc43 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -502,11 +502,18 @@ treesit-font-lock-rules
 
 Capture names in QUERY should be face names like
 `font-lock-keyword-face'.  The captured node will be fontified
-with that face.  Capture names can also be function names, in
-which case the function should have a signature (NODE OVERRIDE
-&rest _), where NODE is the tree-sitter node object, and OVERRIDE
-is the override option of that rule.  This function should accept
-more arguments as optional arguments for future extensibility.
+with that face.
+
+Capture names can also be function names, in which case the
+function should have a signature
+
+    (NODE OVERRIDE START END &rest _)
+
+where NODE is the tree-sitter node object, OVERRIDE is the
+override option of that rule, and START and END marks the region
+to be fontified.  This function should accept more arguments as
+optional arguments for future extensibility.  And this function
+shouldn't fontify text outside START and END.
 
 If a capture name is both a face and a function, the face takes
 priority.  If a capture name is not a face name nor a function
@@ -754,7 +761,7 @@ treesit-font-lock-fontify-region
                    (max node-start start) (min node-end end)
                    face override))
                  ((functionp face)
-                  (funcall face node override)))
+                  (funcall face node override start end)))
                 ;; Don't raise an error if FACE is neither a face nor
                 ;; a function.  This is to allow intermediate capture
                 ;; names used for #match and #eq.

commit f331be1f074d68e7e5cdbac324419e07c186492a
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Nov 2 16:31:25 2022 -0700

    Add handling of contextual entities in tree-sitter font-lock
    
    * lisp/progmodes/python.el: Remove function.
    (python--treesit-settings): Capture contextual node.
    * lisp/treesit.el (treesit--set-nonsticky):
    (treesit-font-lock-contextual-post-process): New functions.
    (treesit-font-lock-fontify-region): Change local variable START and
    END to NODE-START and NODE-END, handle special capture name
    "contextual".
    * doc/lispref/modes.texi (Parser-based Font Lock): Update manual.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 3c91893bbf..c6f848ffb2 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3992,6 +3992,26 @@ Parser-based Font Lock
 ignored.
 @end defun
 
+Contextual entities, like multi-line strings, or @code{/* */} style
+comments, need special care, because change in these entities might
+cause change in a large portion of the buffer.  For example, inserting
+the closing comment delimiter @code{*/} will change all the text
+between it and the opening delimiter to comment face.  Such entities
+should be captured in a special name @code{contextual}, so Emacs can
+correctly update their fontification.  Here is an example for
+comments:
+
+@example
+@group
+(treesit-font-lock-rules
+ :language 'javascript
+ :feature 'comment
+ :override t
+ '((comment) @@font-lock-comment-face)
+   (comment) @@contextual))
+@end group
+@end example
+
 @defvar treesit-font-lock-feature-list
 This is a list of lists of feature symbols.  Each element of the list
 is a list that represents a decoration level.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 46559db2cd..603cdb14e1 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1035,12 +1035,6 @@ python--treesit-fontify-string
       (cl-incf string-beg))
     (treesit-fontify-with-override string-beg string-end face override)))
 
-(defun python--treesit-fontify-string-end (node &rest _)
-  "Mark the whole string as to-be-fontified.
-NODE is the ending quote of a string."
-  (let ((string (treesit-node-parent node)))
-    (setq jit-lock-context-unfontify-pos (treesit-node-start string))))
-
 (defvar python--treesit-settings
   (treesit-font-lock-rules
    :feature 'comment
@@ -1051,8 +1045,8 @@ python--treesit-settings
    :language 'python
    :override t
    ;; TODO Document on why we do this.
-   '((string "\"" @python--treesit-fontify-string-end :anchor)
-     (string :anchor "\"" @python--treesit-fontify-string :anchor))
+   '((string :anchor "\"" @python--treesit-fontify-string)
+     (string) @contextual)
 
    :feature 'string-interpolation
    :language 'python
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 248c23bf88..6a7ba87e83 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -636,6 +636,82 @@ treesit-fontify-with-override
                 "Unrecognized value of :override option"
                 override)))))
 
+(defun treesit--set-nonsticky (start end sym &optional remove)
+  "Set `rear-nonsticky' property between START and END.
+Set the proeprty to a list containing SYM.  If there is already a
+list, add SYM to that list.  If REMOVE is non-nil, remove SYM
+instead."
+  (let* ((prop (get-text-property start 'rear-nonsticky))
+         (new-prop
+          (pcase prop
+            ((pred listp) ; PROP is a list or nil.
+             (if remove
+                 (remove sym prop)
+               ;; We should make sure PORP doesn't contain SYM, but
+               ;; whatever.
+               (cons sym prop)))
+            ;; PROP is t.
+            (_ (if remove
+                   nil
+                 (list sym))))))
+    (if (null new-prop)
+        (remove-text-properties start end '(rear-nonsticky nil))
+      (put-text-property start end 'rear-nonsticky new-prop))))
+
+;; This post-processing tries to deal with the following scenario:
+;; User inserts "/*", then go down the buffer and inserts "*/".
+;; Before the user inserts "*/", tree-sitter cannot construct a
+;; comment node and the parse tree is incomplete, and we can't fontify
+;; the comment.  But once the user inserts the "*/", the parse-tree is
+;; complete and we want to refontify the whole comment, and possibly
+;; text after comment (the "/*" could damage the parse tree enough
+;; that makes tree-sitter unable to produce reasonable information for
+;; text after it).
+;;
+;; So we set jit-lock-context-unfontify-pos to comment start, and
+;; jit-lock-context will refontify text after that position in a
+;; timer.  Refontifying those text will end up calling this function
+;; again, and we don't want to fall into infinite recursion.  So we
+;; mark the end of the comment with a text property, so we can
+;; distinguish between initial and follow up invocation of this
+;; function.
+(defun treesit-font-lock-contextual-post-process
+    (node start end &optional verbose)
+  "Post-processing for contextual syntax nodes.
+NODE is a comment or string node, START and END are the region
+being fontified.
+
+If VERBOSE is non-nil, print debugging information."
+  (let* ((node-start (treesit-node-start node))
+         (node-end (treesit-node-end node))
+         (node-end-1 (max (point-min) (1- node-end)))
+         (prop-sym 'treesit-context-refontify-in-progress))
+    (when verbose
+      (message "Contextual: region: %s-%s, node: %s-%s"
+               start end node-start node-end))
+    (when (<= node-end end)
+      (if (get-text-property node-end-1 prop-sym)
+          ;; We are called from a refontification by jit-lock-context,
+          ;; caused by a previous call to this function.
+          (progn (when verbose
+                   (message "Contextual: in progress"))
+                 (remove-text-properties
+                  node-end-1 node-end `(,prop-sym nil))
+                 (treesit--set-nonsticky node-end-1 node-end prop-sym t))
+        ;; We are called from a normal fontification.
+        (when verbose
+          (message "Contextual: initial"))
+        (setq jit-lock-context-unfontify-pos node-start)
+        (put-text-property node-end-1 node-end prop-sym t)
+        (treesit--set-nonsticky node-end-1 node-end prop-sym)))))
+
+;; Some details worth explaining:
+;;
+;; 1. When we apply face to a node, we clip the face into the
+;; currently fontifying region, this way we don't overwrite faces
+;; applied by regexp-based font-lock.  The clipped part will be
+;; fontified fine when Emacs fontifies the region containing it.
+;;
 (defun treesit-font-lock-fontify-region
     (start end &optional loudly)
   "Fontify the region between START and END.
@@ -666,11 +742,17 @@ treesit-font-lock-fontify-region
             (dolist (capture captures)
               (let* ((face (car capture))
                      (node (cdr capture))
-                     (start (treesit-node-start node))
-                     (end (treesit-node-end node)))
+                     (node-start (treesit-node-start node))
+                     (node-end (treesit-node-end node)))
                 (cond
+                 ((eq face 'contextual)
+                  (treesit-font-lock-contextual-post-process
+                   node start end
+                   (or loudly treesit--font-lock-verbose)))
                  ((facep face)
-                  (treesit-fontify-with-override start end face override))
+                  (treesit-fontify-with-override
+                   (max node-start start) (min node-end end)
+                   face override))
                  ((functionp face)
                   (funcall face node override)))
                 ;; Don't raise an error if FACE is neither a face nor

commit 040991a4697b50ebcb54e498e7de54b8d0885101
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Nov 2 11:26:38 2022 -0700

    Change signature of tree-sitter font-lock functions
    
    Change from
    
    (START END NODE OVERRIDE &rest _)
    
    to
    
    (NODE OVERRIDE &rest _)
    
    START and END aren't used frequently enough to justify.  If a
    fontification function needs them, it can get them from NODE.
    
    * doc/lispref/modes.texi (Parser-based Font Lock): Update manual.
    
    * lisp/progmodes/js.el (js--fontify-template-string)
    * lisp/progmodes/python.el (python--treesit-fontify-string)
    (python--treesit-fontify-string-end): Change signature.
    
    * lisp/treesit.el (treesit-font-lock-rules): Update docstring.
    (treesit-font-lock-fontify-region): Remove START and END arguments.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 40d966ef17..3c91893bbf 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3979,14 +3979,13 @@ Parser-based Font Lock
 
 @findex treesit-fontify-with-override
 Capture names can also be function names, in which case the function
-is called with 4 arguments: @var{start}, @var{end}, @var{node}, and
-@var{override}, where @var{start} and @var{end} are the start and end
-position of the node in buffer, @var{node} is the node itself, and
-@var{override} is the override property of the rule which captured
-this node.  (If this function wants to respect the @var{override}
-argument, it can use @code{treesit-fontify-with-override}.)  Beyond
-the 4 arguments presented, this function should accept more arguments
-as optional arguments for future extensibility.
+is called with 2 arguments: @var{node} and @var{override}, where
+@var{node} is the node itself, and @var{override} is the override
+property of the rule which captured this node.  (If this function
+wants to respect the @var{override} argument, it can use
+@code{treesit-fontify-with-override}.)  Beyond the 2 arguments
+presented, this function should accept more arguments as optional
+arguments for future extensibility.
 
 If a capture name is both a face and a function, the face takes
 priority.  If a capture name is neither a face nor a function, it is
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index e50bc9017c..76d4ec748a 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3573,19 +3573,19 @@ js--treesit-font-lock-settings
       @font-lock-constant-face)))
   "Tree-sitter font-lock settings.")
 
-(defun js--fontify-template-string (beg end node override &rest _)
+(defun js--fontify-template-string (node override &rest _)
   "Fontify template string but not substitution inside it.
 BEG, END, NODE refers to the template_string node.
 
 OVERRIDE is the override flag described in
 `treesit-font-lock-rules'."
-  (ignore end)
   ;; You would have thought that the children of the string node spans
   ;; the whole string.  No, the children of the template_string only
   ;; includes the starting "`", any template_substitution, and the
   ;; closing "`".  That's why we have to track BEG instead of just
   ;; fontifying each child.
-  (let ((child (treesit-node-child node 0)))
+  (let ((child (treesit-node-child node 0))
+        (beg (treesit-node-start node)))
     (while child
       (if (equal (treesit-node-type child) "template_substitution")
           (treesit-fontify-with-override
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index f741688363..46559db2cd 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1015,7 +1015,7 @@ python--treesit-exceptions
     "VMSError" "WindowsError"
     ))
 
-(defun python--treesit-fontify-string (_beg _end node override &rest _)
+(defun python--treesit-fontify-string (node override &rest _)
   "Fontify string.
 NODE is the leading quote in the string.  Do not fontify the initial
 f for f-strings.  OVERRIDE is the override flag described in
@@ -1035,7 +1035,7 @@ python--treesit-fontify-string
       (cl-incf string-beg))
     (treesit-fontify-with-override string-beg string-end face override)))
 
-(defun python--treesit-fontify-string-end (_beg _end node &rest _)
+(defun python--treesit-fontify-string-end (node &rest _)
   "Mark the whole string as to-be-fontified.
 NODE is the ending quote of a string."
   (let ((string (treesit-node-parent node)))
diff --git a/lisp/treesit.el b/lisp/treesit.el
index b4f79dc157..248c23bf88 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -503,12 +503,12 @@ treesit-font-lock-rules
 Capture names in QUERY should be face names like
 `font-lock-keyword-face'.  The captured node will be fontified
 with that face.  Capture names can also be function names, in
-which case the function is called with (START END NODE OVERRIDE),
-where START and END are the start and end position of the node in
-buffer, NODE is the tree-sitter node object, and OVERRIDE is the
-override option of that rule.  This function should accept more
-arguments as optional arguments for future extensibility.  If a
-capture name is both a face and a function, the face takes
+which case the function should have a signature (NODE OVERRIDE
+&rest _), where NODE is the tree-sitter node object, and OVERRIDE
+is the override option of that rule.  This function should accept
+more arguments as optional arguments for future extensibility.
+
+If a capture name is both a face and a function, the face takes
 priority.  If a capture name is not a face name nor a function
 name, it is ignored.
 
@@ -672,7 +672,7 @@ treesit-font-lock-fontify-region
                  ((facep face)
                   (treesit-fontify-with-override start end face override))
                  ((functionp face)
-                  (funcall face start end node override)))
+                  (funcall face node override)))
                 ;; Don't raise an error if FACE is neither a face nor
                 ;; a function.  This is to allow intermediate capture
                 ;; names used for #match and #eq.

commit 50e33639fe190f0a1c47b8e4c0fcc4735cb60909
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Nov 1 13:26:16 2022 -0700

    Fix string fontification for tree-sitter python-mode
    
    Now when user inserts a ending quote, the whole string is ganranteed
    to be refontified and redisplayed.
    
    * lisp/progmodes/python.el (python--treesit-fontify-string): Change
    docstring, now it's called on the leading quote.
    (python--treesit-fontify-string-end): New function.
    (python--treesit-settings): Capture both leading and ending quote in a
    string.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 916b098aef..f741688363 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1017,7 +1017,7 @@ python--treesit-exceptions
 
 (defun python--treesit-fontify-string (_beg _end node override &rest _)
   "Fontify string.
-NODE is the last quote in the string.  Do not fontify the initial
+NODE is the leading quote in the string.  Do not fontify the initial
 f for f-strings.  OVERRIDE is the override flag described in
 `treesit-font-lock-rules'."
   (let* ((string (treesit-node-parent node))
@@ -1035,6 +1035,12 @@ python--treesit-fontify-string
       (cl-incf string-beg))
     (treesit-fontify-with-override string-beg string-end face override)))
 
+(defun python--treesit-fontify-string-end (_beg _end node &rest _)
+  "Mark the whole string as to-be-fontified.
+NODE is the ending quote of a string."
+  (let ((string (treesit-node-parent node)))
+    (setq jit-lock-context-unfontify-pos (treesit-node-start string))))
+
 (defvar python--treesit-settings
   (treesit-font-lock-rules
    :feature 'comment
@@ -1044,11 +1050,9 @@ python--treesit-settings
    :feature 'string
    :language 'python
    :override t
-   ;; Capture the last quote node rather than the whole string.  The
-   ;; whole string might not be captured if it's not contained in the
-   ;; region being fontified.  E.g., the user inserts a quote, that
-   ;; single quote is the whole region we are fontifying.
-   '((string "\"" @python--treesit-fontify-string :anchor))
+   ;; TODO Document on why we do this.
+   '((string "\"" @python--treesit-fontify-string-end :anchor)
+     (string :anchor "\"" @python--treesit-fontify-string :anchor))
 
    :feature 'string-interpolation
    :language 'python

commit ccd2509ed31f953408240357e9b84c3d3b3f6a2b
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Nov 1 00:39:58 2022 -0700

    Don't print buffer when printing tree-sitter node and parser
    
    Additionally, print node's position in buffer.
    
    * doc/lispref/parsing.texi (Retrieving Node): Reflect this change in
    manual.
    * src/print.c (print_vectorlike): Remove printing of buffer, add
    printing of node position.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 7164baaa6d..e280ac8c64 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -516,7 +516,7 @@ Retrieving Node
 @group
 ;; Find the node at point in a C parser's syntax tree.
 (treesit-node-at (point) 'c)
-  @result{} #<treesit-node (primitive_type) in *scratch*>
+  @result{} #<treesit-node (primitive_type) in 23-27>
 @end group
 @end example
 @end defun
@@ -617,7 +617,7 @@ Retrieving Node
 @group
 ;; Get the child that has "body" as its field name.
 (treesit-child-by-field-name node "body")
-  @result{} #<treesit-node (compound_statement) in *scratch*>
+  @result{} #<treesit-node (compound_statement) in 45-89>
 @end group
 @end example
 @end defun
diff --git a/src/print.c b/src/print.c
index 0c50cbab09..a6cb0191c7 100644
--- a/src/print.c
+++ b/src/print.c
@@ -2018,9 +2018,9 @@ print_vectorlike (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag,
     case PVEC_TS_PARSER:
       print_c_string ("#<treesit-parser for ", printcharfun);
       Lisp_Object language = XTS_PARSER (obj)->language_symbol;
+      /* No need to print the buffer because it's not that useful: we
+	 usually know which buffer a parser belongs to.  */
       print_string (Fsymbol_name (language), printcharfun);
-      print_c_string (" in ", printcharfun);
-      print_object (XTS_PARSER (obj)->buffer, printcharfun, escapeflag);
       printchar ('>', printcharfun);
       break;
     case PVEC_TS_NODE:
@@ -2034,8 +2034,9 @@ print_vectorlike (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag,
       print_string (Ftreesit_node_type (obj), printcharfun);
       print_c_string (delim2, printcharfun);
       print_c_string (" in ", printcharfun);
-      print_object (XTS_PARSER (XTS_NODE (obj)->parser)->buffer,
-		    printcharfun, escapeflag);
+      print_object (Ftreesit_node_start (obj), printcharfun, escapeflag);
+      printchar ('-', printcharfun);
+      print_object (Ftreesit_node_end (obj), printcharfun, escapeflag);
       printchar ('>', printcharfun);
       break;
     case PVEC_TS_COMPILED_QUERY:

commit 6d5b34d9de7b2f1b346d9aff123ad20c942166dc
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Nov 1 00:26:15 2022 -0700

    ; Tree-sitter font-lock debugging: print node type not language
    
    * lisp/treesit.el (treesit-font-lock-fontify-region): Print node type.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 82eda595b9..b4f79dc157 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -677,8 +677,8 @@ treesit-font-lock-fontify-region
                 ;; a function.  This is to allow intermediate capture
                 ;; names used for #match and #eq.
                 (when (or loudly treesit--font-lock-verbose)
-                  (message "Fontifying text from %d to %d, Face: %s Language: %s"
-                           start end face language)))))))))
+                  (message "Fontifying text from %d to %d, Face: %s, Node: %s"
+                           start end face (treesit-node-type node))))))))))
   `(jit-lock-bounds ,start . ,end))
 
 ;;; Indent

commit f6e92035a7c3c29aa980e1bebf9c48f1bb7264d8
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Nov 1 00:25:47 2022 -0700

    Allow user to add/remove tree-sitter font-lock features
    
    * lisp/treesit.el (treesit-font-lock-recompute-features): Add
    ADD-LIST, REMOVE-LIST argument.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 733d721f10..82eda595b9 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -419,6 +419,9 @@ 'treesit-font-lock-error
 (defvar-local treesit-font-lock-feature-list nil
   "A list of lists of feature symbols.
 
+End-user should use `treesit-font-lock-recompute-features' and
+`font-lock-maximum-decoration' to configure enabled features.
+
 Each sublist represents a decoration level.
 `font-lock-maximum-decoration' controls which levels are
 activated.
@@ -581,20 +584,31 @@ treesit-font-lock-rules
 (defvar treesit--font-lock-verbose nil
   "If non-nil, print debug messages when fontifying.")
 
-(defun treesit-font-lock-recompute-features ()
+(defun treesit-font-lock-recompute-features (&optional add-list remove-list)
   "Enable/disable font-lock settings according to decoration level.
-Set the ENABLE flag for each setting in
-`treesit-font-lock-settings', according to
+
+First compute the enabled features according to
 `treesit-font-lock-feature-list' and
-`font-lock-maximum-decoration'."
+`font-lock-maximum-decoration', then if ADD-LIST or REMOVE-LIST
+are not omitted, further add and remove features accordingly.
+
+ADD-LIST and REMOVE-LIST are each list of feature symbols.  The
+same feature symbol cannot not appear in both lists.  Otherwise
+signal `treesit-font-lock-error'."
+  (when-let ((intersection (cl-intersection add-list remove-list)))
+    (signal 'treesit-font-lock-error
+            (list "ADD-LIST and REMOVE-LIST contain the same feature"
+                  intersection)))
   (let* ((level (font-lock-value-in-major-mode
                  font-lock-maximum-decoration))
-         (features (cl-loop
-                    for idx = 0 then (1+ idx)
-                    for features in treesit-font-lock-feature-list
-                    if (or (eq level t)
-                           (>= level (1+ idx)))
-                    append features)))
+         (base-features (cl-loop
+                         for idx = 0 then (1+ idx)
+                         for features in treesit-font-lock-feature-list
+                         if (or (eq level t)
+                                (>= level (1+ idx)))
+                         append features))
+         (features (cl-set-difference (cl-union base-features add-list)
+                                      remove-list)))
     (cl-loop for idx = 0 then (1+ idx)
              for setting in treesit-font-lock-settings
              for feature = (nth 2 setting)

commit a3651d3237e91f788211e507d61c2dcf886c185f
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Oct 31 15:27:40 2022 -0700

    Query on the root node in tree-sitter font-lock
    
    Rather than querying on the smallest node that spans START to END, we
    query on the root node between START to END.
    
    * lisp/progmodes/python.el (python--treesit-fontify-string): Accept
    the string rather than the quote node.
    (python--treesit-settings): Capture the string rather than the quote
    node.
    * lisp/treesit.el (treesit-font-lock-fontify-region): Query the root
    node rather than the smallest node.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 72c8186044..733d721f10 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -635,17 +635,18 @@ treesit-font-lock-fontify-region
            (enable (nth 1 setting))
            (override (nth 3 setting))
            (language (treesit-query-language query)))
-      (when-let ((node (treesit-node-on start end language))
+      ;; Why root node rather than (treesit-node-on start end)?  If
+      ;; you insert an ending quote into a buffer, jit-lock only wants
+      ;; to fontify that single quote, and (treesit-node-on start end)
+      ;; will give you that quote node.  We want to capture the string
+      ;; and apply string face to it, but querying on the quote node
+      ;; will not give us the string node.
+      (when-let ((root (treesit-buffer-root-node language))
                  ;; Only activate if ENABLE flag is t.
                  (activate (eq t enable)))
         (ignore activate)
         (let ((captures (treesit-query-capture
-                         node query
-                         ;; Specifying the range is important.  More
-                         ;; often than not, NODE will be the root
-                         ;; node, and if we don't specify the range,
-                         ;; we are basically querying the whole file.
-                         start end))
+                         root query start end))
               (inhibit-point-motion-hooks t))
           (with-silent-modifications
             (dolist (capture captures)

commit 4ef50ccd3f8bc177ef6dd7183a9268bb8057f064
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Oct 31 15:11:44 2022 -0700

    ; Explain the BEG and END argument in treesit-query-capture better
    
    * doc/lispref/parsing.texi (Pattern Matching): Update manual.
    * src/treesit.c (Ftreesit_query_capture): Update docstring.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 524b81a2bb..7164baaa6d 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -992,7 +992,9 @@ Pattern Matching
 non-@code{nil}, it returns the list of nodes instead.  By default the
 entire text of @var{node} is searched, but if @var{beg} and @var{end}
 are both non-@code{nil}, they specify the region of buffer text where
-this function should match nodes.
+this function should match nodes.  Any matching node whose span
+overlaps with the region between @var{beg} and @var{end} are captured,
+it doesn't have to be completely in the region.
 
 @vindex treesit-query-error
 @findex treesit-query-validate
diff --git a/src/treesit.c b/src/treesit.c
index e4be065d94..9324b8b100 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2178,8 +2178,10 @@ DEFUN ("treesit-query-capture",
 is much faster than a string or sexp one, so it is recommend to
 compile your query if it will be used repeatedly.
 
-BEG and END, if both non-nil, specify the region  of buffer positions
-in which the query is executed.
+BEG and END, if both non-nil, specify the region of buffer positions
+in which the query is executed.  Any matching node whose span overlaps
+with the region between BEG and END are captured, it doesn't have to
+be completely in the region.
 
 If NODE-ONLY is non-nil, return a list of nodes.
 

commit b49250ada978c7b21cb93177c874c81a27fa4fec
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Oct 31 15:08:17 2022 -0700

    Use treesit-fontify-with-override in tree-sitter functions
    
    * lisp/progmodes/js.el (js--fontify-template-string)
    * lisp/progmodes/python.el (python--treesit-fontify-string): Use
    treesit-fontify-with-override.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 2801a729eb..e50bc9017c 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3573,9 +3573,12 @@ js--treesit-font-lock-settings
       @font-lock-constant-face)))
   "Tree-sitter font-lock settings.")
 
-(defun js--fontify-template-string (beg end node _override &rest _)
+(defun js--fontify-template-string (beg end node override &rest _)
   "Fontify template string but not substitution inside it.
-BEG, END, NODE refers to the template_string node."
+BEG, END, NODE refers to the template_string node.
+
+OVERRIDE is the override flag described in
+`treesit-font-lock-rules'."
   (ignore end)
   ;; You would have thought that the children of the string node spans
   ;; the whole string.  No, the children of the template_string only
@@ -3585,10 +3588,12 @@ js--fontify-template-string
   (let ((child (treesit-node-child node 0)))
     (while child
       (if (equal (treesit-node-type child) "template_substitution")
-          (put-text-property beg (treesit-node-start child)
-                             'face 'font-lock-string-face)
-        (put-text-property beg (treesit-node-end child)
-                           'face 'font-lock-string-face))
+          (treesit-fontify-with-override
+           beg (treesit-node-start child)
+           'font-lock-string-face override)
+        (treesit-fontify-with-override
+         beg (treesit-node-end child)
+         'font-lock-string-face override))
       (setq beg (treesit-node-end child)
             child (treesit-node-next-sibling child)))))
 
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 0b10058eeb..916b098aef 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1015,10 +1015,11 @@ python--treesit-exceptions
     "VMSError" "WindowsError"
     ))
 
-(defun python--treesit-fontify-string (_beg _end node _override &rest _)
+(defun python--treesit-fontify-string (_beg _end node override &rest _)
   "Fontify string.
 NODE is the last quote in the string.  Do not fontify the initial
-f for f-strings."
+f for f-strings.  OVERRIDE is the override flag described in
+`treesit-font-lock-rules'."
   (let* ((string (treesit-node-parent node))
          (string-beg (treesit-node-start string))
          (string-end (treesit-node-end string))
@@ -1032,7 +1033,7 @@ python--treesit-fontify-string
                  'font-lock-string-face)))
     (when (eq (char-after string-beg) ?f)
       (cl-incf string-beg))
-    (put-text-property string-beg string-end 'face face)))
+    (treesit-fontify-with-override string-beg string-end face override)))
 
 (defvar python--treesit-settings
   (treesit-font-lock-rules

commit eeeae5e9ee34da5539046ff8dac4f4fffa19a5b9
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Oct 31 15:03:49 2022 -0700

    Add an argument OVERRIDE to tree-sitter font-lock functions
    
    * doc/lispref/modes.texi (Parser-based Font Lock): Reflect this change
    in manual.
    * lisp/progmodes/js.el (js--fontify-template-string): Add _OVERRIDE
    argument.
    * lisp/progmodes/python.el (python--treesit-fontify-string): Add
    _OVERRIDE argument.
    * lisp/treesit.el (treesit-font-lock-rules): Update docstring.
    (treesit-fontify-with-override): New function.
    (treesit-font-lock-fontify-region): Extract out into
    treesit-fontify-with-override.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index d778636d6d..40d966ef17 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3975,12 +3975,22 @@ Parser-based Font Lock
 tagged with those same capture names.  For the purpose of
 fontification, capture names in @var{query} should be face names like
 @code{font-lock-keyword-face}.  The captured node will be fontified
-with that face.  Capture names can also be function names, in which
-case the function is called with 3 arguments: @var{start}, @var{end},
-and @var{node}, where @var{start} and @var{end} are the start and end
-position of the node in buffer, and @var{node} is the node itself.  If
-a capture name is both a face and a function, the face takes priority.
-If a capture name is neither a face nor a function, it is ignored.
+with that face.
+
+@findex treesit-fontify-with-override
+Capture names can also be function names, in which case the function
+is called with 4 arguments: @var{start}, @var{end}, @var{node}, and
+@var{override}, where @var{start} and @var{end} are the start and end
+position of the node in buffer, @var{node} is the node itself, and
+@var{override} is the override property of the rule which captured
+this node.  (If this function wants to respect the @var{override}
+argument, it can use @code{treesit-fontify-with-override}.)  Beyond
+the 4 arguments presented, this function should accept more arguments
+as optional arguments for future extensibility.
+
+If a capture name is both a face and a function, the face takes
+priority.  If a capture name is neither a face nor a function, it is
+ignored.
 @end defun
 
 @defvar treesit-font-lock-feature-list
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 8d1cfbd3c0..2801a729eb 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3573,7 +3573,7 @@ js--treesit-font-lock-settings
       @font-lock-constant-face)))
   "Tree-sitter font-lock settings.")
 
-(defun js--fontify-template-string (beg end node)
+(defun js--fontify-template-string (beg end node _override &rest _)
   "Fontify template string but not substitution inside it.
 BEG, END, NODE refers to the template_string node."
   (ignore end)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index a9aff16776..0b10058eeb 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1015,7 +1015,7 @@ python--treesit-exceptions
     "VMSError" "WindowsError"
     ))
 
-(defun python--treesit-fontify-string (_beg _end node)
+(defun python--treesit-fontify-string (_beg _end node _override &rest _)
   "Fontify string.
 NODE is the last quote in the string.  Do not fontify the initial
 f for f-strings."
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 2bd71cdf5d..72c8186044 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -410,7 +410,7 @@ treesit-parser-range-on
                return rng
                finally return nil))))
 
-;;; Font-lock
+;;; Fontification
 
 (define-error 'treesit-font-lock-error
               "Generic tree-sitter font-lock error"
@@ -500,12 +500,14 @@ treesit-font-lock-rules
 Capture names in QUERY should be face names like
 `font-lock-keyword-face'.  The captured node will be fontified
 with that face.  Capture names can also be function names, in
-which case the function is called with (START END NODE), where
-START and END are the start and end position of the node in
-buffer, and NODE is the tree-sitter node object.  If a capture
-name is both a face and a function, the face takes priority.  If
-a capture name is not a face name nor a function name, it is
-ignored.
+which case the function is called with (START END NODE OVERRIDE),
+where START and END are the start and end position of the node in
+buffer, NODE is the tree-sitter node object, and OVERRIDE is the
+override option of that rule.  This function should accept more
+arguments as optional arguments for future extensibility.  If a
+capture name is both a face and a function, the face takes
+priority.  If a capture name is not a face name nor a function
+name, it is ignored.
 
 \(fn :KEYWORD VALUE QUERY...)"
   ;; Other tree-sitter function don't tend to be called unless
@@ -600,6 +602,26 @@ treesit-font-lock-recompute-features
              do (setf (nth 1 (nth idx treesit-font-lock-settings))
                       (if (memq feature features) t nil)))))
 
+(defun treesit-fontify-with-override (start end face override)
+  "Apply FACE to the region between START and END.
+OVERRIDE can be nil, t, `append', `prepend', or `keep'.
+See `treesit-font-lock-rules' for their semantic."
+  (pcase override
+    ('nil (unless (text-property-not-all
+                   start end 'face nil)
+            (put-text-property start end 'face face)))
+    ('t (put-text-property start end 'face face))
+    ('append (font-lock-append-text-property
+              start end 'face face))
+    ('prepend (font-lock-prepend-text-property
+               start end 'face face))
+    ('keep (font-lock-fillin-text-property
+            start end 'face face))
+    (_ (signal 'treesit-font-lock-error
+               (list
+                "Unrecognized value of :override option"
+                override)))))
+
 (defun treesit-font-lock-fontify-region
     (start end &optional loudly)
   "Fontify the region between START and END.
@@ -633,23 +655,9 @@ treesit-font-lock-fontify-region
                      (end (treesit-node-end node)))
                 (cond
                  ((facep face)
-                  (pcase override
-                    ('nil (unless (text-property-not-all
-                                   start end 'face nil)
-                            (put-text-property start end 'face face)))
-                    ('t (put-text-property start end 'face face))
-                    ('append (font-lock-append-text-property
-                              start end 'face face))
-                    ('prepend (font-lock-prepend-text-property
-                               start end 'face face))
-                    ('keep (font-lock-fillin-text-property
-                            start end 'face face))
-                    (_ (signal 'treesit-font-lock-error
-                               (list
-                                "Unrecognized value of :override option"
-                                override)))))
+                  (treesit-fontify-with-override start end face override))
                  ((functionp face)
-                  (funcall face start end node)))
+                  (funcall face start end node override)))
                 ;; Don't raise an error if FACE is neither a face nor
                 ;; a function.  This is to allow intermediate capture
                 ;; names used for #match and #eq.

commit 9fab83ed7a90209e3873039e7ae4993c667e2759
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Oct 31 14:26:03 2022 -0700

    ; * lisp/treesit.el (tresit--font-lock-verbose): Fix typo.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index b1c712fea5..2bd71cdf5d 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -576,7 +576,7 @@ treesit-font-lock-rules
 ;; `jit-lock-functions' doesn't pass that argument.  So even if we set
 ;; `font-lock-verbose' to t, if jit-lock is enabled (and it's almost
 ;; always is), we don't get debug messages.  So we add our own.
-(defvar tresit--font-lock-verbose nil
+(defvar treesit--font-lock-verbose nil
   "If non-nil, print debug messages when fontifying.")
 
 (defun treesit-font-lock-recompute-features ()
@@ -604,7 +604,7 @@ treesit-font-lock-fontify-region
     (start end &optional loudly)
   "Fontify the region between START and END.
 If LOUDLY is non-nil, display some debugging information."
-  (when (or loudly tresit--font-lock-verbose)
+  (when (or loudly treesit--font-lock-verbose)
     (message "Fontifying region: %s-%s" start end))
   (treesit-update-ranges start end)
   (font-lock-unfontify-region start end)
@@ -653,7 +653,7 @@ treesit-font-lock-fontify-region
                 ;; Don't raise an error if FACE is neither a face nor
                 ;; a function.  This is to allow intermediate capture
                 ;; names used for #match and #eq.
-                (when (or loudly tresit--font-lock-verbose)
+                (when (or loudly treesit--font-lock-verbose)
                   (message "Fontifying text from %d to %d, Face: %s Language: %s"
                            start end face language)))))))))
   `(jit-lock-bounds ,start . ,end))

commit 18947103fabf8070738b3bd9c5a8d02f90988a3d
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Oct 30 23:59:56 2022 -0700

    Use tree-sitter for font-lock's syntactic function (optionally)
    
    Before this change, we rebind font-lock-fontify-region-function and
    call font-lock's function in tree-sitter's function, and the order of
    fontification is tree-sitter, font-lock syntax, font-lock regexp.
    
    Now we make font-lock's syntax function customizable and replace it
    with tree-sitter's function, and the order of fontification is
    tree-sitter, font-lock regexp.
    
    * doc/lispref/modes.texi (Parser-based Font Lock): Reflect the change
    in manual.
    * lisp/font-lock.el (font-lock-fontify-syntactically-function): New
    varaible.
    (font-lock-default-fontify-region): Call
    font-lock-fontify-syntactically-function rather.
    (font-lock-fontify-syntactically-region): Rename to
    font-lock-default-fontify-syntactically
    (font-lock-default-fontify-syntactically): Rename to this.
    
    * lisp/treesit.el (treesit-font-lock-fontify-region): Don't call
    font-lock functions.
    (treesit-font-lock-enable): Remove this function.  It is not used even
    before this change.
    (treesit-major-mode-setup): Instead of binding
    font-lock-fontify-region-function, now bind to
    font-lock-fontify-syntactically-function.  And we can let font-lock do
    it's thing.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 614bbe1293..d778636d6d 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3892,8 +3892,7 @@ Parser-based Font Lock
 
 Parser-based font lock and other font lock mechanisms are not mutually
 exclusive.  By default, if enabled, parser-based font lock runs first,
-then the syntactic font lock (if enabled), then the regexp-based
-font lock.
+replacing syntactic font lock, then the regexp-based font lock.
 
 Although parser-based font lock doesn't share the same customization
 variables with regexp-based font lock, it uses similar customization
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index b6f4150964..e88dc1d3b7 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -614,6 +614,14 @@ font-lock-fontify-region-function
 \(jit-lock-bounds BEG . END) indicating the bounds of the region actually
 fontified.")
 
+(defvar font-lock-fontify-syntactically-function
+  #'font-lock-default-fontify-syntactically
+  "Function to use for syntactically fontifying a region.
+
+It should take two args, the beginning and end of the region, and
+an optional third arg VERBOSE.  If VERBOSE is non-nil, the
+function should print status messages.")
+
 (defvar font-lock-unfontify-region-function #'font-lock-default-unfontify-region
   "Function to use for unfontifying a region.
 It should take two args, the beginning and end of the region.
@@ -942,7 +950,7 @@ font-lock-turn-off-thing-lock
 ;; A further reason to use the fontification indirection feature is when the
 ;; default syntactic fontification, or the default fontification in general,
 ;; is not flexible enough for a particular major mode.  For example, perhaps
-;; comments are just too hairy for `font-lock-fontify-syntactically-region' to
+;; comments are just too hairy for `font-lock-default-fontify-syntactically' to
 ;; cope with.  You need to write your own version of that function, e.g.,
 ;; `hairy-fontify-syntactically-region', and make your own version of
 ;; `hairy-fontify-region' call that function before calling
@@ -952,6 +960,10 @@ font-lock-turn-off-thing-lock
 ;; example, TeX modes could fontify {\foo ...} and \bar{...}  etc. multi-line
 ;; directives correctly and cleanly.  (It is the same problem as fontifying
 ;; multi-line strings and comments; regexps are not appropriate for the job.)
+;; (This comment is written before `font-lock-default-fontify-syntactically'
+;; can be replaced.  Now you can obviously replace
+;; `font-lock-default-fontify-syntactically' with a custom function.)
+
 
 (defvar-local font-lock-extend-after-change-region-function nil
   "A function that determines the region to refontify after a change.
@@ -1181,7 +1193,7 @@ font-lock-default-fontify-region
            (setq font-lock-syntactically-fontified end))
          (font-lock-fontify-syntactic-keywords-region start end)))
      (unless font-lock-keywords-only
-       (font-lock-fontify-syntactically-region beg end loudly))
+       (funcall font-lock-fontify-syntactically-function beg end loudly))
      (font-lock-fontify-keywords-region beg end loudly)
      `(jit-lock-bounds ,beg . ,end))))
 
@@ -1531,7 +1543,7 @@ font-lock-comment-start-skip
 (defvar font-lock-comment-end-skip nil
   "If non-nil, Font Lock mode uses this instead of `comment-end-skip'.")
 
-(defun font-lock-fontify-syntactically-region (start end &optional loudly)
+(defun font-lock-default-fontify-syntactically (start end &optional loudly)
   "Put proper face on each string and comment between START and END.
 START should be at the beginning of a line."
   (syntax-propertize end)  ; Apply any needed syntax-table properties.
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 4844127509..b1c712fea5 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -656,24 +656,8 @@ treesit-font-lock-fontify-region
                 (when (or loudly tresit--font-lock-verbose)
                   (message "Fontifying text from %d to %d, Face: %s Language: %s"
                            start end face language)))))))))
-  ;; Call regexp font-lock after tree-sitter, as it is usually used
-  ;; for custom fontification.
-  (let ((font-lock-unfontify-region-function #'ignore))
-    (funcall #'font-lock-default-fontify-region start end loudly))
   `(jit-lock-bounds ,start . ,end))
 
-(defun treesit-font-lock-enable ()
-  "Enable tree-sitter font-locking for the current buffer."
-  (treesit-font-lock-recompute-features)
-  (setq-local font-lock-fontify-region-function
-              #'treesit-font-lock-fontify-region)
-  ;; If we don't set `font-lock-defaults' to some non-nil value,
-  ;; font-lock doesn't enable properly (`font-lock-mode-internal'
-  ;; doesn't run).  See `font-lock-specified-p'.
-  (when (null font-lock-defaults)
-    (setq font-lock-defaults '(nil)))
-  (font-lock-mode 1))
-
 ;;; Indent
 
 (defvar treesit--indent-verbose nil
@@ -1306,17 +1290,10 @@ treesit-major-mode-setup
   (when treesit-font-lock-settings
     ;; `font-lock-mode' wouldn't setup properly if
     ;; `font-lock-defaults' is nil, see `font-lock-specified-p'.
-    ;; And we disable syntax-table-based font-lock by setting the
-    ;; KEYWORD-ONLY flag to t, so syntax-table-based font-lock
-    ;; doesn't override tree-sitter's fontification.
-    (setq-local font-lock-defaults '(nil t))
-    (setq-local font-lock-fontify-region-function
-                #'treesit-font-lock-fontify-region)
-    ;; `font-lock-mode' sets this to t when syntactic font-lock is
-    ;; enabled (i.e., `font-lock-keywords-only' is nil).  We disable
-    ;; font-lock's syntactic fontification, and do it ourselves, so we
-    ;; still need `jit-lock-contextually' to be t, set it ourselves.
-    (setq-local jit-lock-contextually t)
+    (setq-local font-lock-defaults
+                '( nil nil nil nil
+                   (font-lock-fontify-syntactically-function
+                    . treesit-font-lock-fontify-region)))
     (font-lock-mode 1)
     (treesit-font-lock-recompute-features))
   ;; Indent.

commit 79ee266f13fa5c657b24dc45d5f573c393a671b6
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Oct 30 20:59:50 2022 -0700

    Improve python tree-sitter's string fontification
    
    * lisp/progmodes/python.el (python--treesit-fontify-string): Handle
    not only f-strings, but also docstrings, and NODE is now the last
    quote rather than the whole string.
    (python--treesit-settings): Use python--treesit-fontify-string for
    every occasion.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 558868efdf..a9aff16776 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1015,12 +1015,24 @@ python--treesit-exceptions
     "VMSError" "WindowsError"
     ))
 
-(defun python--treesit-fontify-string (beg end _)
-  "Fontify string between BEG and END.
-Do not fontify the initial f for f-strings."
-  (let ((beg (if (eq (char-after beg) ?f)
-                 (1+ beg) beg)))
-    (put-text-property beg end 'face 'font-lock-string-face)))
+(defun python--treesit-fontify-string (_beg _end node)
+  "Fontify string.
+NODE is the last quote in the string.  Do not fontify the initial
+f for f-strings."
+  (let* ((string (treesit-node-parent node))
+         (string-beg (treesit-node-start string))
+         (string-end (treesit-node-end string))
+         (maybe-defun (treesit-node-parent
+                       (treesit-node-parent
+                        (treesit-node-parent string))))
+         (face (if (member (treesit-node-type maybe-defun)
+                           '("function_definition"
+                             "class_definition"))
+                   'font-lock-doc-face
+                 'font-lock-string-face)))
+    (when (eq (char-after string-beg) ?f)
+      (cl-incf string-beg))
+    (put-text-property string-beg string-end 'face face)))
 
 (defvar python--treesit-settings
   (treesit-font-lock-rules
@@ -1031,9 +1043,11 @@ python--treesit-settings
    :feature 'string
    :language 'python
    :override t
-   '((string) @python--treesit-fontify-string
-     ((string) @font-lock-doc-face
-      (:match "^\"\"\"" @font-lock-doc-face)))
+   ;; Capture the last quote node rather than the whole string.  The
+   ;; whole string might not be captured if it's not contained in the
+   ;; region being fontified.  E.g., the user inserts a quote, that
+   ;; single quote is the whole region we are fontifying.
+   '((string "\"" @python--treesit-fontify-string :anchor))
 
    :feature 'string-interpolation
    :language 'python

commit 377ee8158b2fab3efccb4e9b262e6129b51e28f8
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Oct 30 20:56:21 2022 -0700

    Add tresit--font-lock-verbose
    
    * lisp/treesit.el (tresit--font-lock-verbose): New variable.
    (treesit-font-lock-fontify-region): Take tresit--font-lock-verbose
    into account.  Return jit-lock-bounds.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 4bba221832..4844127509 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -572,6 +572,13 @@ treesit-font-lock-rules
                        `("Unexpected value" ,token))))))
       (nreverse result))))
 
+;; `font-lock-fontify-region-function' has the LOUDLY argument, but
+;; `jit-lock-functions' doesn't pass that argument.  So even if we set
+;; `font-lock-verbose' to t, if jit-lock is enabled (and it's almost
+;; always is), we don't get debug messages.  So we add our own.
+(defvar tresit--font-lock-verbose nil
+  "If non-nil, print debug messages when fontifying.")
+
 (defun treesit-font-lock-recompute-features ()
   "Enable/disable font-lock settings according to decoration level.
 Set the ENABLE flag for each setting in
@@ -597,6 +604,8 @@ treesit-font-lock-fontify-region
     (start end &optional loudly)
   "Fontify the region between START and END.
 If LOUDLY is non-nil, display some debugging information."
+  (when (or loudly tresit--font-lock-verbose)
+    (message "Fontifying region: %s-%s" start end))
   (treesit-update-ranges start end)
   (font-lock-unfontify-region start end)
   (dolist (setting treesit-font-lock-settings)
@@ -644,13 +653,14 @@ treesit-font-lock-fontify-region
                 ;; Don't raise an error if FACE is neither a face nor
                 ;; a function.  This is to allow intermediate capture
                 ;; names used for #match and #eq.
-                (when loudly
+                (when (or loudly tresit--font-lock-verbose)
                   (message "Fontifying text from %d to %d, Face: %s Language: %s"
                            start end face language)))))))))
   ;; Call regexp font-lock after tree-sitter, as it is usually used
   ;; for custom fontification.
   (let ((font-lock-unfontify-region-function #'ignore))
-    (funcall #'font-lock-default-fontify-region start end loudly)))
+    (funcall #'font-lock-default-fontify-region start end loudly))
+  `(jit-lock-bounds ,start . ,end))
 
 (defun treesit-font-lock-enable ()
   "Enable tree-sitter font-locking for the current buffer."

commit 52c8fdde1667ac4b5d7f2af5eff94d6512d83caa
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Oct 30 20:53:44 2022 -0700

    Set jit-lock-contextually in treesit-major-mode-setup
    
    * lisp/treesit.el (treesit-major-mode-setup): Set jit-lock-contextually.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 177c185c74..4bba221832 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1302,6 +1302,11 @@ treesit-major-mode-setup
     (setq-local font-lock-defaults '(nil t))
     (setq-local font-lock-fontify-region-function
                 #'treesit-font-lock-fontify-region)
+    ;; `font-lock-mode' sets this to t when syntactic font-lock is
+    ;; enabled (i.e., `font-lock-keywords-only' is nil).  We disable
+    ;; font-lock's syntactic fontification, and do it ourselves, so we
+    ;; still need `jit-lock-contextually' to be t, set it ourselves.
+    (setq-local jit-lock-contextually t)
     (font-lock-mode 1)
     (treesit-font-lock-recompute-features))
   ;; Indent.

commit 8c385f05120bdf905a027fe99eab23a59d0f837e
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Oct 29 19:59:50 2022 -0700

    Separate python tree-sitter fontification into features
    
    Level 1: comment string function-name class-name
    Level 2: keyword builtin constant type
    Level 3: assignment decorator escape-sequence string-interpolation
    
    * lisp/progmodes/python.el (python--treesit-settings): Separate.
    (python-mode): Set features.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 9783936635..558868efdf 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1024,44 +1024,55 @@ python--treesit-fontify-string
 
 (defvar python--treesit-settings
   (treesit-font-lock-rules
+   :feature 'comment
    :language 'python
-   :feature 'basic
-   '(;; Queries for def and class.
-     (function_definition
-      name: (identifier) @font-lock-function-name-face)
+   '((comment) @font-lock-comment-face)
 
-     (class_definition
-      name: (identifier) @font-lock-type-face)
-
-     ;; Comment and string.
-     (comment) @font-lock-comment-face
-
-     (string) @python--treesit-fontify-string
+   :feature 'string
+   :language 'python
+   :override t
+   '((string) @python--treesit-fontify-string
      ((string) @font-lock-doc-face
-      (:match "^\"\"\"" @font-lock-doc-face))
-     (interpolation (identifier) @font-lock-variable-name-face))
+      (:match "^\"\"\"" @font-lock-doc-face)))
+
+   :feature 'string-interpolation
    :language 'python
-   :feature 'moderate
    :override t
-   `(;; Keywords, builtins, and constants.
-     [,@python--treesit-keywords] @font-lock-keyword-face
+   '((interpolation (identifier) @font-lock-variable-name-face))
 
+   :feature 'function-name
+   :language 'python
+   '((function_definition
+      name: (identifier) @font-lock-function-name-face))
+
+   :feature 'class-name
+   :language 'python
+   '((class_definition
+      name: (identifier) @font-lock-type-face))
+
+   :feature 'keyword
+   :language 'python
+   `([,@python--treesit-keywords] @font-lock-keyword-face
      ((identifier) @font-lock-keyword-face
-      (:match "^self$" @font-lock-keyword-face))
+      (:match "^self$" @font-lock-keyword-face)))
 
-     ((identifier) @font-lock-builtin-face
+   :feature 'builtin
+   :language 'python
+   `(((identifier) @font-lock-builtin-face
       (:match ,(rx-to-string
                 `(seq bol
                       (or ,@python--treesit-builtins
                           ,@python--treesit-special-attributes)
                       eol))
-              @font-lock-builtin-face))
+              @font-lock-builtin-face)))
 
-     [(true) (false) (none)] @font-lock-constant-face)
+   :feature 'constant
    :language 'python
-   :feature 'elaborate
-   :override t
-   `(;; Variable names.
+   '([(true) (false) (none)] @font-lock-constant-face)
+
+   :feature 'assignment
+   :language 'python
+   `(;; Variable names and LHS.
      (assignment left: (identifier)
                  @font-lock-variable-name-face)
      (assignment left: (attribute
@@ -1074,19 +1085,25 @@ python--treesit-settings
      (list_pattern (identifier)
                    @font-lock-variable-name-face)
      (list_splat_pattern (identifier)
-                         @font-lock-variable-name-face)
+                         @font-lock-variable-name-face))
 
-     ;; Types and decorators.
-     (decorator) @font-lock-type-face
-     ((identifier) @font-lock-type-face
+   :feature 'decorator
+   :language 'python
+   '((decorator) @font-lock-type-face)
+
+   :feature 'type
+   :language 'python
+   `(((identifier) @font-lock-type-face
       (:match ,(rx-to-string
                 `(seq bol (or ,@python--treesit-exceptions)
                       eol))
               @font-lock-type-face))
-     (type (identifier) @font-lock-type-face)
+     (type (identifier) @font-lock-type-face))
 
-     ;; Escape sequences
-     (escape_sequence) @font-lock-constant-face))
+   :feature 'escape-sequence
+   :language 'python
+   :override t
+   '((escape_sequence) @font-lock-constant-face))
   "Tree-sitter font-lock settings.")
 
 
@@ -6469,7 +6486,10 @@ python-mode
    ;; Tree-sitter.
    ((treesit-ready-p 'python-mode 'python)
     (setq-local treesit-font-lock-feature-list
-                '((basic) (moderate) (elaborate)))
+                '(( comment string function-name class-name)
+                  ( keyword builtin constant type)
+                  ( assignment decorator escape-sequence
+                    string-interpolation)))
     (setq-local treesit-font-lock-settings python--treesit-settings)
     (setq-local imenu-create-index-function
                 #'python-imenu-treesit-create-index)

commit f6483526cd4b4b9ed7d830599add82ecb45009e6
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Oct 29 14:50:25 2022 -0700

    Fix byte-compile warning in treesit.el
    
    Originally treesit-simple-indent-presets was
    
    '((parent-is . (lambda (type)
                     `(lambda (n p b)
                        (equal (treesit-node-type p)
                               ,type)))))
    
    Then I changed it to
    
    `((parent-is . ,(byte-compile
                     (lambda (type)
                       (lambda (n p b)
                         (equal (treesit-node-type p)
                                type))))))
    
    but that generates "function already compiled" warning when
    byte-compiling treesit.el.  The latest form shouldn't have any problem
    anymore.
    
    * lisp/treesit.el (treesit-simple-indent-presets): Change byte-compile
    to plain evaluation.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 624e809b46..177c185c74 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -696,131 +696,117 @@ treesit-simple-indent-rules
 See `treesit-simple-indent-presets'.")
 
 (defvar treesit-simple-indent-presets
-  `((match . ,(byte-compile
-               (lambda
-                 (&optional node-type parent-type node-field
-                            node-index-min node-index-max)
-                 (lambda (node parent &rest _)
-                   (and (or (null node-type)
-                            (string-match-p
-                             node-type (or (treesit-node-type node) "")))
-                        (or (null parent-type)
-                            (string-match-p
-                             parent-type (treesit-node-type parent)))
-                        (or (null node-field)
-                            (string-match-p
-                             node-field
-                             (or (treesit-node-field-name node) "")))
-                        (or (null node-index-min)
-                            (>= (treesit-node-index node t)
-                                node-index-min))
-                        (or (null node-index-max)
-                            (<= (treesit-node-index node t)
-                                node-index-max)))))))
-    ;; TODO: Document if genuinely useful.
-    (n-p-gp . ,(byte-compile
-                (lambda (node-t parent-t grand-parent-t)
-                  (lambda (node parent &rest _)
-                    (and (or (null node-t)
+  (list (cons 'match
+              (lambda
+                (&optional node-type parent-type node-field
+                           node-index-min node-index-max)
+                (lambda (node parent &rest _)
+                  (and (or (null node-type)
+                           (string-match-p
+                            node-type (or (treesit-node-type node) "")))
+                       (or (null parent-type)
+                           (string-match-p
+                            parent-type (treesit-node-type parent)))
+                       (or (null node-field)
+                           (string-match-p
+                            node-field
+                            (or (treesit-node-field-name node) "")))
+                       (or (null node-index-min)
+                           (>= (treesit-node-index node t)
+                               node-index-min))
+                       (or (null node-index-max)
+                           (<= (treesit-node-index node t)
+                               node-index-max))))))
+        ;; TODO: Document if genuinely useful.
+        (cons 'n-p-gp
+              (lambda (node-t parent-t grand-parent-t)
+                (lambda (node parent &rest _)
+                  (and (or (null node-t)
+                           (string-match-p
+                            node-t (or (treesit-node-type node) "")))
+                       (or (null parent-t)
+                           (string-match-p
+                            parent-t (treesit-node-type parent)))
+                       (or (null grand-parent-t)
+                           (string-match-p
+                            grand-parent-t
+                            (treesit-node-type
+                             (treesit-node-parent parent))))))))
+        (cons 'no-node (lambda (node &rest _) (null node)))
+        (cons 'parent-is (lambda (type)
+                           (lambda (_n parent &rest _)
                              (string-match-p
-                              node-t (or (treesit-node-type node) "")))
-                         (or (null parent-t)
-                             (string-match-p
-                              parent-t (treesit-node-type parent)))
-                         (or (null grand-parent-t)
-                             (string-match-p
-                              grand-parent-t
-                              (treesit-node-type
-                               (treesit-node-parent parent)))))))))
-    (no-node . ,(byte-compile
-                 (lambda (node &rest _) (null node))))
-    (parent-is . ,(byte-compile
-                   (lambda (type)
-                     (lambda (_n parent &rest _)
-                       (string-match-p
-                        type (treesit-node-type parent))))))
-
-    (node-is . ,(byte-compile
-                 (lambda (type)
-                   (lambda (node &rest _)
-                     (string-match-p
-                      type (or (treesit-node-type node) ""))))))
-    (field-is . ,(byte-compile
-                  (lambda (name)
-                    (lambda (node &rest _)
-                      (string-match-p
-                       name (or (treesit-node-field-name node) ""))))))
-    ;; TODO: Document.
-    (catch-all . ,(byte-compile (lambda (&rest _) t)))
-
-    (query . ,(byte-compile
-               (lambda (pattern)
-                 (lambda (node parent &rest _)
-                   (cl-loop for capture
-                            in (treesit-query-capture
-                                parent pattern)
-                            if (treesit-node-eq node (cdr capture))
-                            return t
-                            finally return nil)))))
-    (first-sibling . ,(byte-compile
-                       (lambda (_n parent &rest _)
-                         (treesit-node-start
-                          (treesit-node-child parent 0)))))
-    ;; TODO: Document.
-    (nth-sibling . ,(byte-compile
-                     (lambda (n &optional named)
-                       (lambda (_n parent &rest _)
-                         (treesit-node-start
-                          (treesit-node-child parent n named))))))
-    (parent . ,(byte-compile
-                (lambda (_n parent &rest _)
-                  (treesit-node-start parent))))
-    ;; TODO: Document.
-    (grand-parent . ,(byte-compile
-                      (lambda (_n parent &rest _)
-                        (treesit-node-start (treesit-node-parent parent)))))
-    (parent-bol . ,(byte-compile
-                    (lambda (_n parent &rest _)
-                      (save-excursion
-                        (goto-char (treesit-node-start parent))
-                        (back-to-indentation)
-                        (point)))))
-    (prev-sibling . ,(byte-compile
-                      (lambda (node &rest _)
-                        (treesit-node-start
-                         (treesit-node-prev-sibling node)))))
-    (no-indent . ,(byte-compile (lambda (_n _p bol &rest _) bol)))
-    (prev-line . ,(byte-compile (lambda (_n _p bol &rest _)
-                                  (save-excursion
-                                    (goto-char bol)
-                                    (forward-line -1)
-                                    (skip-chars-forward " \t")))))
-    ;; TODO: Document.
-    (and . ,(byte-compile
-             (lambda (&rest fns)
-               (lambda (node parent bol &rest _)
-                 (cl-reduce (lambda (a b) (and a b))
-                            (mapcar (lambda (fn)
-                                      (funcall fn node parent bol))
-                                    fns))))))
-    (or . ,(byte-compile
-            (lambda (&rest fns)
-              (lambda (node parent bol &rest _)
-                (cl-reduce (lambda (a b) (or a b))
-                           (mapcar (lambda (fn)
-                                     (funcall fn node parent bol))
-                                   fns))))))
-    (not . ,(byte-compile
-             (lambda (fn)
-               (lambda (node parent bol &rest _)
-                 (debug)
-                 (not (funcall fn node parent bol))))))
-    (list . ,(byte-compile
-              (lambda (&rest fns)
-                (lambda (node parent bol &rest _)
-                  (mapcar (lambda (fn)
-                            (funcall fn node parent bol))
-                          fns))))))
+                              type (treesit-node-type parent)))))
+
+        (cons 'node-is (lambda (type)
+                         (lambda (node &rest _)
+                           (string-match-p
+                            type (or (treesit-node-type node) "")))))
+        (cons 'field-is (lambda (name)
+                          (lambda (node &rest _)
+                            (string-match-p
+                             name (or (treesit-node-field-name node) "")))))
+        ;; TODO: Document.
+        (cons 'catch-all (lambda (&rest _) t))
+
+        (cons 'query (lambda (pattern)
+                       (lambda (node parent &rest _)
+                         (cl-loop for capture
+                                  in (treesit-query-capture
+                                      parent pattern)
+                                  if (treesit-node-eq node (cdr capture))
+                                  return t
+                                  finally return nil))))
+        (cons 'first-sibling (lambda (_n parent &rest _)
+                               (treesit-node-start
+                                (treesit-node-child parent 0))))
+        ;; TODO: Document.
+        (cons 'nth-sibling (lambda (n &optional named)
+                             (lambda (_n parent &rest _)
+                               (treesit-node-start
+                                (treesit-node-child parent n named)))))
+        (cons 'parent (lambda (_n parent &rest _)
+                        (treesit-node-start parent)))
+        ;; TODO: Document.
+        (cons 'grand-parent
+              (lambda (_n parent &rest _)
+                (treesit-node-start (treesit-node-parent parent))))
+        (cons 'parent-bol (lambda (_n parent &rest _)
+                            (save-excursion
+                              (goto-char (treesit-node-start parent))
+                              (back-to-indentation)
+                              (point))))
+        (cons 'prev-sibling (lambda (node &rest _)
+                              (treesit-node-start
+                               (treesit-node-prev-sibling node))))
+        (cons 'no-indent (lambda (_n _p bol &rest _) bol))
+        (cons 'prev-line (lambda (_n _p bol &rest _)
+                           (save-excursion
+                             (goto-char bol)
+                             (forward-line -1)
+                             (skip-chars-forward " \t"))))
+        ;; TODO: Document.
+        (cons 'and (lambda (&rest fns)
+                     (lambda (node parent bol &rest _)
+                       (cl-reduce (lambda (a b) (and a b))
+                                  (mapcar (lambda (fn)
+                                            (funcall fn node parent bol))
+                                          fns)))))
+        (cons 'or (lambda (&rest fns)
+                    (lambda (node parent bol &rest _)
+                      (cl-reduce (lambda (a b) (or a b))
+                                 (mapcar (lambda (fn)
+                                           (funcall fn node parent bol))
+                                         fns)))))
+        (cons 'not (lambda (fn)
+                     (lambda (node parent bol &rest _)
+                       (debug)
+                       (not (funcall fn node parent bol)))))
+        (cons 'list (lambda (&rest fns)
+                      (lambda (node parent bol &rest _)
+                        (mapcar (lambda (fn)
+                                  (funcall fn node parent bol))
+                                fns)))))
   "A list of presets.
 These presets that can be used as MATHER and ANCHOR in
 `treesit-simple-indent-rules'.

commit f6e3de3f63616d7bd52c1390f9dea70fa33e49c2
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Oct 29 14:49:31 2022 -0700

    Not return noindent in treesit-indent
    
    * lisp/treesit.el (treesit-indent): Don't return noindent.
    (treesit-defun-type-regexp): Return (nil . nil) rather than nil.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 027f5ecb77..624e809b46 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -974,19 +974,21 @@ treesit--indent-1
 (defun treesit-indent ()
   "Indent according to the result of `treesit-indent-function'."
   (treesit-update-ranges)
+  ;; We don't return 'noindent even if no rules match, because
+  ;; `indent-for-tab-command' tries to indent itself when we return
+  ;; 'noindent, which leads to wrong indentation at times.
   (pcase-let* ((`(,anchor . ,offset) (treesit--indent-1)))
-    (if (and anchor offset)
-        (let ((col (+ (save-excursion
-                        (goto-char anchor)
-                        (current-column))
-                      offset))
-              (delta (- (point-max) (point))))
-          (indent-line-to col)
-          ;; Now point is at the end of indentation.  If we started
-          ;; from within the line, go back to where we started.
-          (when (> (- (point-max) delta) (point))
-            (goto-char (- (point-max) delta))))
-      'noindent)))
+    (when (and anchor offset)
+      (let ((col (+ (save-excursion
+                      (goto-char anchor)
+                      (current-column))
+                    offset))
+            (delta (- (point-max) (point))))
+        (indent-line-to col)
+        ;; Now point is at the end of indentation.  If we started
+        ;; from within the line, go back to where we started.
+        (when (> (- (point-max) delta) (point))
+          (goto-char (- (point-max) delta)))))))
 
 (defvar treesit--indent-region-batch-size 400
   "How many lines of indent value do we precompute.
@@ -1066,8 +1068,9 @@ treesit-simple-indent
 indentation offset, meaning indent to align with ANCHOR and add
 OFFSET."
   (if (null parent)
-      (when treesit--indent-verbose
-        (message "PARENT is nil, not indenting"))
+      (progn (when treesit--indent-verbose
+               (message "PARENT is nil, not indenting"))
+             (cons nil nil))
     (let* ((language (treesit-node-language parent))
            (rules (alist-get language
                              treesit-simple-indent-rules)))

commit da87895df2d6b21468b187f5a4e2ca8710e35ee7
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Oct 29 14:11:52 2022 -0700

    Add treesit-node-top-level
    
    Merge treesit-node-top-level-p and treesit--find-top-level-match into
    treesit-node-top-level.
    
    * doc/lispref/parsing.texi (Retrieving Node): Add manual entry for it.
    * lisp/progmodes/js.el (js--treesit-imenu-1): Replace
    treesit-node-top-level-p with treesit-node-top-level.
    * lisp/treesit.el (treesit-node-top-level-p)
    (treesit--find-top-level-match): Remove functions.
    (treesit-node-top-level): New function.
    * lisp/treesit.el (treesit-beginning-of-defun)
    (treesit-end-of-defun): Replace treesit--find-top-level-match with
    treesit-node-top-level.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index fe51222e9b..524b81a2bb 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -782,6 +782,16 @@ Retrieving Node
 farthest parent that still satisfies @var{predicate}.
 @end defun
 
+@defun treesit-node-top-level node &optional type
+This function returns the highest parent of @var{node} that has the
+same type as @var{node}.  If no such parent exists, it returns
+@code{nil}.  Therefore this function is also useful for testing
+whether @var{node} is top-level.
+
+If @var{type} is non-@code{nil}, this function matches each parent's
+type with @var{type} as a regexp, rather than using @var{node}'s type.
+@end defun
+
 @node Accessing Node Information
 @section Accessing Node Information
 @cindex information of node, syntax trees
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index d6ec3199ab..8d1cfbd3c0 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3670,8 +3670,9 @@ js--treesit-imenu-1
     (cond
      ((null ts-node)
       subtrees)
+     ;; Don't included non-top-level variable declarations.
      ((and (eq type 'variable)
-           (not (treesit-node-top-level-p ts-node)))
+           (treesit-node-top-level ts-node))
       nil)
      (subtrees
       (let ((parent-label (js--treesit-imenu-label type name))
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 6176fb57ef..027f5ecb77 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -246,21 +246,21 @@ treesit-node-on
                 (treesit-buffer-root-node parser-or-lang))))
     (treesit-node-descendant-for-range root beg (or end beg) named)))
 
-(defun treesit-node-top-level-p (node &optional type)
-  "Return non-nil if NODE is top-level, and nil otherwise.
-Being top-level means there is no parent of NODE that has the
-same type.
-
-If TYPE is non-nil, match each parent's type with TYPE as a regexp."
-  (when node
-    (catch 'term
-      (let ((plain-type (treesit-node-type node)))
-        (while (setq node (treesit-node-parent node))
-          (when (if type
-                    (string-match-p type (treesit-node-type node))
-                  (equal (treesit-node-type node) plain-type))
-            (throw 'term nil))))
-      t)))
+(defun treesit-node-top-level (node &optional type)
+  "Return the top-level equivalent of NODE.
+Specifically, return the highest parent of NODE that has the same
+type as it.  If no such parent exists, return nil.
+
+If TYPE is non-nil, match each parent's type with TYPE as a
+regexp, rather than using NODE's type."
+  (let ((type (or type (treesit-node-type node)))
+        (result nil))
+    (cl-loop for cursor = (treesit-node-parent node)
+             then (treesit-node-parent cursor)
+             while cursor
+             if (string-match-p type (treesit-node-type cursor))
+             do (setq result cursor))
+    result))
 
 (defun treesit-buffer-root-node (&optional language)
   "Return the root node of the current buffer.
@@ -1162,17 +1162,6 @@ treesit-defun-type-regexp
 
 This is used by `treesit-beginning-of-defun' and friends.")
 
-(defun treesit--find-top-level-match (node type)
-  "Return the top-level parent of NODE matching TYPE.
-TYPE is a regexp, this function matches TYPE with each parent's
-type."
-  (cl-loop for cursor = (treesit-node-parent node)
-           then (treesit-node-parent cursor)
-           while cursor
-           if (string-match-p type (treesit-node-type cursor))
-           do (setq node cursor)
-           finally return node))
-
 (defun treesit-beginning-of-defun (&optional arg)
   "Tree-sitter `beginning-of-defun' function.
 ARG is the same as in `beginning-of-defun'."
@@ -1183,15 +1172,17 @@ treesit-beginning-of-defun
         (while (and (> arg 0)
                     (setq node (treesit-search-forward-goto
                                 node treesit-defun-type-regexp t t)))
-          (setq node (treesit--find-top-level-match
-                      node treesit-defun-type-regexp))
+          (setq node (or (treesit-node-top-level
+                          node treesit-defun-type-regexp)
+                         node))
           (setq arg (1- arg)))
       ;; Go forward.
       (while (and (< arg 0)
                   (setq node (treesit-search-forward-goto
                               node treesit-defun-type-regexp)))
-        (setq node (treesit--find-top-level-match
-                    node treesit-defun-type-regexp))
+        (setq node (or (treesit-node-top-level
+                        node treesit-defun-type-regexp)
+                       node))
         (setq arg (1+ arg))))
     (when node
       (goto-char (treesit-node-start node))
@@ -1201,10 +1192,12 @@ treesit-end-of-defun
   "Tree-sitter `end-of-defun' function."
   ;; Why not simply get the largest node at point: when point is at
   ;; (point-min), that gives us the root node.
-  (let ((node (treesit--find-top-level-match
-               (treesit-node-at (point))
-               treesit-defun-type-regexp)))
-    (goto-char (treesit-node-end node))))
+  (let* ((node (treesit-node-at (point)))
+         (top (or (treesit-node-top-level
+                   node
+                   treesit-defun-type-regexp)
+                  node)))
+    (goto-char (treesit-node-end top))))
 
 ;;; Imenu
 

commit baacad1771e3551ffdb1b88c41224fa1957e766c
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Oct 29 13:51:45 2022 -0700

    Reflect recent change in tree-sitter manual sections
    
    * doc/lispref/modes.texi (Parser-based Font Lock):
    treesit-font-lock-enable is replaced by treesit-major-mode-setup.
    * doc/lispref/modes.texi (Parser-based Indentation): Mention
    treesit-major-mode-setup,
    * doc/lispref/parsing.texi (Tree-sitter major modes): Remove
    treesit-mode and global-treesit-mode, explain setup guideline.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 6212c7cd87..614bbe1293 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3890,10 +3890,6 @@ Parser-based Font Lock
 Currently, Emacs uses the tree-sitter library (@pxref{Parsing Program
 Source}) for this purpose.
 
-@defun treesit-font-lock-enable
-This function enables parser-based font lock in the current buffer.
-@end defun
-
 Parser-based font lock and other font lock mechanisms are not mutually
 exclusive.  By default, if enabled, parser-based font lock runs first,
 then the syntactic font lock (if enabled), then the regexp-based
@@ -3930,6 +3926,11 @@ Parser-based Font Lock
 For more information about queries, patterns, and capture names, see
 @ref{Pattern Matching}.
 
+To setup tree-sitter fontification, a major mode should first set
+@code{treesit-font-lock-settings} with the output of
+@code{treesit-font-lock-rules}, then call
+@code{treesit-major-mode-setup}.
+
 @defun treesit-font-lock-rules :keyword value query...
 This function is used to set @var{treesit-font-lock-settings}.  It
 takes care of compiling queries and other post-processing, and outputs
@@ -4012,12 +4013,14 @@ Parser-based Font Lock
 @end example
 
 Major modes should set this variable before calling
-@code{treesit-font-lock-enable}.
+@code{treesit-major-mode-setup}.
 
 @findex treesit-font-lock-recompute-features
 For this variable to take effect, a Lisp program should call
 @code{treesit-font-lock-recompute-features} (which resets
-@code{treesit-font-lock-settings} accordingly).
+@code{treesit-font-lock-settings} accordingly), or
+@code{treesit-major-mode-setup} (which calls
+@code{treesit-font-lock-recompute-features}).
 @end defvar
 
 @defvar treesit-font-lock-settings
@@ -4771,7 +4774,9 @@ Parser-based Indentation
 below: then the major mode needs only to write some indentation rules
 and the engine takes care of the rest.
 
-To enable the parser-based indentation engine, set the value of
+To enable the parser-based indentation engine, either set
+@var{treesit-simple-indent-rules} and call
+@code{treesit-major-mode-setup}, or equivalently, set the value of
 @code{indent-line-function} to @code{treesit-indent}.
 
 @defvar treesit-indent-function
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 903f3aa6a5..fe51222e9b 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -1505,43 +1505,74 @@ Tree-sitter major modes
 @cindex major mode, developing with tree-sitter
 
 This section covers some general guidelines on developing tree-sitter
-integration for a major mode.  For tree-sitter integration with
-specific Emacs features, see @ref{Parser-based Font Lock}, and see
-@ref{Parser-based Indentation}.
-
-@findex treesit-mode
-@findex global-treesit-mode
-Emacs provides @code{treesit-mode} and @code{global-treesit-mode}.
-When one of these two modes is turned on, major modes should turn on
-their tree-sitter support, if they have one.  Major modes works with
-@code{treesit-mode} by setting @code{major-mode-backend-function}.
-
-@defvar major-mode-backend-function
-This is a buffer-local variable that holds a function.
-@code{treesit-mode} uses this function to turn on/off tree-sitter
-support.
-
-This function is passed two arguments: @var{backend} and @var{warn}.
-@var{backend} is a symbol representing the backend we want to
-activate.  Currently it can be @code{treesit} or @code{elisp}.
-
-If @var{warn} is non-@code{nil}, display a warning if a @code{backend}
-can't activated; if @var{warn} is @code{nil}, just print a message
-and don't display any warning.
-@end defvar
+integration for a major mode.
+
+In general, a major mode supporting tree-sitter features should
+roughly follow this pattern:
+
+@example
+@group
+(define-derived-mode woomy-mode prog-mode "Woomy"
+  "A mode for Woomy programming language."
+  ;; Shared setup.
+  ...
+  (cond
+   ;; Tree-sitter setup.
+   ((treesit-ready-p 'woomy-mode 'woomy)
+    (setq-local treesit-variables ...)
+    (treesit-major-mode-setup))
+   ;; Non-tree-sitter setup.
+   (t
+    ...)))
+@end group
+@end example
+
+First, the major mode should use @code{treesit-ready-p} to determine
+whether the user wants to activate tree-sitter features for the mode,
+and whether tree-sitter can be activated in this mode.
+
+@defun treesit-ready-p mode language &optional quiet
+This function checks for conditions for activating tree-sitter.  It
+checks whether the users turns tree-sitter on for @var{mode}
+(according to @code{treesit-settings}), whether tree-sitter is built
+with Emacs, the buffer's size, and whether @var{languag} is available.
+
+When user sets @var{mode} to @var{demand} in @code{treesit-settings},
+this function emits a warning if tree-sitter cannot be activated.  If
+@var{quiet} is @code{message}, the warning is turned into a message,
+if @var{quiet} is @code{nil}, no warning or message is displayed.
 
-@defun treesit-ready-p warn &rest languages
-This is a convenience function that checks for conditions for
-activating tree-sitter.  It checks for whether tree-sitter is built
-with Emacs, the buffer's size, and whether each @var{language} is
-available.
+If @var{mode} is nil, this function doesn't check user's preference in
+@code{treesit-settings}.
 
-If all conditions are met, it returns non-@code{nil}.  If not, it
-shows a warning or displays a message depending on the value of
-@var{warn}.  If @var{warn} is non-@code{nil}, show a warning,
-otherwise display an echo-area message.
+If all conditions are met, this function returns non-@code{nil}.
+Otherwise it return @code{nil}.
+@end defun
+
+Then, the major mode should setup tree-sitter variables, and call
+@code{treesit-major-mode-setup}.
+
+@defun treesit-major-mode-setup
+This function activates some tree-sitter features for a major mode.
+
+Currently, it sets up the following features:
+@itemize
+@item
+If @code{treesit-font-lock-settings} is non-@code{nil}, it sets up
+fontification.
+@item
+If @code{treesit-simple-indent-rules} is non-@code{nil}, it sets up
+indentation.
+@item
+If @code{treesit-defun-type-regexp} is non-@code{nil}, it sets up
+navigation functions for @code{beginning-of-defun} and
+@code{end-of-defun}.
+@end itemize
 @end defun
 
+For more information of these built-in tree-sitter features,
+@pxref{Parser-based Font Lock}, @pxref{Parser-based Indentation}, and
+@pxref{List Motion}.
 
 @node Tree-sitter C API
 @section Tree-sitter C API Correspondence
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi
index 7945232bf8..0c56ece185 100644
--- a/doc/lispref/positions.texi
+++ b/doc/lispref/positions.texi
@@ -834,6 +834,22 @@ List Motion
 of using its normal method.
 @end defvar
 
+@findex treesit-beginning-of-defun
+@findex treesit-end-of-defun
+If Emacs is compiled with tree-sitter, it can use the parsed
+information to move across syntax constructs.  A major mode can set
+@code{treesit-defun-type-regexp} and get navigation functionality for
+free, by using @code{treesit-beginning-of-defun} and
+@code{treesit-end-of-defun}.
+
+@defvar treesit-defun-type-regexp
+This is a regexp matching the node type of defun nodes.  (For
+``node'', ``node type'', @pxref{Parsing Program Source}.)
+
+For example, @code{python-mode} sets this variable to a regexp that
+matches either @code{function_definition} or @code{class_definition}.
+@end defvar
+
 @node Skipping Characters
 @subsection Skipping Characters
 @cindex skipping characters

commit 3a784d1321487be4031555d19ace635598bba21c
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Oct 29 13:05:52 2022 -0700

    Fix parent-bol preset for tree-sitter indent
    
    * lisp/treesit.el (treesit-simple-indent-presets): Return point rather
    than column.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 90e5d09693..6176fb57ef 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -783,7 +783,8 @@ treesit-simple-indent-presets
                     (lambda (_n parent &rest _)
                       (save-excursion
                         (goto-char (treesit-node-start parent))
-                        (current-indentation)))))
+                        (back-to-indentation)
+                        (point)))))
     (prev-sibling . ,(byte-compile
                       (lambda (node &rest _)
                         (treesit-node-start

commit a915d836fce238cd57233f67e8d2451a26d2fb6b
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Oct 29 11:50:15 2022 -0700

    Keep cursor position in treesit-indent
    
    * lisp/treesit.el (treesit-indent): Create a marker and jump back to
    that marker after indentation.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index dd0aca5049..90e5d09693 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -974,12 +974,18 @@ treesit-indent
   "Indent according to the result of `treesit-indent-function'."
   (treesit-update-ranges)
   (pcase-let* ((`(,anchor . ,offset) (treesit--indent-1)))
-    (when (and anchor offset)
-      (let ((col (+ (save-excursion
-                      (goto-char anchor)
-                      (current-column))
-                    offset)))
-        (indent-line-to col)))))
+    (if (and anchor offset)
+        (let ((col (+ (save-excursion
+                        (goto-char anchor)
+                        (current-column))
+                      offset))
+              (delta (- (point-max) (point))))
+          (indent-line-to col)
+          ;; Now point is at the end of indentation.  If we started
+          ;; from within the line, go back to where we started.
+          (when (> (- (point-max) delta) (point))
+            (goto-char (- (point-max) delta))))
+      'noindent)))
 
 (defvar treesit--indent-region-batch-size 400
   "How many lines of indent value do we precompute.

commit 8607f018fd8bef7443415ff2e356d035843ad828
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Oct 29 09:50:46 2022 -0700

    Remove hack in js-mode's tree-sitter indentation rules
    
    * lisp/progmodes/js.el (js--treesit-backward-up-list): Remove
    function.
    (js--treesit-indent-rules): Replace with new rule.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index d786fa7415..d6ec3199ab 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3404,21 +3404,10 @@ c-paragraph-start
 
 ;;; Tree sitter integration
 
-(defun js--treesit-backward-up-list ()
-  (lambda (_node _parent _bol &rest _)
-    (save-excursion
-      (backward-up-list 1 nil t)
-      (goto-char
-       (treesit-node-start
-        (treesit-node-at (point))))
-      (back-to-indentation)
-      (point))))
-
 (defvar js--treesit-indent-rules
   (let ((switch-case (rx "switch_" (or "case" "default"))))
     `((javascript
        ((parent-is "program") parent-bol 0)
-       (no-node (js--treesit-backward-up-list) ,js-indent-level)
        ((node-is "}") parent-bol 0)
        ((node-is ")") parent-bol 0)
        ((node-is "]") parent-bol 0)
@@ -3442,6 +3431,7 @@ js--treesit-indent-rules
        ((parent-is "parenthesized_expression") parent-bol ,js-indent-level)
        ((parent-is "class_body") parent-bol ,js-indent-level)
        ((parent-is ,switch-case) parent-bol ,js-indent-level)
+       ((parent-is "statement_block") parent-bol ,js-indent-level)
 
        ;; JSX
        ((parent-is "jsx_opening_element") parent ,js-indent-level)

commit ce5ae0117e3ea009ccdd8d8f4c1365301d24f90b
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Oct 29 09:43:50 2022 -0700

    Refine handling of node at point in treesit-indent
    
    * doc/lispref/modes.texi (Parser-based Indentation): Document the
    semantic clearly.
    * lisp/treesit.el (treesit-simple-indent-presets): Replace with
    current-indentation.
    (treesit--indent-1): Now NODE always starts at BOL, and parent is
    always the smallest node above NODE that spans BOL.
    (treesit-indent): Don't use save-excurtion, no one else does.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index f587252422..6212c7cd87 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -4806,7 +4806,12 @@ Parser-based Indentation
 position of the first non-whitespace character after the beginning of
 the line.  The argument @var{node} is the largest (highest-in-tree)
 node that starts at that position; and @var{parent} is the parent of
-@var{node}.  Emacs finds @var{bol}, @var{node} and @var{parent} and
+@var{node}.  However, when that position is on a whitespace or inside
+a multi-line string, no node that starts at that position, so
+@var{node} is @code{nil}.  In that case, @var{parent} would be the
+smallest node that spans that position.
+
+Emacs finds @var{bol}, @var{node} and @var{parent} and
 passes them to each @var{matcher} and @var{anchor}.  @var{matcher}
 should return non-@code{nil} if the rule is applicable, and
 @var{anchor} should return a buffer position.
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 22d1fe5f89..dd0aca5049 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -783,8 +783,7 @@ treesit-simple-indent-presets
                     (lambda (_n parent &rest _)
                       (save-excursion
                         (goto-char (treesit-node-start parent))
-                        (back-to-indentation)
-                        (point)))))
+                        (current-indentation)))))
     (prev-sibling . ,(byte-compile
                       (lambda (node &rest _)
                         (treesit-node-start
@@ -951,7 +950,7 @@ treesit--indent-1
          (smallest-node
           (cond ((null (treesit-parser-list)) nil)
                 ((eq 1 (length (treesit-parser-list)))
-                 (treesit-node-at bol))
+                 (treesit-node-at bol nil nil t))
                 ((treesit-language-at (point))
                  (treesit-node-at bol (treesit-language-at (point))))
                 (t (treesit-node-at bol))))
@@ -968,26 +967,19 @@ treesit--indent-1
          ;; encompass the whitespace.
          (parent (cond ((and node parser)
                         (treesit-node-parent node))
-                       (parser
-                        (treesit-node-at bol parser))
-                       (t nil))))
+                       (t (treesit-node-on bol bol)))))
       (funcall treesit-indent-function node parent bol))))
 
 (defun treesit-indent ()
   "Indent according to the result of `treesit-indent-function'."
   (treesit-update-ranges)
-  (pcase-let* ((orig-pos (point))
-               (bol (current-indentation))
-               (`(,anchor . ,offset) (treesit--indent-1)))
+  (pcase-let* ((`(,anchor . ,offset) (treesit--indent-1)))
     (when (and anchor offset)
       (let ((col (+ (save-excursion
                       (goto-char anchor)
                       (current-column))
                     offset)))
-        (if (< bol orig-pos)
-            (save-excursion
-              (indent-line-to col))
-          (indent-line-to col))))))
+        (indent-line-to col)))))
 
 (defvar treesit--indent-region-batch-size 400
   "How many lines of indent value do we precompute.

commit bde8e87cb7b3be0e0bc9e72c3634f108570cac3e
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Oct 29 09:04:35 2022 -0700

    Fix treesit-indent-region
    
    * lisp/treesit.el (treesit-simple-indent-presets): Remove extra comma.
    (treesit--indent-1): Return (ANCHOR . OFFSET) instead of column.
    (treesit-indent): Accept (ANCHOR . OFFSET) from treesit--indent-1.
    (treesit--indent-region-batch-size): Reduce to 400.
    (treesit-indent-region): Put a marker on each line's ANCHOR and
    compute the indentation with ANCHOR + OFFSET.  Precomputing column
    gives wrong indentation when the ANHOR line doesn't have correct
    indent yet.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 264935f185..22d1fe5f89 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -724,10 +724,10 @@ treesit-simple-indent-presets
                     (and (or (null node-t)
                              (string-match-p
                               node-t (or (treesit-node-type node) "")))
-                         (or (null ,parent-t)
+                         (or (null parent-t)
                              (string-match-p
                               parent-t (treesit-node-type parent)))
-                         (or (null ,grand-parent-t)
+                         (or (null grand-parent-t)
                              (string-match-p
                               grand-parent-t
                               (treesit-node-type
@@ -941,9 +941,8 @@ treesit-indent-function
 
 (defun treesit--indent-1 ()
   "Indent the current line.
-Return the column we should indent this line to, or nil if we
-can't figure it out.  This function is used by `treesit-indent'
-and `treesit-indent-region'."
+Return (ANCHOR . OFFSET).  This function is used by
+`treesit-indent' and `treesit-indent-region'."
   ;; Basically holds the common part between the two indent function.
   (let* ((bol (save-excursion
                 (forward-line 0)
@@ -960,7 +959,7 @@ treesit--indent-1
                 smallest-node
                 (lambda (node)
                   (eq bol (treesit-node-start node))))))
-    (pcase-let*
+    (let*
         ((parser (if smallest-node
                      (treesit-node-parser smallest-node)
                    nil))
@@ -971,29 +970,26 @@ treesit--indent-1
                         (treesit-node-parent node))
                        (parser
                         (treesit-node-at bol parser))
-                       (t nil)))
-         (`(,anchor . ,offset)
-          (funcall treesit-indent-function node parent bol)))
-      (if (or (null anchor) (null offset))
-          nil
-        (+ (save-excursion
-             (goto-char anchor)
-             (current-column))
-           offset)))))
+                       (t nil))))
+      (funcall treesit-indent-function node parent bol))))
 
 (defun treesit-indent ()
   "Indent according to the result of `treesit-indent-function'."
   (treesit-update-ranges)
-  (let* ((orig-pos (point))
-         (bol (current-indentation))
-         (col (treesit--indent-1)))
-    (when col
-      (if (< bol orig-pos)
-          (save-excursion
-            (indent-line-to col))
-        (indent-line-to col)))))
-
-(defvar treesit--indent-region-batch-size 1000
+  (pcase-let* ((orig-pos (point))
+               (bol (current-indentation))
+               (`(,anchor . ,offset) (treesit--indent-1)))
+    (when (and anchor offset)
+      (let ((col (+ (save-excursion
+                      (goto-char anchor)
+                      (current-column))
+                    offset)))
+        (if (< bol orig-pos)
+            (save-excursion
+              (indent-line-to col))
+          (indent-line-to col))))))
+
+(defvar treesit--indent-region-batch-size 400
   "How many lines of indent value do we precompute.
 In `treesit-indent-region' we indent in batches: precompute
 indent for each line, apply them in one go, let parser reparse,
@@ -1004,34 +1000,61 @@ treesit-indent-region
   "Indent the region between BEG and END.
 Similar to `treesit-indent', but indent a region instead."
   (treesit-update-ranges)
-  (let ((indents (make-vector treesit--indent-region-batch-size 0))
-        (lines-left-to-move 0)
-        (idx 0)
-        (jdx 0)
-        (starting-pos 0)
-        (announce-progress (> (- end beg) 80000)))
+  (let* ((meta-len 2)
+         (vector-len (* meta-len treesit--indent-region-batch-size))
+         ;; This vector saves the indent meta for each line in the
+         ;; batch.  It is a vector of [ANCHOR OFFSET BOL DELTA], where
+         ;; BOL is the position of BOL of that line, and DELTA =
+         ;; DESIRED-INDENT - CURRENT-INDENT.
+         (meta-vec (make-vector vector-len 0))
+         (lines-left-to-move 0)
+         (end (copy-marker end t))
+         (idx 0)
+         (starting-pos 0)
+         (announce-progress (> (- end beg) 80000)))
     (save-excursion
       (goto-char beg)
+      ;; First pass.  Go through each line and compute the
+      ;; indentation.
       (while (and (eq lines-left-to-move 0) (< (point) end))
-        (setq idx 0 jdx 0
+        (setq idx 0
               starting-pos (point))
         (while (and (eq lines-left-to-move 0)
                     (< idx treesit--indent-region-batch-size)
                     (< (point) end))
-          (setf (aref indents idx) (or (treesit--indent-1) 0))
+          (pcase-let* ((`(,anchor . ,offset) (treesit--indent-1))
+                       (marker (aref meta-vec (* idx meta-len))))
+            ;; Set ANCHOR.
+            (when anchor
+              (if (markerp marker)
+                  (move-marker marker anchor)
+                (setf (aref meta-vec (* idx meta-len))
+                      (copy-marker anchor t))))
+            ;; SET OFFSET.
+            (setf (aref meta-vec (+ 1 (* idx meta-len))) offset))
           (cl-incf idx)
           (setq lines-left-to-move (forward-line 1)))
         ;; Now IDX = last valid IDX + 1.
         (goto-char starting-pos)
-        (while (< jdx idx)
-          (let ((col (aref indents jdx)))
-            (when (not (eq col 0))
-              (indent-line-to col)))
-          (forward-line 1)
-          (cl-incf jdx))
+        ;; Second pass, go to each line and apply the indentation.
+        (dotimes (jdx idx)
+          (let ((anchor (aref meta-vec (* jdx meta-len)))
+                (offset (aref meta-vec (+ 1 (* jdx meta-len)))))
+            (when offset
+              (let ((col (save-excursion
+                           (goto-char anchor)
+                           (+ offset (current-column)))))
+                (indent-line-to col))))
+          (forward-line 1))
         (when announce-progress
           (message "Indenting region...%s%%"
-                   (/ (* (- (point) beg) 100) (- end beg))))))))
+                   (/ (* (- (point) beg) 100) (- end beg)))))
+      ;; Delete markers.
+      (dotimes (idx treesit--indent-region-batch-size)
+        (let ((marker (aref meta-vec (* idx meta-len))))
+          (when (markerp marker)
+            (move-marker marker nil))))
+      (move-marker end nil))))
 
 (defun treesit-simple-indent (node parent bol)
   "Calculate indentation according to `treesit-simple-indent-rules'.

commit 4552b01d8c8052f607dca2fcddcf7b2e270f1db6
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Oct 28 20:17:43 2022 -0700

    Remove test of treesit-language-at
    
    Because now it just calls a user-supplied function rather than doing
    any work by itself.
    
    * test/src/treesit-tests.el (treesit-parser-supplemental): Remove the
    test.

diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index b143bdf379..56ac51ff99 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -389,9 +389,6 @@ treesit-parser-supplemental
         (setq root-node (treesit-parser-root-node
                          parser))
         (setq doc-node (treesit-node-child root-node 0)))
-      ;; `treesit-language-at'.
-      (should (equal (treesit-language-at (point))
-                     'json))
       ;; `treesit-set-ranges', `treesit-get-ranges'.
       (treesit-set-ranges 'json
                           '((1 . 2)))

commit f46eb3d3ca759ab3944cedda1339a6d1760298cd
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Oct 28 17:56:05 2022 -0700

    Byte-compile treesit-simple-indent-presets
    
    * lisp/treesit.el (treesit-simple-indent-presets): Byte-compile these
    functions.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 9c4d453534..264935f185 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -696,114 +696,131 @@ treesit-simple-indent-rules
 See `treesit-simple-indent-presets'.")
 
 (defvar treesit-simple-indent-presets
-  '((match . (lambda
-               (&optional node-type parent-type node-field
-                          node-index-min node-index-max)
-               `(lambda (node parent bol &rest _)
-                  (and (or (null ,node-type)
-                           (string-match-p
-                            ,node-type (or (treesit-node-type node) "")))
-                       (or (null ,parent-type)
-                           (string-match-p
-                            ,parent-type (treesit-node-type parent)))
-                       (or (null ,node-field)
-                           (string-match-p
-                            ,node-field
-                            (or (treesit-node-field-name node) "")))
-                       (or (null ,node-index-min)
-                           (>= (treesit-node-index node t)
-                               ,node-index-min))
-                       (or (null ,node-index-max)
-                           (<= (treesit-node-index node t)
-                               ,node-index-max))))))
-    ;; TODO: Document if genuinely useful.
-    (n-p-gp . (lambda (node-t parent-t grand-parent-t)
-                `(lambda (node parent bol &rest _)
-                   (and (or (null ,node-t)
+  `((match . ,(byte-compile
+               (lambda
+                 (&optional node-type parent-type node-field
+                            node-index-min node-index-max)
+                 (lambda (node parent &rest _)
+                   (and (or (null node-type)
                             (string-match-p
-                             ,node-t (or (treesit-node-type node) "")))
-                        (or (null ,parent-t)
+                             node-type (or (treesit-node-type node) "")))
+                        (or (null parent-type)
                             (string-match-p
-                             ,parent-t (treesit-node-type parent)))
-                        (or (null ,grand-parent-t)
+                             parent-type (treesit-node-type parent)))
+                        (or (null node-field)
                             (string-match-p
-                             ,grand-parent-t
-                             (treesit-node-type
-                              (treesit-node-parent parent))))))))
-    (no-node . (lambda (node parent bol &rest _) (null node)))
-    (parent-is . (lambda (type)
-                   `(lambda (node parent bol &rest _)
-                      (string-match-p
-                       ,type (treesit-node-type parent)))))
-
-    (node-is . (lambda (type)
-                 `(lambda (node parent bol &rest _)
-                    (string-match-p
-                     ,type (or (treesit-node-type node) "")))))
-    (field-is . (lambda (name)
-                  `(lambda (node parent bol &rest _)
+                             node-field
+                             (or (treesit-node-field-name node) "")))
+                        (or (null node-index-min)
+                            (>= (treesit-node-index node t)
+                                node-index-min))
+                        (or (null node-index-max)
+                            (<= (treesit-node-index node t)
+                                node-index-max)))))))
+    ;; TODO: Document if genuinely useful.
+    (n-p-gp . ,(byte-compile
+                (lambda (node-t parent-t grand-parent-t)
+                  (lambda (node parent &rest _)
+                    (and (or (null node-t)
+                             (string-match-p
+                              node-t (or (treesit-node-type node) "")))
+                         (or (null ,parent-t)
+                             (string-match-p
+                              parent-t (treesit-node-type parent)))
+                         (or (null ,grand-parent-t)
+                             (string-match-p
+                              grand-parent-t
+                              (treesit-node-type
+                               (treesit-node-parent parent)))))))))
+    (no-node . ,(byte-compile
+                 (lambda (node &rest _) (null node))))
+    (parent-is . ,(byte-compile
+                   (lambda (type)
+                     (lambda (_n parent &rest _)
+                       (string-match-p
+                        type (treesit-node-type parent))))))
+
+    (node-is . ,(byte-compile
+                 (lambda (type)
+                   (lambda (node &rest _)
                      (string-match-p
-                      ,name (or (treesit-node-field-name node) "")))))
+                      type (or (treesit-node-type node) ""))))))
+    (field-is . ,(byte-compile
+                  (lambda (name)
+                    (lambda (node &rest _)
+                      (string-match-p
+                       name (or (treesit-node-field-name node) ""))))))
     ;; TODO: Document.
-    (catch-all . (lambda (&rest _) t))
-
-    (query . (lambda (pattern)
-               `(lambda (node parent bol &rest _)
-                  (cl-loop for capture
-                           in (treesit-query-capture
-                               parent ,pattern)
-                           if (treesit-node-eq node (cdr capture))
-                           return t
-                           finally return nil))))
-    (first-sibling . (lambda (node parent bol &rest _)
-                       (treesit-node-start
-                        (treesit-node-child parent 0))))
+    (catch-all . ,(byte-compile (lambda (&rest _) t)))
+
+    (query . ,(byte-compile
+               (lambda (pattern)
+                 (lambda (node parent &rest _)
+                   (cl-loop for capture
+                            in (treesit-query-capture
+                                parent pattern)
+                            if (treesit-node-eq node (cdr capture))
+                            return t
+                            finally return nil)))))
+    (first-sibling . ,(byte-compile
+                       (lambda (_n parent &rest _)
+                         (treesit-node-start
+                          (treesit-node-child parent 0)))))
     ;; TODO: Document.
-    (nth-sibling . (lambda (n &optional named)
-                     `(lambda (node parent bol &rest _)
-                        (treesit-node-start
-                         (treesit-node-child parent ,n ,named)))))
-    (parent . (lambda (node parent bol &rest _)
-                (treesit-node-start parent)))
+    (nth-sibling . ,(byte-compile
+                     (lambda (n &optional named)
+                       (lambda (_n parent &rest _)
+                         (treesit-node-start
+                          (treesit-node-child parent n named))))))
+    (parent . ,(byte-compile
+                (lambda (_n parent &rest _)
+                  (treesit-node-start parent))))
     ;; TODO: Document.
-    (grand-parent . (lambda (node parent bol &rest _)
-                      (treesit-node-start (treesit-node-parent parent))))
-    (parent-bol . (lambda (node parent bol &rest _)
-                    (save-excursion
-                      (goto-char (treesit-node-start parent))
-                      (back-to-indentation)
-                      (point))))
-    (prev-sibling . (lambda (node parent bol &rest _)
-                      (treesit-node-start
-                       (treesit-node-prev-sibling node))))
-    (no-indent . (lambda (node parent bol &rest _) bol))
-    (prev-line . (lambda (node parent bol &rest _)
-                   (save-excursion
-                     (goto-char bol)
-                     (forward-line -1)
-                     (skip-chars-forward " \t"))))
+    (grand-parent . ,(byte-compile
+                      (lambda (_n parent &rest _)
+                        (treesit-node-start (treesit-node-parent parent)))))
+    (parent-bol . ,(byte-compile
+                    (lambda (_n parent &rest _)
+                      (save-excursion
+                        (goto-char (treesit-node-start parent))
+                        (back-to-indentation)
+                        (point)))))
+    (prev-sibling . ,(byte-compile
+                      (lambda (node &rest _)
+                        (treesit-node-start
+                         (treesit-node-prev-sibling node)))))
+    (no-indent . ,(byte-compile (lambda (_n _p bol &rest _) bol)))
+    (prev-line . ,(byte-compile (lambda (_n _p bol &rest _)
+                                  (save-excursion
+                                    (goto-char bol)
+                                    (forward-line -1)
+                                    (skip-chars-forward " \t")))))
     ;; TODO: Document.
-    (and . (lambda (&rest fns)
-             `(lambda (node parent bol &rest _)
-                (cl-reduce (lambda (a b) (and a b))
+    (and . ,(byte-compile
+             (lambda (&rest fns)
+               (lambda (node parent bol &rest _)
+                 (cl-reduce (lambda (a b) (and a b))
+                            (mapcar (lambda (fn)
+                                      (funcall fn node parent bol))
+                                    fns))))))
+    (or . ,(byte-compile
+            (lambda (&rest fns)
+              (lambda (node parent bol &rest _)
+                (cl-reduce (lambda (a b) (or a b))
                            (mapcar (lambda (fn)
                                      (funcall fn node parent bol))
-                                   ',fns)))))
-    (or . (lambda (&rest fns)
-            `(lambda (node parent bol &rest _)
-               (cl-reduce (lambda (a b) (or a b))
-                          (mapcar (lambda (fn)
-                                    (funcall fn node parent bol))
-                                  ',fns)))))
-    (not . (lambda (fn)
-             `(lambda (node parent bol &rest _)
-                (debug)
-                (not (funcall ,fn node parent bol)))))
-    (list . (lambda (&rest fns)
-              `(lambda (node parent bol &rest _)
-                 (mapcar (lambda (fn)
-                           (funcall fn node parent bol))
-                         ',fns)))))
+                                   fns))))))
+    (not . ,(byte-compile
+             (lambda (fn)
+               (lambda (node parent bol &rest _)
+                 (debug)
+                 (not (funcall fn node parent bol))))))
+    (list . ,(byte-compile
+              (lambda (&rest fns)
+                (lambda (node parent bol &rest _)
+                  (mapcar (lambda (fn)
+                            (funcall fn node parent bol))
+                          fns))))))
   "A list of presets.
 These presets that can be used as MATHER and ANCHOR in
 `treesit-simple-indent-rules'.

commit 0c7a7df98e1fb0bc156707b379e4147fac97359a
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Oct 28 17:54:43 2022 -0700

    Add treesit-indent-region
    
    Now indenting a large buffer is reasonably fast.
    
    * lisp/treesit.el (treesit-indent): Move meat to treesit--indent-1.
    (treesit--indent-1)
    (treesit-indent-region): New functions.
    (treesit-major-mode-setup): Setup indent-region-function.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index f144041202..9c4d453534 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -922,11 +922,13 @@ treesit-indent-function
 column of ANCHOR and adds OFFSET to it as the final indentation
 of the current line.")
 
-(defun treesit-indent ()
-  "Indent according to the result of `treesit-indent-function'."
-  (treesit-update-ranges)
-  (let* ((orig-pos (point))
-         (bol (save-excursion
+(defun treesit--indent-1 ()
+  "Indent the current line.
+Return the column we should indent this line to, or nil if we
+can't figure it out.  This function is used by `treesit-indent'
+and `treesit-indent-region'."
+  ;; Basically holds the common part between the two indent function.
+  (let* ((bol (save-excursion
                 (forward-line 0)
                 (skip-chars-forward " \t")
                 (point)))
@@ -957,14 +959,62 @@ treesit-indent
           (funcall treesit-indent-function node parent bol)))
       (if (or (null anchor) (null offset))
           nil
-        (let ((col (+ (save-excursion
-                        (goto-char anchor)
-                        (current-column))
-                      offset)))
-          (if (< bol orig-pos)
-              (save-excursion
-                (indent-line-to col))
-            (indent-line-to col)))))))
+        (+ (save-excursion
+             (goto-char anchor)
+             (current-column))
+           offset)))))
+
+(defun treesit-indent ()
+  "Indent according to the result of `treesit-indent-function'."
+  (treesit-update-ranges)
+  (let* ((orig-pos (point))
+         (bol (current-indentation))
+         (col (treesit--indent-1)))
+    (when col
+      (if (< bol orig-pos)
+          (save-excursion
+            (indent-line-to col))
+        (indent-line-to col)))))
+
+(defvar treesit--indent-region-batch-size 1000
+  "How many lines of indent value do we precompute.
+In `treesit-indent-region' we indent in batches: precompute
+indent for each line, apply them in one go, let parser reparse,
+and do it again.  This way the parser don't need to unnecessarily
+reparse after indenting every single line.")
+
+(defun treesit-indent-region (beg end)
+  "Indent the region between BEG and END.
+Similar to `treesit-indent', but indent a region instead."
+  (treesit-update-ranges)
+  (let ((indents (make-vector treesit--indent-region-batch-size 0))
+        (lines-left-to-move 0)
+        (idx 0)
+        (jdx 0)
+        (starting-pos 0)
+        (announce-progress (> (- end beg) 80000)))
+    (save-excursion
+      (goto-char beg)
+      (while (and (eq lines-left-to-move 0) (< (point) end))
+        (setq idx 0 jdx 0
+              starting-pos (point))
+        (while (and (eq lines-left-to-move 0)
+                    (< idx treesit--indent-region-batch-size)
+                    (< (point) end))
+          (setf (aref indents idx) (or (treesit--indent-1) 0))
+          (cl-incf idx)
+          (setq lines-left-to-move (forward-line 1)))
+        ;; Now IDX = last valid IDX + 1.
+        (goto-char starting-pos)
+        (while (< jdx idx)
+          (let ((col (aref indents jdx)))
+            (when (not (eq col 0))
+              (indent-line-to col)))
+          (forward-line 1)
+          (cl-incf jdx))
+        (when announce-progress
+          (message "Indenting region...%s%%"
+                   (/ (* (- (point) beg) 100) (- end beg))))))))
 
 (defun treesit-simple-indent (node parent bol)
   "Calculate indentation according to `treesit-simple-indent-rules'.
@@ -1235,7 +1285,8 @@ treesit-major-mode-setup
     (treesit-font-lock-recompute-features))
   ;; Indent.
   (when treesit-simple-indent-rules
-    (setq-local indent-line-function #'treesit-indent))
+    (setq-local indent-line-function #'treesit-indent)
+    (setq-local indent-region-function #'treesit-indent-region))
   ;; Navigation.
   (when treesit-defun-type-regexp
     (setq-local beginning-of-defun-function #'treesit-beginning-of-defun)

commit 434fc2a22e4fd65fd63018e9373cbf56b51f8ab2
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Oct 28 16:38:37 2022 -0700

    Make Emacs compile without tree-sitter library
    
    * lisp/treesit.el: Add function declaration forms.
    * src/emacs.c: Always include syms_of_treesit.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 8db4704823..f144041202 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -33,6 +33,57 @@
 (require 'cl-seq)
 (require 'font-lock)
 
+;;; Function declarations
+
+(declare-function treesit-language-available-p "treesit.c")
+(declare-function treesit-language-version "treesit.c")
+
+(declare-function treesit-parser-p "treesit.c")
+(declare-function treesit-node-p "treesit.c")
+(declare-function treesit-compiled-query-p "treesit.c")
+(declare-function treesit-query-p "treesit.c")
+(declare-function treesit-query-language "treesit.c")
+
+(declare-function treesit-node-parser "treesit.c")
+
+(declare-function treesit-parser-create "treesit.c")
+(declare-function treesit-parser-delete "treesit.c")
+(declare-function treesit-parser-list "treesit.c")
+(declare-function treesit-parser-buffer "treesit.c")
+(declare-function treesit-parser-language "treesit.c")
+
+(declare-function treesit-parser-root-node "treesit.c")
+
+(declare-function treesit-parser-set-included-ranges "treesit.c")
+(declare-function treesit-parser-included-ranges "treesit.c")
+
+(declare-function treesit-node-type "treesit.c")
+(declare-function treesit-node-start "treesit.c")
+(declare-function treesit-node-end "treesit.c")
+(declare-function treesit-node-string "treesit.c")
+(declare-function treesit-node-parent "treesit.c")
+(declare-function treesit-node-child "treesit.c")
+(declare-function treesit-node-check "treesit.c")
+(declare-function treesit-node-field-name-for-child "treesit.c")
+(declare-function treesit-node-child-count "treesit.c")
+(declare-function treesit-node-child-by-field-name "treesit.c")
+(declare-function treesit-node-next-sibling "treesit.c")
+(declare-function treesit-node-prev-sibling "treesit.c")
+(declare-function treesit-node-first-child-for-pos "treesit.c")
+(declare-function treesit-node-descendant-for-range "treesit.c")
+(declare-function treesit-node-eq "treesit.c")
+
+(declare-function treesit-pattern-expand "treesit.c")
+(declare-function treesit-query-expand "treesit.c")
+(declare-function treesit-query-compile "treesit.c")
+(declare-function treesit-query-capture "treesit.c")
+
+(declare-function treesit-search-subtree "treesit.c")
+(declare-function treesit-search-forward "treesit.c")
+(declare-function treesit-induce-sparse-tree "treesit.c")
+
+(declare-function treesit-available-p "treesit.c")
+
 ;;; Custom options
 
 ;; Tree-sitter always appear as treesit in symbols.
@@ -48,8 +99,6 @@ treesit-max-buffer-size
   :type 'integer
   :version "29.1")
 
-(declare-function treesit-available-p "treesit.c")
-
 (defcustom treesit-settings '((t nil t))
   "Tree-sitter toggle settings for major modes.
 
@@ -459,63 +508,69 @@ treesit-font-lock-rules
 ignored.
 
 \(fn :KEYWORD VALUE QUERY...)"
-  (let (;; Tracks the current :language/:override/:toggle/:level value
-        ;; that following queries will apply to.
-        current-language current-override
-        current-feature
-        ;; The list this function returns.
-        (result nil))
-    (while args
-      (let ((token (pop args)))
-        (pcase token
-          ;; (1) Process keywords.
-          (:language
-           (let ((lang (pop args)))
-             (when (or (not (symbolp lang)) (null lang))
-               (signal 'treesit-font-lock-error
-                       `("Value of :language should be a symbol"
-                         ,lang)))
-             (setq current-language lang)))
-          (:override
-           (let ((flag (pop args)))
-             (when (not (memq flag '(t nil append prepend keep)))
+  ;; Other tree-sitter function don't tend to be called unless
+  ;; tree-sitter is enabled, which means tree-sitter must be compiled.
+  ;; But this function is usually call in `defvar' which runs
+  ;; regardless whether tree-sitter is enabled.  So we need this
+  ;; guard.
+  (when (treesit-available-p)
+    (let (;; Tracks the current :language/:override/:toggle/:level value
+          ;; that following queries will apply to.
+          current-language current-override
+          current-feature
+          ;; The list this function returns.
+          (result nil))
+      (while args
+        (let ((token (pop args)))
+          (pcase token
+            ;; (1) Process keywords.
+            (:language
+             (let ((lang (pop args)))
+               (when (or (not (symbolp lang)) (null lang))
+                 (signal 'treesit-font-lock-error
+                         `("Value of :language should be a symbol"
+                           ,lang)))
+               (setq current-language lang)))
+            (:override
+             (let ((flag (pop args)))
+               (when (not (memq flag '(t nil append prepend keep)))
+                 (signal 'treesit-font-lock-error
+                         `("Value of :override should be one of t, nil, append, prepend, keep"
+                           ,flag))
+                 (signal 'wrong-type-argument
+                         `((or t nil append prepend keep)
+                           ,flag)))
+               (setq current-override flag)))
+            (:feature
+             (let ((var (pop args)))
+               (when (or (not (symbolp var))
+                         (memq var '(t nil)))
+                 (signal 'treesit-font-lock-error
+                         `("Value of :feature should be a symbol"
+                           ,var)))
+               (setq current-feature var)))
+            ;; (2) Process query.
+            ((pred treesit-query-p)
+             (when (null current-language)
                (signal 'treesit-font-lock-error
-                       `("Value of :override should be one of t, nil, append, prepend, keep"
-                         ,flag))
-               (signal 'wrong-type-argument
-                       `((or t nil append prepend keep)
-                         ,flag)))
-             (setq current-override flag)))
-          (:feature
-           (let ((var (pop args)))
-             (when (or (not (symbolp var))
-                       (memq var '(t nil)))
+                       `("Language unspecified, use :language keyword to specify a language for this query" ,token)))
+             (when (null current-feature)
                (signal 'treesit-font-lock-error
-                       `("Value of :feature should be a symbol"
-                         ,var)))
-             (setq current-feature var)))
-          ;; (2) Process query.
-          ((pred treesit-query-p)
-           (when (null current-language)
-             (signal 'treesit-font-lock-error
-                     `("Language unspecified, use :language keyword to specify a language for this query" ,token)))
-           (when (null current-feature)
-             (signal 'treesit-font-lock-error
-                     `("Feature unspecified, use :feature keyword to specify the feature name for this query" ,token)))
-           (if (treesit-compiled-query-p token)
-               (push `(,current-language token) result)
-             (push `(,(treesit-query-compile current-language token)
-                     t
-                     ,current-feature
-                     ,current-override)
-                   result))
-           ;; Clears any configurations set for this query.
-           (setq current-language nil
-                 current-override nil
-                 current-feature nil))
-          (_ (signal 'treesit-font-lock-error
-                     `("Unexpected value" ,token))))))
-    (nreverse result)))
+                       `("Feature unspecified, use :feature keyword to specify the feature name for this query" ,token)))
+             (if (treesit-compiled-query-p token)
+                 (push `(,current-language token) result)
+               (push `(,(treesit-query-compile current-language token)
+                       t
+                       ,current-feature
+                       ,current-override)
+                     result))
+             ;; Clears any configurations set for this query.
+             (setq current-language nil
+                   current-override nil
+                   current-feature nil))
+            (_ (signal 'treesit-font-lock-error
+                       `("Unexpected value" ,token))))))
+      (nreverse result))))
 
 (defun treesit-font-lock-recompute-features ()
   "Enable/disable font-lock settings according to decoration level.
diff --git a/src/emacs.c b/src/emacs.c
index ba8b9c651a..ed21cce1e2 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -136,9 +136,9 @@ #define MAIN_PROGRAM
 #include <sys/resource.h>
 #endif
 
-#ifdef HAVE_TREE_SITTER
+/* We don't guard this with HAVE_TREE_SITTER because treesit.o is
+   always compiled (to provide treesit-available-p).  */
 #include "treesit.h"
-#endif
 
 #include "pdumper.h"
 #include "fingerprint.h"
@@ -2269,10 +2269,9 @@ main (int argc, char **argv)
 #ifdef HAVE_MODULES
       syms_of_module ();
 #endif
-
-#ifdef HAVE_TREE_SITTER
+      /* We don't guard this with HAVE_TREE_SITTER because treesit.o
+	 is always compiled (to provide treesit-available-p).  */
       syms_of_treesit ();
-#endif
 #ifdef HAVE_SOUND
       syms_of_sound ();
 #endif

commit 0480e9c445d59fd5ec9b38ebe3919fee2aabf8d2
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Oct 28 13:36:42 2022 -0700

    ; Make ts-mode indent rules more compact (whitespace change)
    
    * lisp/progmodes/ts-mode.el (ts-mode--indent-rules): fold two-line
    rules into one line.

diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el
index 1f0a7fd5c4..20118bc3db 100644
--- a/lisp/progmodes/ts-mode.el
+++ b/lisp/progmodes/ts-mode.el
@@ -60,48 +60,29 @@ ts-mode--indent-rules
      ((node-is ")") parent-bol 0)
      ((node-is "]") parent-bol 0)
      ((node-is ">") parent-bol 0)
-     ((parent-is "ternary_expression")
-      parent-bol ,ts-mode-indent-offset)
-     ((parent-is "member_expression")
-      parent-bol ,ts-mode-indent-offset)
-     ((parent-is "named_imports")
-      parent-bol ,ts-mode-indent-offset)
-     ((parent-is "statement_block")
-      parent-bol ,ts-mode-indent-offset)
-     ((parent-is "type_arguments")
-      parent-bol ,ts-mode-indent-offset)
-     ((parent-is "variable_declarator")
-      parent-bol ,ts-mode-indent-offset)
-     ((parent-is "arguments")
-      parent-bol ,ts-mode-indent-offset)
-     ((parent-is "array")
-      parent-bol ,ts-mode-indent-offset)
-     ((parent-is "formal_parameters")
-      parent-bol ,ts-mode-indent-offset)
-     ((parent-is "template_substitution")
-      parent-bol ,ts-mode-indent-offset)
-     ((parent-is "object_pattern")
-      parent-bol ,ts-mode-indent-offset)
-     ((parent-is "object")
-      parent-bol ,ts-mode-indent-offset)
-     ((parent-is "object_type")
-      parent-bol ,ts-mode-indent-offset)
-     ((parent-is "enum_body")
-      parent-bol ,ts-mode-indent-offset)
-     ((parent-is "arrow_function")
-      parent-bol ,ts-mode-indent-offset)
-     ((parent-is "parenthesized_expression")
-      parent-bol ,ts-mode-indent-offset)
+     ((parent-is "ternary_expression") parent-bol ,ts-mode-indent-offset)
+     ((parent-is "member_expression") parent-bol ,ts-mode-indent-offset)
+     ((parent-is "named_imports") parent-bol ,ts-mode-indent-offset)
+     ((parent-is "statement_block") parent-bol ,ts-mode-indent-offset)
+     ((parent-is "type_arguments") parent-bol ,ts-mode-indent-offset)
+     ((parent-is "variable_declarator") parent-bol ,ts-mode-indent-offset)
+     ((parent-is "arguments") parent-bol ,ts-mode-indent-offset)
+     ((parent-is "array") parent-bol ,ts-mode-indent-offset)
+     ((parent-is "formal_parameters") parent-bol ,ts-mode-indent-offset)
+     ((parent-is "template_substitution") parent-bol ,ts-mode-indent-offset)
+     ((parent-is "object_pattern") parent-bol ,ts-mode-indent-offset)
+     ((parent-is "object") parent-bol ,ts-mode-indent-offset)
+     ((parent-is "object_type") parent-bol ,ts-mode-indent-offset)
+     ((parent-is "enum_body") parent-bol ,ts-mode-indent-offset)
+     ((parent-is "arrow_function") parent-bol ,ts-mode-indent-offset)
+     ((parent-is "parenthesized_expression") parent-bol ,ts-mode-indent-offset)
 
      ;; TSX
-     ((parent-is "jsx_opening_element")
-      parent ,ts-mode-indent-offset)
+     ((parent-is "jsx_opening_element") parent ,ts-mode-indent-offset)
      ((node-is "jsx_closing_element") parent 0)
-     ((parent-is "jsx_element")
-      parent ,ts-mode-indent-offset)
+     ((parent-is "jsx_element") parent ,ts-mode-indent-offset)
      ((node-is "/") parent 0)
-     ((parent-is "jsx_self_closing_element")
-      parent ,ts-mode-indent-offset)
+     ((parent-is "jsx_self_closing_element") parent ,ts-mode-indent-offset)
      (no-node parent-bol 0)))
   "Tree-sitter indent rules.")
 

commit 285f8c7cfecee0c91568cd850139c48ec3f21a28
Author: Theodor Thornhill <theo@thornhill.no>
Date:   Fri Oct 28 21:23:19 2022 +0200

    Add in new font lock features in js/ts-mode
    
    We want to support font lock features on the syntactic level, not only
    the decoration-level level.
    
    New supported features are:
      - comment
      - constant
      - keyword
      - string
      - declaration
      - identifier
      - expression
      - property
      - pattern
      - jsx
    
    * lisp/progmodes/js.el (js--treesit-font-lock-settings, js-mode): Add
    in the new features.
    
    * lisp/progmodes/ts-mode.el (ts-mode--indent-rules): Remove faulty '.'
    anchor.
    
    (ts-mode--font-lock-settings, ts-mode): Add in the new features.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index dae6de1052..d786fa7415 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3463,28 +3463,32 @@ js--treesit-font-lock-settings
   (treesit-font-lock-rules
    :language 'javascript
    :override t
-   :feature 'minimal
-   `(
-     ((identifier) @font-lock-constant-face
+   :feature 'comment
+   `((comment) @font-lock-comment-face)
+   :language 'javascript
+   :override t
+   :feature 'constant
+   `(((identifier) @font-lock-constant-face
       (:match "^[A-Z_][A-Z_\\d]*$" @font-lock-constant-face))
 
-     [(this) (super)] @font-lock-keyword-face
-
      [(true) (false) (null)] @font-lock-constant-face
-     (regex pattern: (regex_pattern)) @font-lock-string-face
-     (number) @font-lock-constant-face
-
+     (number) @font-lock-constant-face)
+   :language 'javascript
+   :override t
+   :feature 'keyword
+   `([,@js--treesit-keywords] @font-lock-keyword-face
+     [(this) (super)] @font-lock-keyword-face)
+   :language 'javascript
+   :override t
+   :feature 'string
+   `((regex pattern: (regex_pattern)) @font-lock-string-face
      (string) @font-lock-string-face
-     (comment) @font-lock-comment-face
-     [,@js--treesit-keywords] @font-lock-keyword-face
-
      (template_string) @js--fontify-template-string
-     (template_substitution ["${" "}"] @font-lock-constant-face))
+     (template_substitution ["${" "}"] @font-lock-builtin-face))
    :language 'javascript
    :override t
-   :feature 'moderate
-   `(
-     (function
+   :feature 'declaration
+   `((function
       name: (identifier) @font-lock-function-name-face)
 
      (class_declaration
@@ -3499,18 +3503,6 @@ js--treesit-font-lock-settings
      (variable_declarator
       name: (identifier) @font-lock-variable-name-face)
 
-     (new_expression
-      constructor: (identifier) @font-lock-type-face)
-
-     (for_in_statement
-      left: (identifier) @font-lock-variable-name-face)
-
-     (arrow_function
-      parameter: (identifier) @font-lock-variable-name-face))
-   :language 'javascript
-   :override t
-   :feature 'full
-   `(
      (variable_declarator
       name: (identifier) @font-lock-function-name-face
       value: [(function) (arrow_function)])
@@ -3520,9 +3512,22 @@ js--treesit-font-lock-settings
              (identifier)
              (identifier)
              @font-lock-function-name-face)
-      value: (array (number) (function)))
+      value: (array (number) (function))))
+   :language 'javascript
+   :override t
+   :feature 'identifier
+   `((new_expression
+      constructor: (identifier) @font-lock-type-face)
 
-     (assignment_expression
+     (for_in_statement
+      left: (identifier) @font-lock-variable-name-face)
+
+     (arrow_function
+      parameter: (identifier) @font-lock-variable-name-face))
+   :language 'javascript
+   :override t
+   :feature 'expression
+   `((assignment_expression
       left: [(identifier) @font-lock-function-name-face
              (member_expression property: (property_identifier)
                                 @font-lock-function-name-face)]
@@ -3537,9 +3542,11 @@ js--treesit-font-lock-settings
      (assignment_expression
       left: [(identifier) @font-lock-variable-name-face
              (member_expression
-              property: (property_identifier) @font-lock-variable-name-face)])
-
-     (pair key: (property_identifier) @font-lock-variable-name-face)
+              property: (property_identifier) @font-lock-variable-name-face)]))
+   :language 'javascript
+   :override t
+   :feature 'property
+   `((pair key: (property_identifier) @font-lock-variable-name-face)
 
      (pair value: (identifier) @font-lock-variable-name-face)
 
@@ -3549,12 +3556,16 @@ js--treesit-font-lock-settings
 
      ((shorthand_property_identifier) @font-lock-variable-name-face)
 
-     (pair_pattern key: (property_identifier) @font-lock-variable-name-face)
-
-     ((shorthand_property_identifier_pattern) @font-lock-variable-name-face)
-
-     (array_pattern (identifier) @font-lock-variable-name-face)
-
+     ((shorthand_property_identifier_pattern) @font-lock-variable-name-face))
+   :language 'javascript
+   :override t
+   :feature 'pattern
+   `((pair_pattern key: (property_identifier) @font-lock-variable-name-face)
+     (array_pattern (identifier) @font-lock-variable-name-face))
+   :language 'javascript
+   :override t
+   :feature 'jsx
+   `(
      (jsx_opening_element
       [(nested_identifier (identifier)) (identifier)]
       @font-lock-function-name-face)
@@ -3780,7 +3791,10 @@ js-mode
                         "lexical_declaration")))
     ;; Fontification.
     (setq-local treesit-font-lock-settings js--treesit-font-lock-settings)
-    (setq-local treesit-font-lock-feature-list '((minimal) (moderate) (full)))
+    (setq-local treesit-font-lock-feature-list
+                '((comment declaration)
+                  (string keyword identifier expression constant)
+                  (property pattern jsx )))
     ;; Imenu
     (setq-local imenu-create-index-function
                 #'js--treesit-imenu)
@@ -3802,8 +3816,7 @@ js-mode
     (add-hook 'syntax-propertize-extend-region-functions
               #'syntax-propertize-multiline 'append 'local)
     (add-hook 'syntax-propertize-extend-region-functions
-              #'js--syntax-propertize-extend-region 'append 'local)
-    )))
+              #'js--syntax-propertize-extend-region 'append 'local))))
 
 (defvar js-json--treesit-font-lock-settings
   (treesit-font-lock-rules
diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el
index 15b8cbf711..1f0a7fd5c4 100644
--- a/lisp/progmodes/ts-mode.el
+++ b/lisp/progmodes/ts-mode.el
@@ -60,8 +60,6 @@ ts-mode--indent-rules
      ((node-is ")") parent-bol 0)
      ((node-is "]") parent-bol 0)
      ((node-is ">") parent-bol 0)
-     ((node-is ".")
-      parent-bol ,ts-mode-indent-offset)
      ((parent-is "ternary_expression")
       parent-bol ,ts-mode-indent-offset)
      ((parent-is "member_expression")
@@ -123,39 +121,32 @@ ts-mode--font-lock-settings
   (treesit-font-lock-rules
    :language 'tsx
    :override t
-   :feature 'minimal
-   `(
-     ((identifier) @font-lock-constant-face
+   :feature 'comment
+   `((comment) @font-lock-comment-face)
+   :language 'tsx
+   :override t
+   :feature 'constant
+   `(((identifier) @font-lock-constant-face
       (:match "^[A-Z_][A-Z_\\d]*$" @font-lock-constant-face))
 
-     [,@ts-mode--keywords] @font-lock-keyword-face
-     [(this) (super)] @font-lock-keyword-face
-
      [(true) (false) (null)] @font-lock-constant-face
-     (regex pattern: (regex_pattern)) @font-lock-string-face
-     (number) @font-lock-constant-face
-
+     (number) @font-lock-constant-face)
+   :language 'tsx
+   :override t
+   :feature 'keyword
+   `([,@ts-mode--keywords] @font-lock-keyword-face
+     [(this) (super)] @font-lock-keyword-face)
+   :language 'tsx
+   :override t
+   :feature 'string
+   `((regex pattern: (regex_pattern)) @font-lock-string-face
      (string) @font-lock-string-face
-
      (template_string) @js--fontify-template-string
-     (template_substitution ["${" "}"] @font-lock-builtin-face)
-
-     (comment) @font-lock-comment-face)
+     (template_substitution ["${" "}"] @font-lock-builtin-face))
    :language 'tsx
    :override t
-   :feature 'moderate
-   '(
-     (nested_type_identifier
-      module: (identifier) @font-lock-type-face)
-
-     (type_identifier) @font-lock-type-face
-
-     (predefined_type) @font-lock-type-face
-
-     (new_expression
-      constructor: (identifier) @font-lock-type-face)
-
-     (function
+   :feature 'declaration
+   `((function
       name: (identifier) @font-lock-function-name-face)
 
      (function_declaration
@@ -169,6 +160,31 @@ ts-mode--font-lock-settings
 
      (enum_declaration (identifier) @font-lock-type-face)
 
+     (arrow_function
+      parameter: (identifier) @font-lock-variable-name-face)
+
+     (variable_declarator
+      name: (identifier) @font-lock-function-name-face
+      value: [(function) (arrow_function)])
+
+     (variable_declarator
+      name: (array_pattern
+             (identifier)
+             (identifier) @font-lock-function-name-face)
+      value: (array (number) (function))))
+   :language 'tsx
+   :override t
+   :feature 'identifier
+   `((nested_type_identifier
+      module: (identifier) @font-lock-type-face)
+
+     (type_identifier) @font-lock-type-face
+
+     (predefined_type) @font-lock-type-face
+
+     (new_expression
+      constructor: (identifier) @font-lock-type-face)
+
      (enum_body (property_identifier) @font-lock-type-face)
 
      (enum_assignment name: (property_identifier) @font-lock-type-face)
@@ -182,22 +198,14 @@ ts-mode--font-lock-settings
       left: (identifier) @font-lock-variable-name-face)
 
      (arrow_function
-      parameter: (identifier) @font-lock-variable-name-face))
+      parameters:
+      [(_ (identifier) @font-lock-variable-name-face)
+       (_ (_ (identifier) @font-lock-variable-name-face))
+       (_ (_ (_ (identifier) @font-lock-variable-name-face)))]))
    :language 'tsx
    :override t
-   :feature 'full
-   '(
-     (variable_declarator
-      name: (identifier) @font-lock-function-name-face
-      value: [(function) (arrow_function)])
-
-     (variable_declarator
-      name: (array_pattern
-             (identifier)
-             (identifier) @font-lock-function-name-face)
-      value: (array (number) (function)))
-
-     (assignment_expression
+   :feature 'expression
+   '((assignment_expression
       left: [(identifier) @font-lock-function-name-face
              (member_expression
               property: (property_identifier) @font-lock-function-name-face)]
@@ -207,15 +215,11 @@ ts-mode--font-lock-settings
       function:
       [(identifier) @font-lock-function-name-face
        (member_expression
-        property: (property_identifier) @font-lock-function-name-face)])
-
-     (arrow_function
-      parameters:
-      [(_ (identifier) @font-lock-variable-name-face)
-       (_ (_ (identifier) @font-lock-variable-name-face))
-       (_ (_ (_ (identifier) @font-lock-variable-name-face)))])
-
-     (pair key: (property_identifier) @font-lock-variable-name-face)
+        property: (property_identifier) @font-lock-function-name-face)]))
+   :language 'tsx
+   :override t
+   :feature 'property
+   `((pair key: (property_identifier) @font-lock-variable-name-face)
 
      (pair value: (identifier) @font-lock-variable-name-face)
 
@@ -228,15 +232,19 @@ ts-mode--font-lock-settings
 
      ((shorthand_property_identifier) @font-lock-variable-name-face)
 
-     (pair_pattern
-      key: (property_identifier) @font-lock-variable-name-face)
-
      ((shorthand_property_identifier_pattern)
-      @font-lock-variable-name-face)
-
-     (array_pattern (identifier) @font-lock-variable-name-face)
+      @font-lock-variable-name-face))
+   :language 'tsx
+   :override t
+   :feature 'pattern
+   `((pair_pattern
+      key: (property_identifier) @font-lock-variable-name-face)
 
-     (jsx_opening_element
+     (array_pattern (identifier) @font-lock-variable-name-face))
+   :language 'tsx
+   :override t
+   :feature 'jsx
+   `((jsx_opening_element
       [(nested_identifier (identifier)) (identifier)]
       @font-lock-function-name-face)
 
@@ -283,7 +291,10 @@ ts-mode
                         "lexical_declaration")))
     ;; Font-lock.
     (setq-local treesit-font-lock-settings ts-mode--font-lock-settings)
-    (setq-local treesit-font-lock-feature-list '((minimal) (moderate) (full)))
+    (setq-local treesit-font-lock-feature-list
+                '((comment declaration)
+                  (string keyword identifier expression constant)
+                  (property pattern jsx)))
     ;; Imenu.
     (setq-local imenu-create-index-function #'js--treesit-imenu)
     ;; Which-func (use imenu).

commit 25cb49ad565c764c390a411661088970db1f2b22
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Oct 28 11:06:56 2022 -0700

    * configure.ac (emacs_config_features): Change to TREE_SITTER
    
    Last commit on this line has a wrong changelog, the subject should be
    emacs_config_features, not WINDOW_SYSTEM_OBJ.

diff --git a/configure.ac b/configure.ac
index 4b9625c22b..390838acfe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6593,7 +6593,7 @@ AC_DEFUN
 for opt in ACL BE_APP CAIRO DBUS FREETYPE GCONF GIF GLIB GMP GNUTLS GPM GSETTINGS \
  HARFBUZZ IMAGEMAGICK JPEG JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 \
  M17N_FLT MODULES NATIVE_COMP NOTIFY NS OLDXMENU PDUMPER PGTK PNG RSVG SECCOMP \
- SOUND SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS TREE-SITTER \
+ SOUND SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS TREE_SITTER \
  UNEXEC WEBP X11 XAW3D XDBE XFT XIM XINPUT2 XPM XWIDGETS X_TOOLKIT \
  ZLIB; do
 

commit 4ba76224eaf5fade94438bf990bf5eb05912b530
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Fri Oct 28 06:38:00 2022 +0200

    Minor doc fixes in treesit.el
    
    * lisp/treesit.el (treesit-font-lock-rules)
    (treesit-font-lock-settings): Minor doc fixes.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 3f9b9de1eb..8db4704823 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -395,7 +395,7 @@ treesit-font-lock-settings
 The exact format of this variable is considered internal.  One
 should always use `treesit-font-lock-rules' to set this variable.
 
-Each SETTING is of form
+Each SETTING has the form:
 
     (QUERY ENABLE FEATURE OVERRIDE)
 
@@ -435,18 +435,18 @@ treesit-font-lock-rules
      \"(script_element) @font-lock-builtin-face\")
 
 For each QUERY, a :language keyword and a :feature keyword is
-required. Each query's :feature is a symbol summarizing what does
+required.  Each query's :feature is a symbol summarizing what does
 the query fontify.  It is used to allow users to enable/disable
 certain features.  See `treesit-font-lock-kind-list' for more.
 Other keywords include:
 
-  KEYWORD    VALUE    DESCRIPTION
-  :override  nil      If the region already has a face,
-                      discard the new face
-             t        Always apply the new face
-             append   Append the new face to existing ones
-             prepend  Prepend the new face to existing ones
-             keep     Fill-in regions without an existing face
+  KEYWORD    VALUE      DESCRIPTION
+  :override  nil        If the region already has a face,
+                        discard the new face.
+             t          Always apply the new face.
+             `append'   Append the new face to existing ones.
+             `prepend'  Prepend the new face to existing ones.
+             `keep'     Fill-in regions without an existing face.
 
 Capture names in QUERY should be face names like
 `font-lock-keyword-face'.  The captured node will be fontified
@@ -555,7 +555,7 @@ treesit-font-lock-fontify-region
         (ignore activate)
         (let ((captures (treesit-query-capture
                          node query
-                         ;; Specifying the range is important. More
+                         ;; Specifying the range is important.  More
                          ;; often than not, NODE will be the root
                          ;; node, and if we don't specify the range,
                          ;; we are basically querying the whole file.

commit 629f222ba2abf5a149c381e27c89e88963f7466d
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Oct 27 21:21:45 2022 -0700

    Reflect tree-sitter indent rule presets change in manual
    
    * doc/lispref/modes.texi (Parser-based Indentation): String
    equivalence checks are changed to regexp matching.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index d73c443b4c..f587252422 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -4830,13 +4830,13 @@ Parser-based Indentation
 This matcher is a function of one argument, @var{type}; it returns a
 function that is called with 3 arguments: @var{node}, @var{parent},
 and @var{bol}, and returns non-@code{nil} (i.e., a match) if
-@var{parent}'s type is @var{type}.
+@var{parent}'s type matches regexp @var{type}.
 
 @item node-is
 This matcher is a function of one argument, @var{type}; it returns a
 function that is called with 3 arguments: @var{node}, @var{parent},
-and @var{bol}, and returns non-@code{nil} if @var{node}'s type is
-@var{type}.
+and @var{bol}, and returns non-@code{nil} if @var{node}'s type matches
+regexp @var{type}.
 
 @item query
 This matcher is a function of one argument, @var{query}; it returns a
@@ -4849,13 +4849,13 @@ Parser-based Indentation
 @var{parent-type}, @var{node-field}, @var{node-index-min}, and
 @var{node-index-max}).  It returns a function that is called with 3
 arguments: @var{node}, @var{parent}, and @var{bol}, and returns
-non-@code{nil} if @var{node}'s type is @var{node-type}, @var{parent}'s
-type is @var{parent-type}, @var{node}'s field name in @var{parent} is
-@var{node-field}, and @var{node}'s index among its siblings is between
-@var{node-index-min} and @var{node-index-max}.  If the value of an
-argument is @code{nil}, this matcher doesn't check that argument.
-For example, to match the first child where parent is
-@code{argument_list}, use
+non-@code{nil} if @var{node}'s type matches regexp @var{node-type},
+@var{parent}'s type matches regexp @var{parent-type}, @var{node}'s
+field name in @var{parent} matches regexp @var{node-field}, and
+@var{node}'s index among its siblings is between @var{node-index-min}
+and @var{node-index-max}.  If the value of an argument is @code{nil},
+this matcher doesn't check that argument.  For example, to match the
+first child where parent is @code{argument_list}, use
 
 @example
 (match nil "argument_list" nil nil 0 0)

commit 75c8cc5eab51d1080424687167fec4feb34f68c1
Author: Theodor Thornhill <theo@thornhill.no>
Date:   Thu Oct 27 21:05:02 2022 -0700

    Improve tree-sitter indent rules in ts-mode and js-mode
    
    * lisp/progmodes/js.el (js--treesit-indent-rules)
    * lisp/progmodes/ts-mode.el (ts-mode--indent-rules): Add more rules.
    (ts-mode): Create parser.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 583de0c503..dae6de1052 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3417,12 +3417,14 @@ js--treesit-backward-up-list
 (defvar js--treesit-indent-rules
   (let ((switch-case (rx "switch_" (or "case" "default"))))
     `((javascript
+       ((parent-is "program") parent-bol 0)
        (no-node (js--treesit-backward-up-list) ,js-indent-level)
        ((node-is "}") parent-bol 0)
        ((node-is ")") parent-bol 0)
        ((node-is "]") parent-bol 0)
        ((node-is ">") parent-bol 0)
-       ((node-is "\\.") parent-bol ,js-indent-level)
+       ((parent-is "ternary_expression") parent-bol ,js-indent-level)
+       ((parent-is "member_expression") parent-bol ,js-indent-level)
        ((node-is ,switch-case) parent-bol 0)
        ;; "{" on the newline.
        ((node-is "statement_block") parent-bol ,js-indent-level)
diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el
index 28800e378a..15b8cbf711 100644
--- a/lisp/progmodes/ts-mode.el
+++ b/lisp/progmodes/ts-mode.el
@@ -55,6 +55,7 @@ ts-mode--syntax-table
 
 (defvar ts-mode--indent-rules
   `((tsx
+     ((parent-is "program") parent-bol 0)
      ((node-is "}") parent-bol 0)
      ((node-is ")") parent-bol 0)
      ((node-is "]") parent-bol 0)
@@ -63,6 +64,8 @@ ts-mode--indent-rules
       parent-bol ,ts-mode-indent-offset)
      ((parent-is "ternary_expression")
       parent-bol ,ts-mode-indent-offset)
+     ((parent-is "member_expression")
+      parent-bol ,ts-mode-indent-offset)
      ((parent-is "named_imports")
       parent-bol ,ts-mode-indent-offset)
      ((parent-is "statement_block")
@@ -261,8 +264,11 @@ ts-mode
   :syntax-table ts-mode--syntax-table
 
   (cond
+   ;; `ts-mode' requires tree-sitter to work, so we don't check if
+   ;; user enables tree-sitter for it.
    ((treesit-ready-p nil 'tsx)
     ;; Tree-sitter.
+    (treesit-parser-create 'tsx)
     ;; Comments.
     (setq-local comment-start "// ")
     (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")

commit 9c4dddad456e23892a80303da26774a13250b647
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Oct 27 17:07:12 2022 -0700

    Add some js-mode tree-sitter indent rules
    
    * lisp/progmodes/js.el (js--treesit-indent-rules): Add rules and a let
    form.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index f258b093f4..583de0c503 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3415,32 +3415,39 @@ js--treesit-backward-up-list
       (point))))
 
 (defvar js--treesit-indent-rules
-  `((javascript
-     (no-node (js--treesit-backward-up-list) ,js-indent-level)
-     ((node-is "}") parent-bol 0)
-     ((node-is ")") parent-bol 0)
-     ((node-is "]") parent-bol 0)
-     ((node-is ">") parent-bol 0)
-     ((node-is "\\.") parent-bol ,js-indent-level)
-     ((parent-is "named_imports") parent-bol ,js-indent-level)
-     ((parent-is "statement_block") parent-bol ,js-indent-level)
-     ((parent-is "variable_declarator") parent-bol ,js-indent-level)
-     ((parent-is "arguments") parent-bol ,js-indent-level)
-     ((parent-is "array") parent-bol ,js-indent-level)
-     ((parent-is "formal_parameters") parent-bol ,js-indent-level)
-     ((parent-is "template_substitution") parent-bol ,js-indent-level)
-     ((parent-is "object_pattern") parent-bol ,js-indent-level)
-     ((parent-is "object") parent-bol ,js-indent-level)
-     ((parent-is "arrow_function") parent-bol ,js-indent-level)
-     ((parent-is "parenthesized_expression") parent-bol ,js-indent-level)
-
-     ;; JSX
-     ((parent-is "jsx_opening_element") parent ,js-indent-level)
-     ((node-is "jsx_closing_element") parent 0)
-     ((node-is "jsx_text") parent ,js-indent-level)
-     ((parent-is "jsx_element") parent ,js-indent-level)
-     ((node-is "/") parent 0)
-     ((parent-is "jsx_self_closing_element") parent ,js-indent-level))))
+  (let ((switch-case (rx "switch_" (or "case" "default"))))
+    `((javascript
+       (no-node (js--treesit-backward-up-list) ,js-indent-level)
+       ((node-is "}") parent-bol 0)
+       ((node-is ")") parent-bol 0)
+       ((node-is "]") parent-bol 0)
+       ((node-is ">") parent-bol 0)
+       ((node-is "\\.") parent-bol ,js-indent-level)
+       ((node-is ,switch-case) parent-bol 0)
+       ;; "{" on the newline.
+       ((node-is "statement_block") parent-bol ,js-indent-level)
+       ((parent-is "named_imports") parent-bol ,js-indent-level)
+       ((parent-is "statement_block") parent-bol ,js-indent-level)
+       ((parent-is "variable_declarator") parent-bol ,js-indent-level)
+       ((parent-is "arguments") parent-bol ,js-indent-level)
+       ((parent-is "array") parent-bol ,js-indent-level)
+       ((parent-is "formal_parameters") parent-bol ,js-indent-level)
+       ((parent-is "template_substitution") parent-bol ,js-indent-level)
+       ((parent-is "object_pattern") parent-bol ,js-indent-level)
+       ((parent-is "object") parent-bol ,js-indent-level)
+       ((parent-is "pair") parent-bol ,js-indent-level)
+       ((parent-is "arrow_function") parent-bol ,js-indent-level)
+       ((parent-is "parenthesized_expression") parent-bol ,js-indent-level)
+       ((parent-is "class_body") parent-bol ,js-indent-level)
+       ((parent-is ,switch-case) parent-bol ,js-indent-level)
+
+       ;; JSX
+       ((parent-is "jsx_opening_element") parent ,js-indent-level)
+       ((node-is "jsx_closing_element") parent 0)
+       ((node-is "jsx_text") parent ,js-indent-level)
+       ((parent-is "jsx_element") parent ,js-indent-level)
+       ((node-is "/") parent 0)
+       ((parent-is "jsx_self_closing_element") parent ,js-indent-level)))))
 
 (defvar js--treesit-keywords
   '("as" "async" "await" "break" "case" "catch" "class" "const" "continue"

commit 007d8c485906be46d40e74ddb8046e065c722786
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Oct 27 16:50:20 2022 -0700

    ; * lisp/treesit.el (treesit-simple-indent-presets): Add TODO.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 84583d2c62..3f9b9de1eb 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -661,6 +661,7 @@ treesit-simple-indent-presets
                        (or (null ,node-index-max)
                            (<= (treesit-node-index node t)
                                ,node-index-max))))))
+    ;; TODO: Document if genuinely useful.
     (n-p-gp . (lambda (node-t parent-t grand-parent-t)
                 `(lambda (node parent bol &rest _)
                    (and (or (null ,node-t)
@@ -688,6 +689,7 @@ treesit-simple-indent-presets
                   `(lambda (node parent bol &rest _)
                      (string-match-p
                       ,name (or (treesit-node-field-name node) "")))))
+    ;; TODO: Document.
     (catch-all . (lambda (&rest _) t))
 
     (query . (lambda (pattern)
@@ -701,12 +703,14 @@ treesit-simple-indent-presets
     (first-sibling . (lambda (node parent bol &rest _)
                        (treesit-node-start
                         (treesit-node-child parent 0))))
+    ;; TODO: Document.
     (nth-sibling . (lambda (n &optional named)
                      `(lambda (node parent bol &rest _)
                         (treesit-node-start
                          (treesit-node-child parent ,n ,named)))))
     (parent . (lambda (node parent bol &rest _)
                 (treesit-node-start parent)))
+    ;; TODO: Document.
     (grand-parent . (lambda (node parent bol &rest _)
                       (treesit-node-start (treesit-node-parent parent))))
     (parent-bol . (lambda (node parent bol &rest _)
@@ -723,6 +727,7 @@ treesit-simple-indent-presets
                      (goto-char bol)
                      (forward-line -1)
                      (skip-chars-forward " \t"))))
+    ;; TODO: Document.
     (and . (lambda (&rest fns)
              `(lambda (node parent bol &rest _)
                 (cl-reduce (lambda (a b) (and a b))
@@ -760,6 +765,8 @@ treesit-simple-indent-presets
 
         (match nil \"argument_list\" nil nil 0 0).
 
+    NODE-TYPE, PARENT-TYPE, and NODE-FIELD are regexps.
+
 no-node
 
     Matches the case where node is nil, i.e., there is no node
@@ -768,11 +775,11 @@ treesit-simple-indent-presets
 
 \(parent-is TYPE)
 
-    Check that the parent has type TYPE.
+    Check that the parent's type matches regexp TYPE.
 
 \(node-is TYPE)
 
-    Checks that the node has type TYPE.
+    Checks that the node's type matches regexp TYPE.
 
 \(query QUERY)
 

commit 3a4406975338eb6dad9327b5d17f67a677114e6a
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Oct 27 16:44:33 2022 -0700

    Remove tree-sitter-indent's integration with cc-mode
    
    Also minor improvement of tree-sitter-indent error messaging.
    
    * lisp/progmodes/js.el (js--treesit-indent-rules): Fix it so it works
    with the new presets (which expects regexps).
    (js--treesit-cc-indent-rules): Remove variable.
    (js-mode): Go back to js--treesit-indent-rules.
    * lisp/treesit.el (treesit-indent): Don't report error message when
    ANCHOR or OFFSET is nil: let treesit-simple-indent display the
    message.
    (treesit-simple-indent): Remove cc-mode integration.  Display error
    message when no rules matches.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 89bd04b231..f258b093f4 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3421,7 +3421,7 @@ js--treesit-indent-rules
      ((node-is ")") parent-bol 0)
      ((node-is "]") parent-bol 0)
      ((node-is ">") parent-bol 0)
-     ((node-is ".") parent-bol ,js-indent-level)
+     ((node-is "\\.") parent-bol ,js-indent-level)
      ((parent-is "named_imports") parent-bol ,js-indent-level)
      ((parent-is "statement_block") parent-bol ,js-indent-level)
      ((parent-is "variable_declarator") parent-bol ,js-indent-level)
@@ -3442,122 +3442,6 @@ js--treesit-indent-rules
      ((node-is "/") parent 0)
      ((parent-is "jsx_self_closing_element") parent ,js-indent-level))))
 
-(defvar js--treesit-cc-indent-rules
-  (let ((function-re (rx (or "function_declaration"
-                             "method_definition"
-                             "function")))
-        (if-statement-like (rx (or "if" "try" "while" "do")
-                               "_statement"))
-        (else-clause-like (rx (or "else" "catch" "finally")
-                              "_clause"))
-        (switch-case-re (rx "switch_" (or "case" "default"))))
-    `((javascript
-       ;; Function declaration.
-       ;; "{"
-       ((match "statement_block" ,function-re) parent defun-open)
-       ((n-p-gp "}" "statement_block" ,function-re) grand-parent defun-close)
-
-       ((and (node-is ,function-re) (parent-is "program"))
-        parent topmost-intro)
-       ((parent-is ,function-re) parent topmost-intro-cont)
-       ((and (n-p-gp nil "statement_block" ,function-re)
-             (match nil nil nil 0 0))
-        parent-bol defun-block-intro)
-
-       ;; Class
-       ((node-is "class_declaration") parent topmost-intro)
-       ((parent-is "class_declaration") parent topmost-intro-cont)
-       ((match "{" "class_declaration") parent class-open)
-       ((match "}" "class_declaration") parent class-close)
-
-       ((node-is "class_heritage") parent inher-intro)
-       ((parent-is "class_heritage") parent inher-cont)
-
-       ;; Javascript doesn't have class access keywords
-       ;; (`member-init-intro', `member-init-cont') I think?
-
-       ((match "{" "class_declaration") parent class-open)
-       ((match "}" "class_body") parent class-close)
-
-       ((parent-is "class_body") parent inclass)
-       ((parent-is "member_definition") parent topmost-intro-cont)
-
-       ((match "statement_block" "member_definition") parent defun-open)
-       ((n-p-gp "}" "statement_block" "member_definition")
-        grand-parent defun-close)
-
-       ;; Javascript doesn't have class parameters
-       ;; (`template-args-cont').
-
-       ;; Conditional.
-       ((match "statement_block" ,if-statement-like)
-        parent substatement-open)
-       ((match "statement_block" ,else-clause-like)
-        grand-parent substatement-open)
-       ;; Javascript doesn't have `substatement-label'.
-       ((node-is ,else-clause-like) parent else-clause)
-       ((parent-is ,else-clause-like) grand-parent substatement)
-       ((match "while" "do_statement") parent do-while-closure)
-       ((field-is "consequence") parent substatement)
-       ((field-is "condition") parent statement-cont)
-
-       ;; Switch.
-       ((node-is ,switch-case-re) grand-parent case-label)
-       ((match "statement_block" ,switch-case-re) parent statement-case-open)
-       ((match nil ,switch-case-re "body") parent statement-case-intro)
-       ((parent-is ,switch-case-re) first-sibling statement-case-cont)
-       ((node-is "switch_body") parent substatement-open)
-       ((match "}" "switch_body") grand-parent substatement-close)
-
-       ;; Brace list.
-       ((node-is "object") parent-bol brace-list-open)
-       ((match "}" "object") parent brace-list-close)
-       ;; ((match nil "object" nil 0 0) parent brace-list-intro)
-       ((match nil "object" nil 0 0) parent ,js-indent-level)
-       ((match nil "object" nil 1) first-sibling brace-list-entry)
-
-       ;; Pair.
-       ((match nil "pair" "value") parent ,js-indent-level)
-
-       ;; Javascript doesn't have extern.
-
-       ;; Parenthesis.  These syntax symbols uses line-up functions,
-       ;; which don't work with tree-sitter, so we roll our own:
-       ;; `arglist-close', `arglist-intro', `arglist-cont',
-       ;; `arglist-cont-nonempty'.
-       ((parent-is "formal_parameters") first-sibling 1)
-       ((node-is "formal_parameters") parent statement-cont)
-
-       ;; Misc.
-       ((parent-is "function_declaration") parent func-decl-cont)
-       ((parent-is "string-fragment") grand-parent string)
-       ((parent-is "comment") grand-parent c)
-
-       ;; Fallback for top-level statements.
-       ((parent-is "program") parent 0)
-
-       ;; Fallback for blocks & statements.
-       ((parent-is "expression_statement") parent statement-cont)
-       ((match "}" "statement_block") parent-bol block-close)
-       ((match "statement_block" "statement_block") parent block-open)
-       ((match nil "statement_block" nil 0 0) parent-bol statement-block-intro)
-       ((parent-is "statement_block") prev-sibling statement)
-
-       ;; Template substitution.
-       ((match "}" "template_substitution") parent-bol block-close)
-       ((match nil "template_substitution" nil 0 0) parent-bol statement-block-intro)
-       ((parent-is "template_substitution") prev-sibling statement)
-
-       ;; JSX, copied from `js--treesit-indent-rules' (TODO).
-       ((parent-is "jsx_opening_element") parent ,js-indent-level)
-       ((node-is "jsx_closing_element") parent 0)
-       ((node-is "jsx_text") parent ,js-indent-level)
-       ((parent-is "jsx_element") parent ,js-indent-level)
-       ((node-is "/") parent 0)
-       ((parent-is "jsx_self_closing_element") parent ,js-indent-level)
-
-       (catch-all parent-bol statement-cont)))))
-
 (defvar js--treesit-keywords
   '("as" "async" "await" "break" "case" "catch" "class" "const" "continue"
     "debugger" "default" "delete" "do" "else" "export" "extends" "finally"
@@ -3878,7 +3762,7 @@ js-mode
    ((treesit-ready-p 'js-mode 'javascript)
     (treesit-parser-create 'javascript)
     ;; Indent.
-    (setq-local treesit-simple-indent-rules js--treesit-cc-indent-rules)
+    (setq-local treesit-simple-indent-rules js--treesit-indent-rules)
     ;; Navigation.
     (setq-local treesit-defun-type-regexp
                 (rx (or "class_declaration"
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 1a4c760c39..84583d2c62 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -893,9 +893,8 @@ treesit-indent
                        (t nil)))
          (`(,anchor . ,offset)
           (funcall treesit-indent-function node parent bol)))
-      (if (null anchor)
-          (when treesit--indent-verbose
-            (message "Failed to find the anchor"))
+      (if (or (null anchor) (null offset))
+          nil
         (let ((col (+ (save-excursion
                         (goto-char anchor)
                         (current-column))
@@ -905,8 +904,6 @@ treesit-indent
                 (indent-line-to col))
             (indent-line-to col)))))))
 
-(declare-function c-calc-offset "cc-engine")
-
 (defun treesit-simple-indent (node parent bol)
   "Calculate indentation according to `treesit-simple-indent-rules'.
 
@@ -936,10 +933,11 @@ treesit-simple-indent
                (let ((anchor-pos
                       (treesit--simple-indent-eval
                        (list anchor node parent bol))))
-                 (cons anchor-pos
-                       (if (integerp offset)
-                           offset
-                         (c-calc-offset (list offset anchor-pos)))))))))
+                 (cons anchor-pos offset))
+               finally return
+               (progn (when treesit--indent-verbose
+                        (message "No matched rule"))
+                      (cons nil nil))))))
 
 (defun treesit-check-indent (mode)
   "Check current buffer's indentation against a major mode MODE.

commit bb0a427e9d3c29c17c1b03773697989328f53056
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Oct 27 15:54:04 2022 -0700

    * configure.ac (WINDOW_SYSTEM_OBJ): Move tree-sitter placement.

diff --git a/configure.ac b/configure.ac
index 4ce7e8b8ce..4b9625c22b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6591,9 +6591,9 @@ AC_DEFUN
 optsep=
 emacs_config_features=
 for opt in ACL BE_APP CAIRO DBUS FREETYPE GCONF GIF GLIB GMP GNUTLS GPM GSETTINGS \
- HARFBUZZ IMAGEMAGICK JPEG JSON TREE-SITTER LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 \
+ HARFBUZZ IMAGEMAGICK JPEG JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 \
  M17N_FLT MODULES NATIVE_COMP NOTIFY NS OLDXMENU PDUMPER PGTK PNG RSVG SECCOMP \
- SOUND SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS \
+ SOUND SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS TREE-SITTER \
  UNEXEC WEBP X11 XAW3D XDBE XFT XIM XINPUT2 XPM XWIDGETS X_TOOLKIT \
  ZLIB; do
 

commit e7b09065dae0aa8018c959ad3c69626bbcce8f17
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Thu Oct 27 14:01:49 2022 +0200

    Minor copy-edits in tree-sitter docs
    
    * doc/lispref/parsing.texi (Parsing Program Source): Improve wording.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index ed5592c239..903f3aa6a5 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -59,7 +59,7 @@ Language Definitions
 @cindex language argument, for tree-sitter
 Tree-sitter relies on language definitions to parse text in that
 language.  In Emacs, a language definition is represented by a symbol.
-For example, C language definition is represented as the symbol
+For example, the C language definition is represented as the symbol
 @code{c}, and @code{c} can be passed to tree-sitter functions as the
 @var{language} argument.
 
@@ -91,12 +91,12 @@ Language Definitions
 
 @table @code
 @item (not-found @var{error-msg} @dots{})
-This means Emacs could not find the language definition library.
+This means that Emacs could not find the language definition library.
 @item (symbol-error @var{error-msg})
-This means Emacs could not find in the library the expected function
+This means that Emacs could not find in the library the expected function
 that every language definition library should export.
 @item (version-mismatch @var{error-msg})
-This means the version of language definition library is incompatible
+This means that the version of language definition library is incompatible
 with that of the tree-sitter library.
 @end table
 
@@ -324,7 +324,7 @@ Language Definitions
 @end example
 
 @noindent
-makes any node matched by @code{preprocessor_call_exp} to appear as
+makes any node matched by @code{preprocessor_call_exp} appear as
 @code{call_expression}.
 @end table
 
@@ -362,7 +362,7 @@ Using Parser
 
 This section describes how to create and configure a tree-sitter
 parser.  In Emacs, each tree-sitter parser is associated with a
-buffer.  As the user edits the buffer, the associated parser and the
+buffer.  As the user edits the buffer, the associated parser and
 syntax tree are automatically kept up-to-date.
 
 @defvar treesit-max-buffer-size
@@ -401,7 +401,7 @@ Using Parser
 
 @defun treesit-parser-p object
 This function checks if @var{object} is a tree-sitter parser, and
-returns non-@code{nil} if it is, @code{nil} otherwise.
+returns non-@code{nil} if it is, and @code{nil} otherwise.
 @end defun
 
 There is no need to explicitly parse a buffer, because parsing is done
@@ -476,7 +476,7 @@ Retrieving Node
 as its children, and therefore spans a larger portion of text.
 
 When a function cannot find a node, it returns @code{nil}.  For
-convenience, all the functions that take a node as argument and return
+convenience, all functions that take a node as argument and return
 a node, also accept the node argument of @code{nil} and in that case
 just return @code{nil}.
 
@@ -587,7 +587,7 @@ Retrieving Node
 
 @defun treesit-node-children node &optional named
 This function returns all of @var{node}'s children as a list.  If
-@var{named} is non-@code{nil}, then it retrieves only named nodes.
+@var{named} is non-@code{nil}, it retrieves only named nodes.
 @end defun
 
 @defun treesit-next-sibling node &optional named
@@ -1575,7 +1575,7 @@ Tree-sitter C API
 
 @itemize
 @item
-Instead of using byte positions, the ELisp API uses character
+Instead of using byte positions, the Emacs Lisp API uses character
 positions.
 @item
 Null nodes are converted to nil.

commit 77e6a704ac819580b81400ff1d8503d142cb3905
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Thu Oct 27 13:03:17 2022 +0200

    ; Fix typos and formatting in tree-sitter docs
    
    * doc/lispref/parsing.texi (Parsing Program Source): Fix typos and
    formatting.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 8ed633b61b..ed5592c239 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -24,8 +24,8 @@ Parsing Program Source
 programming languages.
 
 @defun treesit-available-p
-This function returns non-nil if tree-sitter features are available
-for the current Emacs session.
+This function returns non-@code{nil} if tree-sitter features are
+available for the current Emacs session.
 @end defun
 
 To be able to parse the program source using the tree-sitter library
@@ -105,11 +105,11 @@ Language Definitions
 details about the failure.
 
 @defun treesit-language-available-p language &optional detail
-This function returns non-nil if the language definitions for
+This function returns non-@code{nil} if the language definitions for
 @var{language} exist and can be loaded.
 
-If @var{detail} is non-nil, return @code{(t . nil)} when
-@var{language} is available, and @code{(nil . @var{date})} when it's
+If @var{detail} is non-@code{nil}, return @code{(t . nil)} when
+@var{language} is available, and @code{(nil . @var{data})} when it's
 unavailable.  @var{data} is the signal data of
 @code{treesit-load-language-error}.
 @end defun
@@ -130,7 +130,7 @@ Language Definitions
 @var{library-base-name} is the basename of the dynamic library's file name,
 (usually, @file{libtree-sitter-@var{language}}), and
 @var{function-name} is the function provided by the library
-(usually, @code{tree_sitter_@var{language}}). For example,
+(usually, @code{tree_sitter_@var{language}}).  For example,
 
 @example
 (cool-lang "libtree-sitter-coool" "tree_sitter_cooool")
@@ -360,7 +360,7 @@ Using Parser
 @section Using Tree-sitter Parser
 @cindex tree-sitter parser, using
 
-This section described how to create and configure a tree-sitter
+This section describes how to create and configure a tree-sitter
 parser.  In Emacs, each tree-sitter parser is associated with a
 buffer.  As the user edits the buffer, the associated parser and the
 syntax tree are automatically kept up-to-date.
@@ -443,7 +443,7 @@ Using Parser
 to handle a multi-language buffer; instead, set the ranges in which the
 parser should operate.  @xref{Multiple Languages}.
 
-Because a parser parses lazily, when the user or a Lisp programs
+Because a parser parses lazily, when the user or a Lisp program
 narrows the buffer, the parser is not affected immediately; as long as
 the mode doesn't query for a node while the buffer is narrowed, the
 parser is oblivious of the narrowing.
@@ -507,7 +507,7 @@ Retrieving Node
 When @var{pos} is after all the text in the buffer, technically there
 is no node after @var{pos}.  But for convenience, this function will
 return the last leaf node in the parse tree.  If @var{strict} is
-non-nil, this function will strictly comply to the semantics and
+non-@code{nil}, this function will strictly comply to the semantics and
 return @var{nil}.
 
 Example:
@@ -582,7 +582,7 @@ Retrieving Node
 is the string text.
 
 This function returns @code{nil} if there is no @var{n}'th child.
-@var{n} could be negative, e.g., -1 represents the last child.
+@var{n} could be negative, e.g., @code{-1} represents the last child.
 @end defun
 
 @defun treesit-node-children node &optional named
@@ -705,7 +705,7 @@ Retrieving Node
 @defun treesit-search-forward-goto node predicate &optional start backward all
 This function moves point to the start or end of the next node after
 @var{node} in the buffer that matches @var{predicate}.  If @var{start}
-is non-nil, stop at the beginning rather than the end of a node.
+is non-@code{nil}, stop at the beginning rather than the end of a node.
 
 This function guarantees that the matched node it returns makes
 progress in terms of buffer position: the start/end position of the
@@ -744,7 +744,7 @@ Retrieving Node
 @end group
 @end example
 
-If @var{process-fn} is non-nil, instead of returning the matched
+If @var{process-fn} is non-@code{nil}, instead of returning the matched
 nodes, this function passes each node to @var{process-fn} and uses the
 returned value instead.  If non-@code{nil}, @var{limit} is the number of
 levels to go down from @var{root}.
@@ -899,7 +899,7 @@ Accessing Node Information
 the @var{n}'th child doesn't have a field name.
 
 Note that @var{n} counts both named and anonymous child.  And @var{n}
-could be negative, e.g., -1 represents the last child.
+could be negative, e.g., @code{-1} represents the last child.
 @end defun
 
 @defun treesit-child-count node &optional named
@@ -1014,8 +1014,8 @@ Pattern Matching
 @end group
 @end example
 
-As mentioned earlier, @var{query} could contain multiple patterns. For
-example, it could have two top-level patterns:
+As mentioned earlier, @var{query} could contain multiple patterns.
+For example, it could have two top-level patterns:
 
 @example
 @group
@@ -1174,7 +1174,7 @@ Pattern Matching
 @noindent
 tree-sitter only matches arrays where the first element equals to
 the last element.  To attach a predicate to a pattern, we need to
-group then together.  A predicate always starts with a @samp{#}.
+group them together.  A predicate always starts with a @samp{#}.
 Currently there are two predicates, @code{#equal} and @code{#match}.
 
 @deffn Predicate equal arg1 arg2
@@ -1310,12 +1310,12 @@ Multiple Languages
 @cindex multiple languages, parsing with tree-sitter
 @cindex parsing multiple languages with tree-sitter
 Sometimes, the source of a programming language could contain snippets
-of other languages; HTML + CSS + JavaScript is one example.  In that
-case, text segments written in different languages need to be assigned
-different parsers.  Traditionally, this is achieved by using
-narrowing.  While tree-sitter works with narrowing (@pxref{tree-sitter
-narrowing, narrowing}), the recommended way is instead to set regions
-of buffer text in which a parser will operate.
+of other languages; @acronym{HTML} + @acronym{CSS} + JavaScript is one
+example.  In that case, text segments written in different languages
+need to be assigned different parsers.  Traditionally, this is
+achieved by using narrowing.  While tree-sitter works with narrowing
+(@pxref{tree-sitter narrowing, narrowing}), the recommended way is
+instead to set regions of buffer text in which a parser will operate.
 
 @defun treesit-parser-set-included-ranges parser ranges
 This function sets up @var{parser} to operate on @var{ranges}.  The
@@ -1454,8 +1454,8 @@ Multiple Languages
 ranges for the embedded languages, and then parses the embedded
 languages.
 
-Suppose we need to parse a very simple document that mixes HTML, CSS
-and JavaScript:
+Suppose we need to parse a very simple document that mixes
+@acronym{HTML}, @acronym{CSS} and JavaScript:
 
 @example
 @group
@@ -1466,7 +1466,8 @@ Multiple Languages
 @end group
 @end example
 
-We first parse with HTML, then set ranges for CSS and JavaScript:
+We first parse with @acronym{HTML}, then set ranges for @acronym{CSS}
+and JavaScript:
 
 @example
 @group
@@ -1495,9 +1496,9 @@ Multiple Languages
 @end group
 @end example
 
-We use a query pattern @w{@code{(style_element (raw_text) @@capture)}} to
-find CSS nodes in the HTML parse tree.  For how to write query
-patterns, @pxref{Pattern Matching}.
+We use a query pattern @w{@code{(style_element (raw_text) @@capture)}}
+to find @acronym{CSS} nodes in the @acronym{HTML} parse tree.  For how
+to write query patterns, @pxref{Pattern Matching}.
 
 @node Tree-sitter major modes
 @section Developing major modes with tree-sitter
@@ -1546,7 +1547,7 @@ Tree-sitter C API
 @section Tree-sitter C API Correspondence
 
 Emacs' tree-sitter integration doesn't expose every feature
-provided by the tree-sitter's C API.  Missing features include:
+provided by tree-sitter's C API.  Missing features include:
 
 @itemize
 @item
@@ -1556,14 +1557,14 @@ Tree-sitter C API
 @item
 Setting the logger for a parser.
 @item
-Printing a DOT graph of the syntax tree to a file.
+Printing a @acronym{DOT} graph of the syntax tree to a file.
 @item
-Coping and modifying a syntax tree.  (Emacs doesn't expose a tree
+Copying and modifying a syntax tree.  (Emacs doesn't expose a tree
 object.)
 @item
 Using (row, column) coordinates as position.
 @item
-Updating a node with changes. (In Emacs, retrieve a new node instead
+Updating a node with changes.  (In Emacs, retrieve a new node instead
 of updating the existing one.)
 @item
 Querying statics of a language definition.

commit 092776c7ebf20b4d1208a0e0d860a1f3abd7d119
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Thu Oct 27 12:13:12 2022 +0200

    ; Update copyright years
    
    * doc/lispref/parsing.texi:
    * src/treesit.h:
    * test/src/treesit-tests.el: Update copyright years.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 3648ad2f26..8ed633b61b 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -1,6 +1,6 @@
 @c -*- mode: texinfo; coding: utf-8 -*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 2021 Free Software Foundation, Inc.
+@c Copyright (C) 2021-2022 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @node Parsing Program Source
 @chapter Parsing Program Source
diff --git a/src/treesit.h b/src/treesit.h
index c573085f1b..60f1a0ceaf 100644
--- a/src/treesit.h
+++ b/src/treesit.h
@@ -1,6 +1,6 @@
 /* Header file for the tree-sitter integration.
 
-Copyright (C) 2021 Free Software Foundation, Inc.
+Copyright (C) 2021-2022 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index 2e26df6925..b143bdf379 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -1,6 +1,6 @@
 ;;; treesit-tests.el --- tests for src/treesit.c         -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2022 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 

commit 7e36fd64d2ce06b821e0f57f6d850ff4386608bf
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Thu Oct 27 12:01:04 2022 +0200

    ; Fix typos and formatting in treesit.[ch]
    
    * src/treesit.c:
    * src/treesit.h: Fix typos and formatting.

diff --git a/src/treesit.c b/src/treesit.c
index e22a0fe2b3..e4be065d94 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -280,15 +280,15 @@ #define ts_tree_root_node fn_ts_tree_root_node
    The Emacs wrapper of tree-sitter does not expose everything the C
    API provides, most notably:
 
-   - It doesn't expose a syntax tree, we put the syntax tree in the
-     parser object, and updating the tree is handled in the C level.
+   - It doesn't expose a syntax tree.  We put the syntax tree in the
+     parser object, and updating the tree is handled on the C level.
 
    - We don't expose tree cursor either.  I think Lisp is slow enough
      to nullify any performance advantage of using a cursor, though I
      don't have evidence.  Also I want to minimize the number of new
-     types we introduce, currently we only add parser and node type.
+     types we introduce.  Currently we only add parser and node type.
 
-   - Because updating the change is handled in the C level as each
+   - Because updating the change is handled on the C level as each
      change is made in the buffer, there is no way for Lisp to update
      a node.  But since we can just retrieve a new node, it shouldn't
      be a limitation.
@@ -330,7 +330,7 @@ #define ts_tree_root_node fn_ts_tree_root_node
    functions: 'treesit-parser-create' and
    'treesit-language-available-p'.  Technically we only need to call
    initialization function in those two functions, but in reality we
-   check at the beginning of every lisp function.  That should be more
+   check at the beginning of every Lisp function.  That should be more
    fool-proof.
 
    Tree-sitter offset (0-based) and buffer position (1-based):
@@ -344,7 +344,7 @@ #define ts_tree_root_node fn_ts_tree_root_node
    - lisp/emacs-lisp/cl-preloaded.el & data.c & lisp.h for parser and
      node type.
 
-   Regarding signals: only raise signals in lisp functions.
+   Regarding signals: only raise signals in Lisp functions.
 
    Casts from EMACS_INT and ptrdiff_t to uint32_t: We install checks
    for buffer size and range and thus able to assume these casts never
@@ -364,7 +364,7 @@ #define ts_tree_root_node fn_ts_tree_root_node
    treesit-query-capture is called, and it completely kills the
    performance of querying in a loop for a moderate amount of times
    (hundreds of queries takes seconds rather than milliseconds to
-   complete).  Therefore we want some caching. We can either use a
+   complete).  Therefore we want some caching.  We can either use a
    search.c style transparent caching, or simply expose a new type,
    compiled-ts-query and let the user to manually compile AOT.  I
    believe AOT compiling gives users more control, makes the
@@ -487,7 +487,7 @@ treesit_load_language_push_for_each_suffix (Lisp_Object lib_base_name,
    to the language definition.
 
    If error occurs, return NULL and fill SIGNAL_SYMBOL and SIGNAL_DATA
-   with values suitable for xsignal. */
+   with values suitable for xsignal.  */
 static TSLanguage *
 treesit_load_language (Lisp_Object language_symbol,
 		       Lisp_Object *signal_symbol, Lisp_Object *signal_data)
@@ -563,7 +563,7 @@ treesit_load_language (Lisp_Object language_symbol,
   if (found_override)
     c_name = SSDATA (override_c_name);
   langfn = dynlib_sym (handle, c_name);
-  free(c_name);
+  free (c_name);
   error = dynlib_error ();
   if (error != NULL)
     {
@@ -668,7 +668,7 @@ treesit_tree_edit_1 (TSTree *tree, ptrdiff_t start_byte,
 }
 
 /* Update each parser's tree after the user made an edit.  This
-function does not parse the buffer and only updates the tree. (So it
+function does not parse the buffer and only updates the tree.  (So it
 should be very fast.)  */
 void
 treesit_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
@@ -769,14 +769,14 @@ treesit_ensure_position_synced (Lisp_Object parser)
      situation.  We change visible_beg and visible_end to match
      BUF_BEGV_BYTE and BUF_ZV_BYTE, and inform tree-sitter of the
      change.  We want to move the visible range of tree-sitter to
-     match the narrowed range. For example,
+     match the narrowed range.  For example,
      from ________|xxxx|__
      to   |xxxx|__________ */
 
   /* 1. Make sure visible_beg <= BUF_BEGV_BYTE.  */
   if (visible_beg > BUF_BEGV_BYTE (buffer))
     {
-      /* Tree-sitter sees: insert at the beginning. */
+      /* Tree-sitter sees: insert at the beginning.  */
       treesit_tree_edit_1 (tree, 0, 0, visible_beg - BUF_BEGV_BYTE (buffer));
       visible_beg = BUF_BEGV_BYTE (buffer);
       eassert (visible_beg <= visible_end);
@@ -825,7 +825,7 @@ treesit_check_buffer_size (struct buffer *buffer)
 	      make_fixnum (buffer_size));
 }
 
-/* Parse the buffer.  We don't parse until we have to. When we have
+/* Parse the buffer.  We don't parse until we have to.  When we have
 to, we call this function to parse and update the tree.  */
 static void
 treesit_ensure_parsed (Lisp_Object parser)
@@ -886,7 +886,7 @@ treesit_read_buffer (void *parser, uint32_t byte_index,
   char *beg;
   int len;
   /* This function could run from a user command, so it is better to
-     do nothing instead of raising an error. (It was a pain in the a**
+     do nothing instead of raising an error.  (It was a pain in the a**
      to decrypt mega-if-conditions in Emacs source, so I wrote the two
      branches separately, you are welcome.)  */
   if (!BUFFER_LIVE_P (buffer))
@@ -1418,7 +1418,7 @@ DEFUN ("treesit-parser-included-ranges",
 /*** Node API  */
 
 /* Check that OBJ is a positive integer and signal an error if
-   otherwise. */
+   otherwise.  */
 static void
 treesit_check_positive_integer (Lisp_Object obj)
 {
@@ -2030,7 +2030,7 @@ treesit_predicate_capture_name_to_text (Lisp_Object name,
 }
 
 /* Handles predicate (#equal A B).  Return true if A equals B; return
-   false otherwise. A and B can be either string, or a capture name.
+   false otherwise.  A and B can be either string, or a capture name.
    The capture name evaluates to the text its captured node spans in
    the buffer.  */
 static bool
@@ -2146,7 +2146,7 @@ DEFUN ("treesit-query-compile",
 
   Lisp_Object lisp_query = make_treesit_query (query, language);
 
-  /* Maybe actually compile. */
+  /* Maybe actually compile.  */
   if (NILP (eager))
     return lisp_query;
   else
@@ -2204,7 +2204,7 @@ DEFUN ("treesit-query-capture",
 	|| CONSP (query) || STRINGP (query)))
     wrong_type_argument (Qtreesit_query_p, query);
 
-  /* Resolve NODE into an actual node. */
+  /* Resolve NODE into an actual node.  */
   Lisp_Object lisp_node;
   if (TS_NODEP (node))
     lisp_node = node;
@@ -2270,13 +2270,13 @@ DEFUN ("treesit-query-capture",
   /* WARN: After this point, free treesit_query and cursor before every
      signal and return.  */
 
-  /* Set query range. */
+  /* Set query range.  */
   if (!NILP (beg) && !NILP (end))
     {
       EMACS_INT beg_byte = XFIXNUM (beg);
       EMACS_INT end_byte = XFIXNUM (end);
       /* We never let tree-sitter run on buffers too large, so these
-	 assertion should never hit. */
+	 assertion should never hit.  */
       eassert (beg_byte - visible_beg <= UINT32_MAX);
       eassert (end_byte - visible_beg <= UINT32_MAX);
       ts_query_cursor_set_byte_range (cursor, (uint32_t) beg_byte - visible_beg,
@@ -2291,7 +2291,7 @@ DEFUN ("treesit-query-capture",
      captures in the RESULT list unconditionally as we get them, then
      test for predicates.  If predicates pass, then all good, if
      predicates don't pass, revert the result back to the result
-     before this loop (PREV_RESULT). (Predicates control the entire
+     before this loop (PREV_RESULT).  (Predicates control the entire
      match.) This way we don't need to create a list of captures in
      every for loop and nconc it to RESULT every time.  That is indeed
      the initial implementation in which Yoav found nconc being the
@@ -2377,9 +2377,9 @@ treesit_traverse_child_helper (TSNode node, bool forward, bool named)
   if (forward)
     {
       if (named)
-	return ts_node_named_child(node, 0);
+	return ts_node_named_child (node, 0);
       else
-	return ts_node_child(node, 0);
+	return ts_node_child (node, 0);
     }
   else
     {
@@ -2470,7 +2470,7 @@ treesit_search_dfs (TSNode *root, Lisp_Object pred, Lisp_Object parser,
     }
 }
 
-/* Go thought the whole tree linearly, leaf-first, starting from
+/* Go through the whole tree linearly, leaf-first, starting from
    START.  PRED, PARSER, NAMED, FORWARD are the same as in
    ts_search_subtre.  If UP_ONLY is true, never go to children, only
    sibling and parents.  */
@@ -2686,7 +2686,7 @@ DEFUN ("treesit-induce-sparse-tree",
      |  |              |
      e  5              e
 
-If PROCESS-FN is non-nil, it should be a function of one argument. In
+If PROCESS-FN is non-nil, it should be a function of one argument.  In
 that case, instead of returning the matched nodes, pass each node to
 PROCESS-FN, and use its return value instead.
 
diff --git a/src/treesit.h b/src/treesit.h
index e609ad46b0..c573085f1b 100644
--- a/src/treesit.h
+++ b/src/treesit.h
@@ -30,7 +30,7 @@ #define EMACS_TREESIT_H
 struct Lisp_TS_Parser
 {
   union vectorlike_header header;
-  /* A symbol represents the language this parser uses.  See the
+  /* A symbol representing the language this parser uses.  See the
      manual for more explanation.  */
   Lisp_Object language_symbol;
   /* The buffer associated with this parser.  */
@@ -50,7 +50,7 @@ #define EMACS_TREESIT_H
   /* These two positions record the buffer byte position (1-based) of
      the "visible region" that tree-sitter sees.  Unlike markers,
      These two positions do not change as the user inserts and deletes
-     text around them. Before re-parse, we move these positions to
+     text around them.  Before re-parse, we move these positions to
      match BUF_BEGV_BYTE and BUF_ZV_BYTE.  Note that we don't need to
      synchronize these positions when retrieving them in a function
      that involves a node: if the node is not outdated, these
@@ -74,7 +74,7 @@ #define EMACS_TREESIT_H
   /* This prevents gc from collecting the tree before the node is done
      with it.  TSNode contains a pointer to the tree it belongs to,
      and the parser object, when collected by gc, will free that
-     tree. */
+     tree.  */
   Lisp_Object parser;
   TSNode node;
   /* A node inherits its parser's timestamp at creation time.  The

commit 53584db07ed3411d659678425c4481997e56c834
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Thu Oct 27 08:22:16 2022 +0200

    ; * src/treesit.c: Fix typos.

diff --git a/src/treesit.c b/src/treesit.c
index cd1af3f52d..e22a0fe2b3 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1587,7 +1587,7 @@ DEFUN ("treesit-node-check",
 language definition, but can appear anywhere.
 
 A node "has changes" if the buffer changed since the node is
-created. (Don't forget the "s" at the end of `has-changes'.)
+created.  (Don't forget the "s" at the end of `has-changes'.)
 
 A node "has error" if itself is a syntax error or contains any syntax
 errors.  */)
@@ -2131,7 +2131,7 @@ DEFUN ("treesit-query-compile",
 If EAGER is non-nil, immediately load LANGUAGE and compile the query.
 Otherwise defer the compilation until the query is first used.
 
-Signals treesit-query-error if QUERY is malformed or something else
+Signal `treesit-query-error' if QUERY is malformed or something else
 goes wrong.  (This only happens if EAGER is non-nil.)
 You can use `treesit-query-validate' to validate and debug a query.  */)
   (Lisp_Object language, Lisp_Object query, Lisp_Object eager)

commit 5868580e94ed93ce4f0ec88b03b232f5cd29178d
Author: Stefan Kangas <stefankangas@gmail.com>
Date:   Thu Oct 27 08:02:58 2022 +0200

    ; * lisp/treesit.el: Minor copy-edits of documentation.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 8700cb88f2..1a4c760c39 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1,6 +1,6 @@
 ;;; treesit.el --- tree-sitter utilities -*- lexical-binding: t -*-
 
-;; Copyright (C) 2021 Free Software Foundation, Inc.
+;; Copyright (C) 2021-2022 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -18,13 +18,13 @@
 ;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
-;;
-;; This file is the lisp counterpart of treesit.c, together they
+
+;; This file is the Lisp counterpart of treesit.c.  Together they
 ;; provide tree-sitter integration for Emacs.  This file contains
 ;; convenient functions that are more idiomatic and flexible than the
 ;; exposed C API of tree-sitter.  It also contains frameworks for
-;; integrating tree-sitter with font-lock, indent, activate/deactivate
-;; tree-sitter, debugging tree-sitter, etc.
+;; integrating tree-sitter with font-lock, indentation, activating and
+;; deactivating tree-sitter, debugging tree-sitter, etc.
 
 ;;; Code:
 
@@ -53,12 +53,13 @@ treesit-max-buffer-size
 (defcustom treesit-settings '((t nil t))
   "Tree-sitter toggle settings for major modes.
 
-A list of (MODE ACTIVATE INHERIT).  MODE is a major mode, ACTIVATE
-can be one of the following:
+A list of (MODE ACTIVATE INHERIT) where MODE is a major mode, and
+ACTIVATE can be one of the following:
 
-  demand => Demand the use of tree-sitter, warn if it can't activate
-  t => Enable if available
-  nil => Don't enable
+  `demand'  Demand the use of tree-sitter, and warn if it can't
+            be activated.
+  t         Enable tree-sitter if it is available.
+  nil       Don't enable tree-sitter.
 
 If INHERIT is t, the setting for MODE is inherited by all its
 derived modes.  For a derived mode, closer ancestor mode's
@@ -93,13 +94,13 @@ treesit-language-at-point-function
 This is used by `treesit-language-at', which is used by various
 functions to determine which parser to use at point.
 
-The function is called with the position of point.")
+The function is called with one argument, the position of point.")
 
-(defun treesit-language-at (pos)
-  "Return the language at POS.
+(defun treesit-language-at (position)
+  "Return the language at POSITION.
 Assumes parser ranges are up-to-date."
   (when treesit-language-at-point-function
-    (funcall treesit-language-at-point-function pos)))
+    (funcall treesit-language-at-point-function position)))
 
 (defun treesit-set-ranges (parser-or-lang ranges)
   "Set the ranges of PARSER-OR-LANG to RANGES."
@@ -127,7 +128,7 @@ treesit-get-ranges
 ;;; Node API supplement
 
 (defun treesit-node-buffer (node)
-  "Return the buffer in where NODE belongs."
+  "Return the buffer in which NODE belongs."
   (treesit-parser-buffer
    (treesit-node-parser node)))
 
@@ -139,13 +140,14 @@ treesit-node-language
 (defun treesit-node-at (pos &optional parser-or-lang named strict)
   "Return the smallest node that starts at or after buffer position POS.
 
-\"Starts at or after POS\" means the start of the node is greater or
-equal than POS.
+\"Starts at or after POS\" means the start of the node is greater
+than or equal to POS.
 
-Return nil if none find.  If NAMED is non-nil, only look for named node.
+Return nil if none was found.  If NAMED is non-nil, only look for
+named node.
 
 If PARSER-OR-LANG is nil, use the first parser in
-\(`treesit-parser-list'); if PARSER-OR-LANG is a parser, use
+`treesit-parser-list'; if PARSER-OR-LANG is a parser, use
 that parser; if PARSER-OR-LANG is a language, find a parser using
 that language in the current buffer, and use that.
 
@@ -178,16 +180,16 @@ treesit-node-on
   "Return the smallest node covering BEG to END.
 
 BEWARE!  Calling this function on an empty line that is not
-inside any top-level construct (function definition, etc) most
+inside any top-level construct (function definition, etc.) most
 probably will give you the root node, because the root node is
 the smallest node that covers that empty line.  You probably want
 to use `treesit-node-at' instead.
 
-Return nil if none find.  If NAMED non-nil, only look for named
-node.
+Return nil if none was found.  If NAMED is non-nil, only look for
+named node.
 
 If PARSER-OR-LANG is nil, use the first parser in
-(`treesit-parser-list'); if PARSER-OR-LANG is a parser, use
+`treesit-parser-list'; if PARSER-OR-LANG is a parser, use
 that parser; if PARSER-OR-LANG is a language, find a parser using
 that language in the current buffer, and use that."
   (let ((root (if (treesit-parser-p parser-or-lang)
@@ -196,7 +198,7 @@ treesit-node-on
     (treesit-node-descendant-for-range root beg (or end beg) named)))
 
 (defun treesit-node-top-level-p (node &optional type)
-  "Return non-nil if NODE is top-level, nil otherwise.
+  "Return non-nil if NODE is top-level, and nil otherwise.
 Being top-level means there is no parent of NODE that has the
 same type.
 
@@ -213,8 +215,10 @@ treesit-node-top-level-p
 
 (defun treesit-buffer-root-node (&optional language)
   "Return the root node of the current buffer.
-Use the first parser in (`treesit-parser-list'), if LANGUAGE is
-non-nil, use the first parser for LANGUAGE."
+Use the first parser in `treesit-parser-list'.
+
+If optional argument LANGUAGE is non-nil, use the first parser
+for LANGUAGE."
   (if-let ((parser
             (or (if language
                     (or (treesit-parser-create language)
@@ -224,9 +228,10 @@ treesit-buffer-root-node
       (treesit-parser-root-node parser)))
 
 (defun treesit-filter-child (node pred &optional named)
-  "Return children of NODE that satisfies PRED.
-PRED is a function that takes one argument, the child node.  If
-NAMED non-nil, only search for named node."
+  "Return children of NODE that satisfies predicate PRED.
+PRED is a function that takes one argument, the child node.
+If optional argument NAMED is non-nil, only search for named
+node."
   (let ((child (treesit-node-child node 0 named))
         result)
     (while child
@@ -237,7 +242,8 @@ treesit-filter-child
 
 (defun treesit-node-text (node &optional no-property)
   "Return the buffer (or string) content corresponding to NODE.
-If NO-PROPERTY is non-nil, remove text properties."
+If optional argument NO-PROPERTY is non-nil, remove text
+properties."
   (when node
     (with-current-buffer (treesit-node-buffer node)
       (if no-property
@@ -250,8 +256,8 @@ treesit-node-text
 
 (defun treesit-parent-until (node pred)
   "Return the closest parent of NODE that satisfies PRED.
-Return nil if none found.  PRED should be a function that takes
-one argument, the parent node."
+Return nil if none was found.  PRED should be a function that
+takes one argument, the parent node."
   (let ((node (treesit-node-parent node)))
     (while (and node (not (funcall pred node)))
       (setq node (treesit-node-parent node)))
@@ -259,8 +265,8 @@ treesit-parent-until
 
 (defun treesit-parent-while (node pred)
   "Return the furthest parent of NODE that satisfies PRED.
-Return nil if none found.  PRED should be a function that takes
-one argument, the parent node."
+Return nil if none was found.  PRED should be a function that
+takes one argument, the parent node."
   (let ((last nil))
     (while (and node (funcall pred node))
       (setq last node
@@ -373,7 +379,7 @@ treesit-font-lock-feature-list
 Removing a feature symbol from this list disables the
 corresponding query during font-lock.
 
-Common feature names (for general programming language) include
+Common feature names (for general programming languages) include
 function-name, type, variable-name (LHS of assignments), builtin,
 constant, keyword, string-interpolation, comment, doc, string,
 operator, preprocessor, escape-sequence, key (in key-value
@@ -399,7 +405,7 @@ treesit-font-lock-settings
 For SETTING to be activated for font-lock, ENABLE must be t.  To
 disable this SETTING, set ENABLE to nil.
 
-FEATURE is the \"feature name\" of the query, users can control
+FEATURE is the \"feature name\" of the query.  Users can control
 which features are enabled with `font-lock-maximum-decoration'
 and `treesit-font-lock-feature-list'.
 
@@ -513,7 +519,7 @@ treesit-font-lock-rules
 
 (defun treesit-font-lock-recompute-features ()
   "Enable/disable font-lock settings according to decoration level.
-Sets the ENABLE flag for each setting in
+Set the ENABLE flag for each setting in
 `treesit-font-lock-settings', according to
 `treesit-font-lock-feature-list' and
 `font-lock-maximum-decoration'."
@@ -535,7 +541,7 @@ treesit-font-lock-recompute-features
 (defun treesit-font-lock-fontify-region
     (start end &optional loudly)
   "Fontify the region between START and END.
-If LOUDLY is non-nil, message some debugging information."
+If LOUDLY is non-nil, display some debugging information."
   (treesit-update-ranges start end)
   (font-lock-unfontify-region start end)
   (dolist (setting treesit-font-lock-settings)
@@ -954,7 +960,7 @@ treesit-search-forward-goto
     (node predicate &optional start backward all)
   "Search forward for a node and move to its end position.
 
-Stops at the first node after NODE that matches PREDICATE.
+Stop at the first node after NODE that matches PREDICATE.
 PREDICATE can be either a regexp that matches against each node's
 type case-insensitively, or a function that takes a node and
 returns nil/non-nil for match/no match.
@@ -1020,7 +1026,7 @@ treesit--find-top-level-match
 
 (defun treesit-beginning-of-defun (&optional arg)
   "Tree-sitter `beginning-of-defun' function.
-ARG is the same as in `beginning-of-defun."
+ARG is the same as in `beginning-of-defun'."
   (let ((arg (or arg 1))
         (node (treesit-node-at (point))))
     (if (> arg 0)
@@ -1105,8 +1111,8 @@ treesit-ready-p
 If MODE is nil, don't check for user setting and assume the
 setting is t.
 
-LANGUAGE is languages symbol we want check for availability.  It
-can also be a list of language symbols."
+LANGUAGE is the language symbol we want check for availability.
+It can also be a list of language symbols."
   (let ((language-list (if (consp language)
                            language
                          (list language)))
@@ -1178,14 +1184,14 @@ treesit-major-mode-setup
 ;;; Debugging
 
 (defvar-local treesit--inspect-name nil
-  "treesit-inspect-mode uses this to show node name in mode-line.")
+  "Used by `treesit-inspect-mode' to show node name in mode-line.")
 
 (defun treesit-inspect-node-at-point (&optional arg)
   "Show information of the node at point.
 If called interactively, show in echo area, otherwise set
 `treesit--inspect-name' (which will appear in the mode-line
 if `treesit-inspect-mode' is enabled).  Uses the first parser
-in (`treesit-parser-list')."
+in `treesit-parser-list'."
   (interactive "p")
   ;; NODE-LIST contains all the node that starts at point.
   (let* ((node-list
@@ -1230,7 +1236,7 @@ treesit-inspect-node-at-point
         (message "No node at point")))))
 
 (define-minor-mode treesit-inspect-mode
-  "Shows the node that _starts_ at point in the mode-line.
+  "Show the node that _starts_ at point in the mode-line.
 
 The mode-line displays
 
@@ -1241,11 +1247,11 @@ treesit-inspect-mode
 CHILD.
 
 If no node starts at point, i.e., point is in the middle of a
-node, then we just display the smallest node that spans point and
+node, then just display the smallest node that spans point and
 its immediate parent.
 
 This minor mode doesn't create parsers on its own.  It simply
-uses the first parser in (`treesit-parser-list')."
+uses the first parser in `treesit-parser-list'."
   :lighter nil
   (if treesit-inspect-mode
       (progn
@@ -1261,7 +1267,7 @@ treesit-inspect-mode
 
 (defun treesit-query-validate (language query)
   "Check if QUERY is valid for LANGUAGE.
-If QUERY is invalid, display the query in a popup buffer, jumps
+If QUERY is invalid, display the query in a popup buffer, jump
 to the offending pattern and highlight the pattern."
   (cl-assert (or (consp query) (stringp query)))
   (let ((buf (get-buffer-create "*tree-sitter check query*")))

commit 62c8c8e51a23540cd189d6b2a22dd1a1cdbbf2cb
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Oct 26 18:31:43 2022 -0700

    Plug tree-sitter-simple-indent into c-offset-alist
    
    Now tree-sitter indentation can produce a cc-engine syntax symbol and
    use c-offset-alist to compute the offset.  Catch: line-up functions
    don't work with tree-sitter.
    
    * lisp/progmodes/js.el (js--treesit-cc-indent-rules): New variable.
    (js-mode): Use cc-indent rules by default.
    * lisp/treesit.el (treesit-simple-indent-presets): Consider types as
    regexp now.  New matchers: n-p-gp, field-is, top-level, catch-all.
    New anchors: nth-sibling, grand-parent, and, or, not, list.
    first-sibling now returns the actual first sibling rather than the
    first named sibling.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 7e1d7569ca..89bd04b231 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3442,6 +3442,122 @@ js--treesit-indent-rules
      ((node-is "/") parent 0)
      ((parent-is "jsx_self_closing_element") parent ,js-indent-level))))
 
+(defvar js--treesit-cc-indent-rules
+  (let ((function-re (rx (or "function_declaration"
+                             "method_definition"
+                             "function")))
+        (if-statement-like (rx (or "if" "try" "while" "do")
+                               "_statement"))
+        (else-clause-like (rx (or "else" "catch" "finally")
+                              "_clause"))
+        (switch-case-re (rx "switch_" (or "case" "default"))))
+    `((javascript
+       ;; Function declaration.
+       ;; "{"
+       ((match "statement_block" ,function-re) parent defun-open)
+       ((n-p-gp "}" "statement_block" ,function-re) grand-parent defun-close)
+
+       ((and (node-is ,function-re) (parent-is "program"))
+        parent topmost-intro)
+       ((parent-is ,function-re) parent topmost-intro-cont)
+       ((and (n-p-gp nil "statement_block" ,function-re)
+             (match nil nil nil 0 0))
+        parent-bol defun-block-intro)
+
+       ;; Class
+       ((node-is "class_declaration") parent topmost-intro)
+       ((parent-is "class_declaration") parent topmost-intro-cont)
+       ((match "{" "class_declaration") parent class-open)
+       ((match "}" "class_declaration") parent class-close)
+
+       ((node-is "class_heritage") parent inher-intro)
+       ((parent-is "class_heritage") parent inher-cont)
+
+       ;; Javascript doesn't have class access keywords
+       ;; (`member-init-intro', `member-init-cont') I think?
+
+       ((match "{" "class_declaration") parent class-open)
+       ((match "}" "class_body") parent class-close)
+
+       ((parent-is "class_body") parent inclass)
+       ((parent-is "member_definition") parent topmost-intro-cont)
+
+       ((match "statement_block" "member_definition") parent defun-open)
+       ((n-p-gp "}" "statement_block" "member_definition")
+        grand-parent defun-close)
+
+       ;; Javascript doesn't have class parameters
+       ;; (`template-args-cont').
+
+       ;; Conditional.
+       ((match "statement_block" ,if-statement-like)
+        parent substatement-open)
+       ((match "statement_block" ,else-clause-like)
+        grand-parent substatement-open)
+       ;; Javascript doesn't have `substatement-label'.
+       ((node-is ,else-clause-like) parent else-clause)
+       ((parent-is ,else-clause-like) grand-parent substatement)
+       ((match "while" "do_statement") parent do-while-closure)
+       ((field-is "consequence") parent substatement)
+       ((field-is "condition") parent statement-cont)
+
+       ;; Switch.
+       ((node-is ,switch-case-re) grand-parent case-label)
+       ((match "statement_block" ,switch-case-re) parent statement-case-open)
+       ((match nil ,switch-case-re "body") parent statement-case-intro)
+       ((parent-is ,switch-case-re) first-sibling statement-case-cont)
+       ((node-is "switch_body") parent substatement-open)
+       ((match "}" "switch_body") grand-parent substatement-close)
+
+       ;; Brace list.
+       ((node-is "object") parent-bol brace-list-open)
+       ((match "}" "object") parent brace-list-close)
+       ;; ((match nil "object" nil 0 0) parent brace-list-intro)
+       ((match nil "object" nil 0 0) parent ,js-indent-level)
+       ((match nil "object" nil 1) first-sibling brace-list-entry)
+
+       ;; Pair.
+       ((match nil "pair" "value") parent ,js-indent-level)
+
+       ;; Javascript doesn't have extern.
+
+       ;; Parenthesis.  These syntax symbols uses line-up functions,
+       ;; which don't work with tree-sitter, so we roll our own:
+       ;; `arglist-close', `arglist-intro', `arglist-cont',
+       ;; `arglist-cont-nonempty'.
+       ((parent-is "formal_parameters") first-sibling 1)
+       ((node-is "formal_parameters") parent statement-cont)
+
+       ;; Misc.
+       ((parent-is "function_declaration") parent func-decl-cont)
+       ((parent-is "string-fragment") grand-parent string)
+       ((parent-is "comment") grand-parent c)
+
+       ;; Fallback for top-level statements.
+       ((parent-is "program") parent 0)
+
+       ;; Fallback for blocks & statements.
+       ((parent-is "expression_statement") parent statement-cont)
+       ((match "}" "statement_block") parent-bol block-close)
+       ((match "statement_block" "statement_block") parent block-open)
+       ((match nil "statement_block" nil 0 0) parent-bol statement-block-intro)
+       ((parent-is "statement_block") prev-sibling statement)
+
+       ;; Template substitution.
+       ((match "}" "template_substitution") parent-bol block-close)
+       ((match nil "template_substitution" nil 0 0) parent-bol statement-block-intro)
+       ((parent-is "template_substitution") prev-sibling statement)
+
+       ;; JSX, copied from `js--treesit-indent-rules' (TODO).
+       ((parent-is "jsx_opening_element") parent ,js-indent-level)
+       ((node-is "jsx_closing_element") parent 0)
+       ((node-is "jsx_text") parent ,js-indent-level)
+       ((parent-is "jsx_element") parent ,js-indent-level)
+       ((node-is "/") parent 0)
+       ((parent-is "jsx_self_closing_element") parent ,js-indent-level)
+
+       (catch-all parent-bol statement-cont)))))
+
 (defvar js--treesit-keywords
   '("as" "async" "await" "break" "case" "catch" "class" "const" "continue"
     "debugger" "default" "delete" "do" "else" "export" "extends" "finally"
@@ -3762,7 +3878,7 @@ js-mode
    ((treesit-ready-p 'js-mode 'javascript)
     (treesit-parser-create 'javascript)
     ;; Indent.
-    (setq-local treesit-simple-indent-rules js--treesit-indent-rules)
+    (setq-local treesit-simple-indent-rules js--treesit-cc-indent-rules)
     ;; Navigation.
     (setq-local treesit-defun-type-regexp
                 (rx (or "class_declaration"
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 5c89a63bf6..8700cb88f2 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -640,28 +640,49 @@ treesit-simple-indent-presets
                           node-index-min node-index-max)
                `(lambda (node parent bol &rest _)
                   (and (or (null ,node-type)
-                           (equal (treesit-node-type node)
-                                  ,node-type))
+                           (string-match-p
+                            ,node-type (or (treesit-node-type node) "")))
                        (or (null ,parent-type)
-                           (equal (treesit-node-type parent)
-                                  ,parent-type))
+                           (string-match-p
+                            ,parent-type (treesit-node-type parent)))
                        (or (null ,node-field)
-                           (equal (treesit-node-field-name node)
-                                  ,node-field))
+                           (string-match-p
+                            ,node-field
+                            (or (treesit-node-field-name node) "")))
                        (or (null ,node-index-min)
                            (>= (treesit-node-index node t)
                                ,node-index-min))
                        (or (null ,node-index-max)
                            (<= (treesit-node-index node t)
                                ,node-index-max))))))
+    (n-p-gp . (lambda (node-t parent-t grand-parent-t)
+                `(lambda (node parent bol &rest _)
+                   (and (or (null ,node-t)
+                            (string-match-p
+                             ,node-t (or (treesit-node-type node) "")))
+                        (or (null ,parent-t)
+                            (string-match-p
+                             ,parent-t (treesit-node-type parent)))
+                        (or (null ,grand-parent-t)
+                            (string-match-p
+                             ,grand-parent-t
+                             (treesit-node-type
+                              (treesit-node-parent parent))))))))
     (no-node . (lambda (node parent bol &rest _) (null node)))
     (parent-is . (lambda (type)
                    `(lambda (node parent bol &rest _)
-                      (equal ,type (treesit-node-type parent)))))
+                      (string-match-p
+                       ,type (treesit-node-type parent)))))
 
     (node-is . (lambda (type)
                  `(lambda (node parent bol &rest _)
-                    (equal ,type (treesit-node-type node)))))
+                    (string-match-p
+                     ,type (or (treesit-node-type node) "")))))
+    (field-is . (lambda (name)
+                  `(lambda (node parent bol &rest _)
+                     (string-match-p
+                      ,name (or (treesit-node-field-name node) "")))))
+    (catch-all . (lambda (&rest _) t))
 
     (query . (lambda (pattern)
                `(lambda (node parent bol &rest _)
@@ -673,10 +694,15 @@ treesit-simple-indent-presets
                            finally return nil))))
     (first-sibling . (lambda (node parent bol &rest _)
                        (treesit-node-start
-                        (treesit-node-child parent 0 t))))
-
+                        (treesit-node-child parent 0))))
+    (nth-sibling . (lambda (n &optional named)
+                     `(lambda (node parent bol &rest _)
+                        (treesit-node-start
+                         (treesit-node-child parent ,n ,named)))))
     (parent . (lambda (node parent bol &rest _)
                 (treesit-node-start parent)))
+    (grand-parent . (lambda (node parent bol &rest _)
+                      (treesit-node-start (treesit-node-parent parent))))
     (parent-bol . (lambda (node parent bol &rest _)
                     (save-excursion
                       (goto-char (treesit-node-start parent))
@@ -690,7 +716,28 @@ treesit-simple-indent-presets
                    (save-excursion
                      (goto-char bol)
                      (forward-line -1)
-                     (skip-chars-forward " \t")))))
+                     (skip-chars-forward " \t"))))
+    (and . (lambda (&rest fns)
+             `(lambda (node parent bol &rest _)
+                (cl-reduce (lambda (a b) (and a b))
+                           (mapcar (lambda (fn)
+                                     (funcall fn node parent bol))
+                                   ',fns)))))
+    (or . (lambda (&rest fns)
+            `(lambda (node parent bol &rest _)
+               (cl-reduce (lambda (a b) (or a b))
+                          (mapcar (lambda (fn)
+                                    (funcall fn node parent bol))
+                                  ',fns)))))
+    (not . (lambda (fn)
+             `(lambda (node parent bol &rest _)
+                (debug)
+                (not (funcall ,fn node parent bol)))))
+    (list . (lambda (&rest fns)
+              `(lambda (node parent bol &rest _)
+                 (mapcar (lambda (fn)
+                           (funcall fn node parent bol))
+                         ',fns)))))
   "A list of presets.
 These presets that can be used as MATHER and ANCHOR in
 `treesit-simple-indent-rules'.
@@ -753,25 +800,31 @@ treesit-simple-indent-presets
 
     The first non-whitespace charater on the previous line.")
 
-(defun treesit--simple-apply (fn args)
-  "Apply ARGS to FN.
+(defun treesit--simple-indent-eval (exp)
+  "Evaluate EXP.
 
-If FN is a key in `treesit-simple-indent-presets', use the
-corresponding value as the function."
+If EXPis an application and the function is a key in
+`treesit-simple-indent-presets', use the corresponding value as
+the function."
   ;; We don't want to match uncompiled lambdas, so make sure this cons
   ;; is not a function.  We could move the condition functionp
   ;; forward, but better be explicit.
-  (cond ((and (consp fn) (not (functionp fn)))
-         (apply (treesit--simple-apply (car fn) (cdr fn))
-                ;; We don't evaluate ARGS with `simple-apply', i.e.,
-                ;; no composing, better keep it simple.
-                args))
-        ((and (symbolp fn)
-              (alist-get fn treesit-simple-indent-presets))
-         (apply (alist-get fn treesit-simple-indent-presets)
-                args))
-        ((functionp fn) (apply fn args))
-        (t (error "Couldn't find the function corresponding to %s" fn))))
+  (cond ((and (consp exp) (not (functionp exp)))
+         (apply (treesit--simple-indent-eval (car exp))
+                (mapcar #'treesit--simple-indent-eval
+                        (cdr exp))))
+        ;; Presets override functions, so this condition comes before
+        ;; `functionp'.
+        ((alist-get exp treesit-simple-indent-presets)
+         (alist-get exp treesit-simple-indent-presets))
+        ((functionp exp) exp)
+        ((symbolp exp)
+         (if (null exp)
+             exp
+           ;; Matchers only return lambdas, anchors only return
+           ;; integer, so we should never see a variable.
+           (error "Couldn't find the preset corresponding to %s" exp)))
+        (t exp)))
 
 ;; This variable might seem unnecessary: why split
 ;; `treesit-indent' and `treesit-simple-indent' into two
@@ -846,6 +899,8 @@ treesit-indent
                 (indent-line-to col))
             (indent-line-to col)))))))
 
+(declare-function c-calc-offset "cc-engine")
+
 (defun treesit-simple-indent (node parent bol)
   "Calculate indentation according to `treesit-simple-indent-rules'.
 
@@ -866,14 +921,19 @@ treesit-simple-indent
                for pred = (nth 0 rule)
                for anchor = (nth 1 rule)
                for offset = (nth 2 rule)
-               if (treesit--simple-apply
-                   pred (list node parent bol))
+               if (treesit--simple-indent-eval
+                   (list pred node parent bol))
                do (when treesit--indent-verbose
                     (message "Matched rule: %S" rule))
                and
-               return (cons (treesit--simple-apply
-                             anchor (list node parent bol))
-                            offset)))))
+               return
+               (let ((anchor-pos
+                      (treesit--simple-indent-eval
+                       (list anchor node parent bol))))
+                 (cons anchor-pos
+                       (if (integerp offset)
+                           offset
+                         (c-calc-offset (list offset anchor-pos)))))))))
 
 (defun treesit-check-indent (mode)
   "Check current buffer's indentation against a major mode MODE.

commit 5532ae81cff138a2f6d30c3541210311a4894ac1
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Oct 26 18:31:07 2022 -0700

    * lisp/treesit.el (treesit-node-top-level-p): New argument TYPE.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index f07fe7d609..5c89a63bf6 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -195,15 +195,19 @@ treesit-node-on
                 (treesit-buffer-root-node parser-or-lang))))
     (treesit-node-descendant-for-range root beg (or end beg) named)))
 
-(defun treesit-node-top-level-p (node)
+(defun treesit-node-top-level-p (node &optional type)
   "Return non-nil if NODE is top-level, nil otherwise.
 Being top-level means there is no parent of NODE that has the
-same type."
+same type.
+
+If TYPE is non-nil, match each parent's type with TYPE as a regexp."
   (when node
     (catch 'term
-      (let ((type (treesit-node-type node)))
+      (let ((plain-type (treesit-node-type node)))
         (while (setq node (treesit-node-parent node))
-          (when (equal (treesit-node-type node) type)
+          (when (if type
+                    (string-match-p type (treesit-node-type node))
+                  (equal (treesit-node-type node) plain-type))
             (throw 'term nil))))
       t)))
 

commit 76b86d98534da2c9e6cf8fd1c7edcbe53d84eb82
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Oct 26 18:06:07 2022 -0700

    Generalize js--treesit-imenu-top-level-p
    
    * lisp/progmodes/js.el (js--treesit-imenu-top-level-p): Move.
    (js--treesit-font-lock-settings): Fix usage.
    * lisp/treesit.el (treesit-node-top-level-p): Move to here.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 8802ea0b5f..7e1d7569ca 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3601,18 +3601,6 @@ js-treesit-current-defun
              do (setq node (treesit-node-parent node))
              finally return  (string-join name-list "."))))
 
-(defun js--treesit-imenu-top-level-p (node)
-  "Return t if NODE is top-level, nil otherwise.
-Being top-level means there is no parent of NODE that has the
-same type."
-  (when node
-    (catch 'term
-      (let ((type (treesit-node-type node)))
-        (while (setq node (treesit-node-parent node))
-          (when (equal (treesit-node-type node) type)
-            (throw 'term nil))))
-      t)))
-
 ;; Keep this private since we might later change it or generalize it.
 (defvar js--treesit-imenu-type-alist
   '((variable . "V")
@@ -3673,7 +3661,7 @@ js--treesit-imenu-1
      ((null ts-node)
       subtrees)
      ((and (eq type 'variable)
-           (not (js--treesit-imenu-top-level-p ts-node)))
+           (not (treesit-node-top-level-p ts-node)))
       nil)
      (subtrees
       (let ((parent-label (js--treesit-imenu-label type name))
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 8426a02a26..f07fe7d609 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -195,6 +195,18 @@ treesit-node-on
                 (treesit-buffer-root-node parser-or-lang))))
     (treesit-node-descendant-for-range root beg (or end beg) named)))
 
+(defun treesit-node-top-level-p (node)
+  "Return non-nil if NODE is top-level, nil otherwise.
+Being top-level means there is no parent of NODE that has the
+same type."
+  (when node
+    (catch 'term
+      (let ((type (treesit-node-type node)))
+        (while (setq node (treesit-node-parent node))
+          (when (equal (treesit-node-type node) type)
+            (throw 'term nil))))
+      t)))
+
 (defun treesit-buffer-root-node (&optional language)
   "Return the root node of the current buffer.
 Use the first parser in (`treesit-parser-list'), if LANGUAGE is

commit c352392420236d4fa7a8ac7f324f1a0358ad3584
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Oct 26 15:38:40 2022 -0700

    Add tree-sitter navigation support to python-mode
    
    * lisp/progmodes/python.el (python-mode): Set
    treesit-defun-type-regexp.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 2c0c35174c..9783936635 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -6473,6 +6473,10 @@ python-mode
     (setq-local treesit-font-lock-settings python--treesit-settings)
     (setq-local imenu-create-index-function
                 #'python-imenu-treesit-create-index)
+    (setq-local treesit-defun-type-regexp (rx bol
+                                              (or "function" "class")
+                                              "_definition"
+                                              eol))
     (treesit-major-mode-setup))
    ;; Elisp.
    (t

commit 6fb6cb075f05629a562275064851bef6b72d5dd2
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Oct 26 15:36:15 2022 -0700

    Add tree-sitter imenu support for js-mode and ts-mode
    
    js-mode's current imenu is pretty plain and incomplete, so I took the
    liberty to add a bit more flair to it.
    
    * lisp/progmodes/js.el (js--treesit-imenu-type-alist): New variable.
    (js--treesit-imenu-top-level-p)
    (js--treesit-imenu-label)
    (js--treesit-imenu-1)
    (js--treesit-imenu): New functions.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 1d53a624a7..8802ea0b5f 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3601,6 +3601,99 @@ js-treesit-current-defun
              do (setq node (treesit-node-parent node))
              finally return  (string-join name-list "."))))
 
+(defun js--treesit-imenu-top-level-p (node)
+  "Return t if NODE is top-level, nil otherwise.
+Being top-level means there is no parent of NODE that has the
+same type."
+  (when node
+    (catch 'term
+      (let ((type (treesit-node-type node)))
+        (while (setq node (treesit-node-parent node))
+          (when (equal (treesit-node-type node) type)
+            (throw 'term nil))))
+      t)))
+
+;; Keep this private since we might later change it or generalize it.
+(defvar js--treesit-imenu-type-alist
+  '((variable . "V")
+    (function . "F")
+    (class . "C")
+    (method . "M"))
+  "Maps imenu label types to their \"symbol\".
+Symbols are prefixed to each label in imenu (see
+`js--treesit-imenu-label').")
+
+(defun js--treesit-imenu-label (type name)
+  "Format label for imenu.
+TYPE can be `variable', `function', `class', `method'.
+NAME is a string."
+  (format "%s %s" (alist-get type js--treesit-imenu-type-alist)
+          name))
+
+(defun js--treesit-imenu-1 (node)
+  "Given a sparse tree, create an imenu alist.
+
+NODE is the root node of the tree returned by
+`treesit-induce-sparse-tree' (not a tree-sitter node, its car is
+a tree-sitter node).  Walk that tree and return an imenu alist.
+
+Return a list of ENTRY where
+
+ENTRY := (NAME . MARKER)
+       | (NAME . ((JUMP-LABEL . MARKER)
+                  ENTRY
+                  ...)
+
+NAME is the function/class's name, JUMP-LABEL is like \"*function
+definition*\"."
+  (let* ((ts-node (car node))
+         (children (cdr node))
+         (subtrees (mapcan #'js--treesit-imenu-1
+                           children))
+         (type (pcase (treesit-node-type ts-node)
+                 ("lexical_declaration" 'variable)
+                 ("class_declaration" 'class)
+                 ("method_definition" 'method)
+                 ("function_declaration" 'function)))
+         ;; The root of the tree could have a nil ts-node.
+         (name (when ts-node
+                 (let ((ts-node-1
+                        (if (eq type 'variable)
+                            (treesit-search-subtree
+                             ts-node "variable_declarator" nil nil 1)
+                          ts-node)))
+                   (treesit-node-text
+                    (treesit-node-child-by-field-name
+                     ts-node-1 "name")
+                    t))))
+         (marker (when ts-node
+                   (set-marker (make-marker)
+                               (treesit-node-start ts-node)))))
+    (cond
+     ((null ts-node)
+      subtrees)
+     ((and (eq type 'variable)
+           (not (js--treesit-imenu-top-level-p ts-node)))
+      nil)
+     (subtrees
+      (let ((parent-label (js--treesit-imenu-label type name))
+            (jump-label ""))
+        `((,parent-label
+           ,(cons jump-label marker)
+           ,@subtrees))))
+     (t (let ((label (js--treesit-imenu-label type name)))
+          (list (cons label marker)))))))
+
+(defun js--treesit-imenu ()
+  "Return Imenu alist for the current buffer."
+  (let* ((node (treesit-buffer-root-node))
+         (tree (treesit-induce-sparse-tree
+                node (rx (or "class_declaration"
+                             "method_definition"
+                             "function_declaration"
+                             "lexical_declaration")))))
+    (js--treesit-imenu-1 tree)))
+
 ;;; Main Function
 
 ;;;###autoload
@@ -3679,6 +3772,7 @@ js-mode
   (cond
    ;; Tree-sitter.
    ((treesit-ready-p 'js-mode 'javascript)
+    (treesit-parser-create 'javascript)
     ;; Indent.
     (setq-local treesit-simple-indent-rules js--treesit-indent-rules)
     ;; Navigation.
@@ -3690,6 +3784,11 @@ js-mode
     ;; Fontification.
     (setq-local treesit-font-lock-settings js--treesit-font-lock-settings)
     (setq-local treesit-font-lock-feature-list '((minimal) (moderate) (full)))
+    ;; Imenu
+    (setq-local imenu-create-index-function
+                #'js--treesit-imenu)
+    ;; Which-func (use imenu).
+    (setq-local which-func-functions nil)
     (treesit-major-mode-setup))
    ;; Elisp.
    (t
diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el
index f2002f9ef7..28800e378a 100644
--- a/lisp/progmodes/ts-mode.el
+++ b/lisp/progmodes/ts-mode.el
@@ -278,6 +278,10 @@ ts-mode
     ;; Font-lock.
     (setq-local treesit-font-lock-settings ts-mode--font-lock-settings)
     (setq-local treesit-font-lock-feature-list '((minimal) (moderate) (full)))
+    ;; Imenu.
+    (setq-local imenu-create-index-function #'js--treesit-imenu)
+    ;; Which-func (use imenu).
+    (setq-local which-func-functions nil)
     (treesit-major-mode-setup))
    ;; Elisp.
    (t

commit 734df28368c7f7c21b1068a67d4ae89e64d4a3d3
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Oct 26 15:34:02 2022 -0700

    Fix tree-sitter navigation
    
    * lisp/treesit.el (treesit-search-forward-goto): Track current
    position with a local variable instead of (point).  Clean up the
    condition forms.
    (treesit-beginning-of-defun): Fix traverse direction.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index c6b396494b..8426a02a26 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -892,9 +892,10 @@ treesit-search-forward-goto
 the returned node is always greater than that of NODE.
 
 BACKWARD and ALL are the same as in `treesit-search-forward'."
-  (when-let ((start-pos (if start
-                            (treesit-node-start node)
-                          (treesit-node-end node))))
+  (when-let* ((start-pos (if start
+                             (treesit-node-start node)
+                           (treesit-node-end node)))
+              (current-pos start-pos))
     ;; When searching forward and stopping at beginnings, or search
     ;; backward stopping at ends, it is possible to "roll back" in
     ;; position.  Take three nodes N1, N2, N3 as an example, if we
@@ -905,19 +906,21 @@ treesit-search-forward-goto
     ;;   |<--------N1------->|
     ;;   |<--N2-->| |<--N3-->|
     (while (and node (if backward
-                         (>= (point) start-pos)
-                       (<= (point) start-pos)))
+                         (>= current-pos start-pos)
+                       (<= current-pos start-pos)))
       (setq node (treesit-search-forward
                   node predicate backward all))
-      (if-let ((pos (if start
-                        (treesit-node-start node)
-                      (treesit-node-end node))))
-          (goto-char pos)))
-    ;; If we made reverse progress, go back to where we started.
-    (when (if backward
-              (>= (point) start-pos)
-            (<= (point) start-pos))
-      (goto-char start-pos))
+      (setq current-pos (if start
+                            (treesit-node-start node)
+                          (treesit-node-end node))))
+    (cond
+     ;; When there is a match and match made progress, go to the
+     ;; result position.
+     ((and node
+           (if backward
+               (< current-pos (point))
+             (> current-pos (point))))
+      (goto-char current-pos)))
     node))
 
 ;;; Navigation
@@ -955,11 +958,13 @@ treesit-beginning-of-defun
       ;; Go forward.
       (while (and (< arg 0)
                   (setq node (treesit-search-forward-goto
-                              node treesit-defun-type-regexp t t)))
+                              node treesit-defun-type-regexp)))
         (setq node (treesit--find-top-level-match
                     node treesit-defun-type-regexp))
         (setq arg (1+ arg))))
-    (goto-char (treesit-node-start node))))
+    (when node
+      (goto-char (treesit-node-start node))
+      t)))
 
 (defun treesit-end-of-defun ()
   "Tree-sitter `end-of-defun' function."

commit e868955bff3b97bad88bd09b4401e87cab94011c
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Oct 25 22:48:30 2022 -0700

    * src/treesit.c (treesit_search_dfs): Fix traverse algorithm.

diff --git a/src/treesit.c b/src/treesit.c
index 0f949b7554..cd1af3f52d 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2455,7 +2455,8 @@ treesit_search_dfs (TSNode *root, Lisp_Object pred, Lisp_Object parser,
       for (int offset = 0; offset < count; offset++)
 	{
 	  uint32_t idx = forward ? offset : count - offset - 1;
-	  TSNode child = ts_node_child (node, idx);
+	  TSNode child =
+	    named ? ts_node_named_child (node, idx) : ts_node_child (node, idx);
 
 	  if (!ts_node_is_null (child)
 	      && treesit_search_dfs (&child, pred, parser, named,

commit 5c1b9e65b9d1c73ccc4ce18842d10bc507cdee38
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Oct 25 20:28:40 2022 -0700

    ; * src/treesit.c (treesit_search_forward): Fix comment.

diff --git a/src/treesit.c b/src/treesit.c
index 9136539b8b..0f949b7554 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2469,7 +2469,7 @@ treesit_search_dfs (TSNode *root, Lisp_Object pred, Lisp_Object parser,
     }
 }
 
-/* Go thought the whole tree linearly depth first, starting from
+/* Go thought the whole tree linearly, leaf-first, starting from
    START.  PRED, PARSER, NAMED, FORWARD are the same as in
    ts_search_subtre.  If UP_ONLY is true, never go to children, only
    sibling and parents.  */

commit c9df4cace0f88197e69ae45d18bfc1692eecca05
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Oct 25 19:49:03 2022 -0700

    * src/treesit.c (treesit_search_forward): Fix traverses algorithm.

diff --git a/src/treesit.c b/src/treesit.c
index 3ac0a0c7b2..9136539b8b 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2504,7 +2504,7 @@ treesit_search_forward (TSNode *start, Lisp_Object pred, Lisp_Object parser,
 	}
       /* We are at the next sibling, deep dive into the first leaf
 	 node.  */
-      TSNode next_next = ts_node_child (next, 0);
+      TSNode next_next = treesit_traverse_child_helper (next, forward, named);
       while (!ts_node_is_null (next_next))
 	{
 	  next = next_next;

commit 1f74e9112e28faa57a7bf56547a9ebf8f6618273
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Oct 25 19:46:58 2022 -0700

    Don't disable parse cache in tree-sitter activated js-mode
    
    * lisp/progmodes/js.el (js-mode): Move parse cache setup back.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 4ccdab0d92..1d53a624a7 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3622,6 +3622,9 @@ js-mode
   (setq-local fill-paragraph-function #'js-fill-paragraph)
   (setq-local normal-auto-fill-function #'js-do-auto-fill)
 
+  ;; Parse cache
+  (add-hook 'before-change-functions #'js--flush-caches t t)
+
   ;; Frameworks
   (js--update-quick-match-re)
 
@@ -3704,9 +3707,7 @@ js-mode
               #'syntax-propertize-multiline 'append 'local)
     (add-hook 'syntax-propertize-extend-region-functions
               #'js--syntax-propertize-extend-region 'append 'local)
-
-    ;; Parse cache
-    (add-hook 'before-change-functions #'js--flush-caches t t))))
+    )))
 
 (defvar js-json--treesit-font-lock-settings
   (treesit-font-lock-rules

commit 5070278539a8e47988cd9529c9c2e4ada8c92472
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Oct 25 14:27:23 2022 -0700

    * lisp/treesit.el (treesit-simple-indent-rules): Make buffer-local.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 2200b23ce7..c6b396494b 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -592,10 +592,7 @@ treesit-font-lock-enable
 (defvar treesit--indent-verbose nil
   "If non-nil, log progress when indenting.")
 
-;; This is not bound locally like we normally do with major-mode
-;; stuff, because for tree-sitter, a buffer could contain more than
-;; one language.
-(defvar treesit-simple-indent-rules nil
+(defvar-local treesit-simple-indent-rules nil
   "A list of indent rule settings.
 Each indent rule setting should be (LANGUAGE . RULES),
 where LANGUAGE is a language symbol, and RULES is a list of

commit e5043db2f1f3d0ce6618eb45419e85f0d58fbf19
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Oct 25 14:26:41 2022 -0700

    Fix treesit-language-at
    
    * lisp/treesit.el (treesit-language-at-point-function): New local
    variable.
    (treesit-language-at): Change to use
    treesit-language-at-point-function rather than trying each parser
    one-by-one.
    * doc/lispref/parsing.texi (Multiple Languages): Update manual.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index bd80357957..3648ad2f26 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -1407,13 +1407,6 @@ Multiple Languages
 @code{treesit-query-error} error if @var{query} is malformed.
 @end defun
 
-@defun treesit-language-at pos
-This function tries to figure out which language is responsible for
-the text at buffer position @var{pos}.  It goes over each parser in
-@code{(treesit-parser-list)} to find a parser whose ranges cover
-@var{pos}.
-@end defun
-
 @defvar treesit-range-functions
 This variable holds the list of range functions.  Font-locking and
 indenting code use functions in this list to set correct ranges for
@@ -1440,6 +1433,19 @@ Multiple Languages
 @var{start} and @var{end} are passed to each range function.
 @end defun
 
+@vindex treesit-language-at-point-function
+@defun treesit-language-at pos
+This function tries to figure out which language is responsible for
+the text at buffer position @var{pos}.  Under the hood it just calls
+@code{treesit-language-at-point-function}.
+
+Various Lisp programs use this function.  For example, the indentation
+program uses this function to determine which language's rule to use
+in a multi-language buffer.  So it is important to provide
+@code{treesit-language-at-point-function} for a multi-language major
+mode.
+@end defun
+
 @heading An example
 
 Normally, in a set of languages that can be mixed together, there is a
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 86cff52af2..2200b23ce7 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -88,11 +88,18 @@ treesit-parse-string
     (treesit-parser-root-node
      (treesit-parser-create language))))
 
+(defvar-local treesit-language-at-point-function nil
+  "A function that returns the language at point.
+This is used by `treesit-language-at', which is used by various
+functions to determine which parser to use at point.
+
+The function is called with the position of point.")
+
 (defun treesit-language-at (pos)
-  "Return the language used at position POS."
-  (cl-loop for parser in (treesit-parser-list)
-           if (treesit-node-on pos pos parser)
-           return (treesit-parser-language parser)))
+  "Return the language at POS.
+Assumes parser ranges are up-to-date."
+  (when treesit-language-at-point-function
+    (funcall treesit-language-at-point-function pos)))
 
 (defun treesit-set-ranges (parser-or-lang ranges)
   "Set the ranges of PARSER-OR-LANG to RANGES."
@@ -790,9 +797,12 @@ treesit-indent
                 (skip-chars-forward " \t")
                 (point)))
          (smallest-node
-          (cl-loop for parser in (treesit-parser-list)
-                   for node = (treesit-node-at bol parser)
-                   if node return node))
+          (cond ((null (treesit-parser-list)) nil)
+                ((eq 1 (length (treesit-parser-list)))
+                 (treesit-node-at bol))
+                ((treesit-language-at (point))
+                 (treesit-node-at bol (treesit-language-at (point))))
+                (t (treesit-node-at bol))))
          (node (treesit-parent-while
                 smallest-node
                 (lambda (node)

commit 7c5d4348330b206aff1f8e5bc4fd241d6a6dc0b5
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Oct 25 13:54:12 2022 -0700

    New tree-sitter toggle scheme
    
    This version: central variable, everything controlled by
    treesit-settings.  Major mode sets up tree-sitter/non-tree-sitter
    in a conditional branch, based on the setting.
    
    * lisp/treesit.el (treesit-settings): New option.
    (treesit-defun-type-regexp): Change docstring.
    (treesit-mode-supported)
    (treesit-required-languages)
    (treesit--local-variable-backup): Remove variables.
    (treesit--backup-local-variable)
    (treesit-mode)
    (global-treesit-mode--turn-on)
    (global-treesit-mode): Remove functions.
    (treesit--setting-for-mode): New function.
    (treesit-ready-p): New argument MODE, changed REPORT to QUIET, and
    LANGUAGEs to LANGUAGE (now it can be a single symbol or a list of
    them).
    (treesit-major-mode-setup): New function.  Mostly comes from
    treesit-mode.
    
    * test/src/treesit-tests.el (treesit-misc): New test.
    
    * lisp/progmodes/python.el (python-mode): Move some setup code into
    the conditional branch at the end.
    
    * lisp/progmodes/js.el (js-json-mode)
    (js-mode): Move some setup code into the conditional branch at the
    end.
    
    * lisp/progmodes/ts-mode.el: Move tree-sitter setup into the
    conditional branch.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 52160fbb5e..4ccdab0d92 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3609,19 +3609,7 @@ js-mode
   :group 'js
   ;; Ensure all CC Mode "lang variables" are set to valid values.
   (c-init-language-vars js-mode)
-  (setq-local indent-line-function #'js-indent-line)
-  (setq-local beginning-of-defun-function #'js-beginning-of-defun)
-  (setq-local end-of-defun-function #'js-end-of-defun)
   (setq-local open-paren-in-column-0-is-defun-start nil)
-  (setq-local font-lock-defaults
-              (list js--font-lock-keywords nil nil nil nil
-                    '(font-lock-syntactic-face-function
-                      . js-font-lock-syntactic-face-function)))
-  (setq-local syntax-propertize-function #'js-syntax-propertize)
-  (add-hook 'syntax-propertize-extend-region-functions
-            #'syntax-propertize-multiline 'append 'local)
-  (add-hook 'syntax-propertize-extend-region-functions
-            #'js--syntax-propertize-extend-region 'append 'local)
   (setq-local prettify-symbols-alist js--prettify-symbols-alist)
 
   (setq-local parse-sexp-ignore-comments t)
@@ -3634,9 +3622,6 @@ js-mode
   (setq-local fill-paragraph-function #'js-fill-paragraph)
   (setq-local normal-auto-fill-function #'js-do-auto-fill)
 
-  ;; Parse cache
-  (add-hook 'before-change-functions #'js--flush-caches t t)
-
   ;; Frameworks
   (js--update-quick-match-re)
 
@@ -3688,17 +3673,40 @@ js-mode
   ;; calls to syntax-propertize wherever it's really needed.
   ;;(syntax-propertize (point-max))
 
-  ;; Tree-sitter support.
-  (setq-local treesit-mode-supported t)
-  (setq-local treesit-required-languages '(javascript))
-  (setq-local treesit-simple-indent-rules js--treesit-indent-rules)
-  (setq-local treesit-defun-type-regexp
-              (rx (or "class_declaration"
-                      "method_definition"
-                      "function_declaration"
-                      "lexical_declaration")))
-  (setq-local treesit-font-lock-settings js--treesit-font-lock-settings)
-  (setq-local treesit-font-lock-feature-list '((minimal) (moderate) (full))))
+  (cond
+   ;; Tree-sitter.
+   ((treesit-ready-p 'js-mode 'javascript)
+    ;; Indent.
+    (setq-local treesit-simple-indent-rules js--treesit-indent-rules)
+    ;; Navigation.
+    (setq-local treesit-defun-type-regexp
+                (rx (or "class_declaration"
+                        "method_definition"
+                        "function_declaration"
+                        "lexical_declaration")))
+    ;; Fontification.
+    (setq-local treesit-font-lock-settings js--treesit-font-lock-settings)
+    (setq-local treesit-font-lock-feature-list '((minimal) (moderate) (full)))
+    (treesit-major-mode-setup))
+   ;; Elisp.
+   (t
+    ;; Ensure all CC Mode "lang variables" are set to valid values
+    ;; (continued).
+    (setq-local indent-line-function #'js-indent-line)
+    (setq-local beginning-of-defun-function #'js-beginning-of-defun)
+    (setq-local end-of-defun-function #'js-end-of-defun)
+    (setq-local font-lock-defaults
+                (list js--font-lock-keywords nil nil nil nil
+                      '(font-lock-syntactic-face-function
+                        . js-font-lock-syntactic-face-function)))
+    (setq-local syntax-propertize-function #'js-syntax-propertize)
+    (add-hook 'syntax-propertize-extend-region-functions
+              #'syntax-propertize-multiline 'append 'local)
+    (add-hook 'syntax-propertize-extend-region-functions
+              #'js--syntax-propertize-extend-region 'append 'local)
+
+    ;; Parse cache
+    (add-hook 'before-change-functions #'js--flush-caches t t))))
 
 (defvar js-json--treesit-font-lock-settings
   (treesit-font-lock-rules
@@ -3737,11 +3745,12 @@ js-json-mode
   ;; regexp matchers nor #! thingies (and `js-enabled-frameworks' is nil).
   (setq-local syntax-propertize-function #'ignore)
 
-  ;; Tree-sitter support.
-  (setq-local treesit-mode-supported t)
-  (setq-local treesit-required-languages '(json))
-  (setq-local treesit-simple-indent-rules js--json-treesit-indent-rules)
-  (setq-local treesit-font-lock-settings js-json--treesit-font-lock-settings))
+  (cond
+   ;; Tree-sitter.
+   ((treesit-ready-p 'js-json-mode 'json)
+    (setq-local treesit-simple-indent-rules js--json-treesit-indent-rules)
+    (setq-local treesit-font-lock-settings js-json--treesit-font-lock-settings)
+    (treesit-major-mode-setup))))
 
 ;; Since we made JSX support available and automatically-enabled in
 ;; the base `js-mode' (for ease of use), now `js-jsx-mode' simply
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 4ac5f2e3b0..2c0c35174c 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -6391,15 +6391,6 @@ python-mode
 
   (setq-local forward-sexp-function python-forward-sexp-function)
 
-  (setq-local font-lock-defaults
-              `(,python-font-lock-keywords
-                nil nil nil nil
-                (font-lock-syntactic-face-function
-                 . python-font-lock-syntactic-face-function)))
-
-  (setq-local syntax-propertize-function
-              python-syntax-propertize-function)
-
   (setq-local indent-line-function #'python-indent-line-function)
   (setq-local indent-region-function #'python-indent-region)
   ;; Because indentation is not redundant, we cannot safely reindent code.
@@ -6424,14 +6415,9 @@ python-mode
   (add-hook 'post-self-insert-hook
             #'python-indent-post-self-insert-function 'append 'local)
 
-  (setq-local imenu-create-index-function
-              #'python-imenu-create-index)
-
   (setq-local add-log-current-defun-function
               #'python-info-current-defun)
 
-  (add-hook 'which-func-functions #'python-info-current-defun nil t)
-
   (setq-local skeleton-further-elements
               '((abbrev-mode nil)
                 (< '(backward-delete-char-untabify (min python-indent-offset
@@ -6479,13 +6465,27 @@ python-mode
 
   (add-hook 'flymake-diagnostic-functions #'python-flymake nil t)
 
-  (setq-local treesit-mode-supported t)
-  (setq-local treesit-required-languages '(python))
-  (setq-local treesit-font-lock-feature-list
-              '((basic) (moderate) (elaborate)))
-  (setq-local treesit-font-lock-settings python--treesit-settings)
-  (setq-local treesit-imenu-function
-              #'python-imenu-treesit-create-index))
+  (cond
+   ;; Tree-sitter.
+   ((treesit-ready-p 'python-mode 'python)
+    (setq-local treesit-font-lock-feature-list
+                '((basic) (moderate) (elaborate)))
+    (setq-local treesit-font-lock-settings python--treesit-settings)
+    (setq-local imenu-create-index-function
+                #'python-imenu-treesit-create-index)
+    (treesit-major-mode-setup))
+   ;; Elisp.
+   (t
+    (setq-local font-lock-defaults
+                `(,python-font-lock-keywords
+                  nil nil nil nil
+                  (font-lock-syntactic-face-function
+                   . python-font-lock-syntactic-face-function)))
+    (setq-local syntax-propertize-function
+                python-syntax-propertize-function)
+    (setq-local imenu-create-index-function
+                #'python-imenu-create-index)
+    (add-hook 'which-func-functions #'python-info-current-defun nil t))))
 
 ;;; Completion predicates for M-x
 ;; Commands that only make sense when editing Python code
diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el
index 4d57edf65b..f2002f9ef7 100644
--- a/lisp/progmodes/ts-mode.el
+++ b/lisp/progmodes/ts-mode.el
@@ -260,29 +260,26 @@ ts-mode
   :group 'typescript
   :syntax-table ts-mode--syntax-table
 
-  ;; Treesit-mode.
-  (setq-local treesit-mode-supported t)
-  (setq-local treesit-required-languages '(tsx))
-  ;; Comments.
-  (setq-local comment-start "// ")
-  (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
-  (setq-local comment-end "")
-  ;; Indent.
-  (setq-local treesit-simple-indent-rules ts-mode--indent-rules)
-  ;; Navigation.
-  (setq-local treesit-defun-type-regexp
-              (rx (or "class_declaration"
-                      "method_definition"
-                      "function_declaration"
-                      "lexical_declaration")))
-  ;; Font-lock.
-  (setq-local font-lock-defaults '(nil))
-  (setq-local treesit-font-lock-settings ts-mode--font-lock-settings)
-  (setq-local treesit-font-lock-feature-list '((minimal) (moderate) (full)))
-
   (cond
-   ((treesit-ready-p '(tsx))
-    (treesit-mode))
+   ((treesit-ready-p nil 'tsx)
+    ;; Tree-sitter.
+    ;; Comments.
+    (setq-local comment-start "// ")
+    (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
+    (setq-local comment-end "")
+    ;; Indent.
+    (setq-local treesit-simple-indent-rules ts-mode--indent-rules)
+    ;; Navigation.
+    (setq-local treesit-defun-type-regexp
+                (rx (or "class_declaration"
+                        "method_definition"
+                        "function_declaration"
+                        "lexical_declaration")))
+    ;; Font-lock.
+    (setq-local treesit-font-lock-settings ts-mode--font-lock-settings)
+    (setq-local treesit-font-lock-feature-list '((minimal) (moderate) (full)))
+    (treesit-major-mode-setup))
+   ;; Elisp.
    (t
     (js-mode)
     (message "Tree-sitter for TypeScript isn't available, falling back to `js-mode'"))))
diff --git a/lisp/treesit.el b/lisp/treesit.el
index a3bc1259b1..86cff52af2 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -50,6 +50,34 @@ treesit-max-buffer-size
 
 (declare-function treesit-available-p "treesit.c")
 
+(defcustom treesit-settings '((t nil t))
+  "Tree-sitter toggle settings for major modes.
+
+A list of (MODE ACTIVATE INHERIT).  MODE is a major mode, ACTIVATE
+can be one of the following:
+
+  demand => Demand the use of tree-sitter, warn if it can't activate
+  t => Enable if available
+  nil => Don't enable
+
+If INHERIT is t, the setting for MODE is inherited by all its
+derived modes.  For a derived mode, closer ancestor mode's
+setting takes higher precedence.
+
+A special MODE, t, is considered the ancestor of every mode, and
+its INHERIT flag is ignored."
+  :type '(repeat
+          (list :tag "Setting"
+                (symbol :tag "Mode")
+                (choice :tag "Activate"
+                        (const :tag "No" nil)
+                        (const :tag "Yes" t)
+                        (const :tag "Demand" demand))
+                (choice :tag "Inherit"
+                        (const :tag "Yes" t)
+                        (const :tag "No" nil))))
+  :version "29.1")
+
 ;;; Parser API supplement
 
 (defun treesit-parse-string (string language)
@@ -891,9 +919,7 @@ treesit-defun-type-regexp
   "A regexp that matches the node type of defun nodes.
 For example, \"(function|class)_definition\".
 
-This is used by `treesit-beginning-of-defun' and friends.  Bind
-it buffer-locally and `treesit-mode' will use it for navigating
-defun's.")
+This is used by `treesit-beginning-of-defun' and friends.")
 
 (defun treesit--find-top-level-match (node type)
   "Return the top-level parent of NODE matching TYPE.
@@ -947,136 +973,119 @@ treesit-imenu-function
 
 ;;; Activating tree-sitter
 
-(defvar-local treesit-mode-supported nil
-  "Set this variable to t to indicate support for `treesit-mode'.")
-
-(defvar-local treesit-required-languages nil
-  "A list of languages this major mode need for tree-sitter.")
-
-(defun treesit-ready-p (languages &optional report)
-  "Check that tree-sitter is ready to be used.
-
-If tree-sitter is not ready and REPORT non-nil, emit a warning or
-message.  Emit a warning if REPORT is `warn', message if REPORT
-is `message'.
-
-LANGUAGES is a list of languages we want check for availability."
-  (let (msg)
+(defun treesit--setting-for-mode (mode settings)
+  "Get the setting for MODE in SETTINGS.
+MODE is a major mode symbol.  SETTINGS should be `treesit-settings'."
+  ;;    A setting for exactly this MODE.  The shape is (FLAG INHERIT).
+  (let ((self (alist-get mode settings))
+        ;; Fallback setting, shape is (FLAG INHERIT).
+        (fallback (alist-get t settings))
+        ;; Settings for ancestor modes of MODE.  Its shape is
+        ;; ((MODE . FLAG)...)
+        (applicable (cl-loop for setting in settings
+                             for m = (nth 0 setting)
+                             for flag = (nth 1 setting)
+                             for inherit = (nth 2 setting)
+                             if (and (not (eq m t))
+                                     (not (eq m mode))
+                                     inherit
+                                     (provided-mode-derived-p mode m))
+                             collect (cons m flag))))
+    (cond
+     (self (car self))
+     ((null applicable) (car fallback))
+     (t
+      ;; After sort, the most specific setting is at the top.
+      (setq applicable
+            (cl-sort applicable
+                     (lambda (a b)
+                       ;; Major mode inheritance has a total ordering
+                       ;; right?
+                       (provided-mode-derived-p (car a) (car b)))))
+      (cdar applicable)))))
+
+(defun treesit-ready-p (mode language &optional quiet)
+  "Check that tree-sitter is ready to be used for MODE.
+
+Checks the user setting in `treesit-settings', if user sets
+`demand' for MODE, and tree-sitter is not ready, emit a warning
+and return nil.  If user chose to activate tree-sitter for MODE
+and tree-sitter is ready, return non-nil.  If QUIET is t, no
+warning is emitted in any case, if quiet is `message', message
+instead of emitting warning.
+
+If MODE is nil, don't check for user setting and assume the
+setting is t.
+
+LANGUAGE is languages symbol we want check for availability.  It
+can also be a list of language symbols."
+  (let ((language-list (if (consp language)
+                           language
+                         (list language)))
+        (activate (if mode
+                      (treesit--setting-for-mode mode treesit-settings)
+                    t))
+        msg)
     ;; Check for each condition and set MSG.
-    (catch 'term
-      (when (not treesit-mode-supported)
-        (setq msg "this major mode doesn't support it")
-        (throw 'term nil))
-      (when (not (treesit-available-p))
-        (setq msg "tree-sitter library is not built with Emacs")
-        (throw 'term nil))
-      (when (> (buffer-size) treesit-max-buffer-size)
-        (setq msg "buffer larger than `treesit-max-buffer-size'")
-        (throw 'term nil))
-      (dolist (lang languages)
-        (pcase-let ((`(,available . ,err)
-                     (treesit-language-available-p lang t)))
-          (when (not available)
-            (setq msg (format "language definition for %s is unavailable (%s): %s"
-                              lang (nth 0 err)
-                              (string-join
-                               (mapcar (lambda (x) (format "%s" x))
-                                       (cdr err))
-                               " ")))
-            (throw 'term nil)))))
-    ;; Decide if all conditions met and whether emit a warning.
-    (if (not msg)
-        t
-      (setq msg (concat "Cannot activate tree-sitter, because " msg))
-      (pcase report
-        ('warn (display-warning 'treesit msg))
-        ('message (message "%s" msg)))
-      nil)))
-
-(defvar-local treesit--local-variable-backup nil
-  "An alist of (VAR . VALUE) that backs up pre-treesit-mode values.")
-
-(defun treesit--backup-local-variable (variable value &optional restore)
-  "Backup VARIABLE's value and set it to VALUE.
-If RESTORE is non-nil, ignore VALUE and restore the backup (if
-there is any)."
-  (if restore
-      (when-let ((value (alist-get variable
-                                   treesit--local-variable-backup)))
-        (set variable value))
-    ;; Set.
-    (make-variable-buffer-local variable)
-    (setf (alist-get variable treesit--local-variable-backup)
-          (symbol-value variable))
-    (set variable value)))
-
-;;;###autoload
-(define-minor-mode treesit-mode
+    (if (null activate)
+        nil
+      (catch 'term
+        (when (not (treesit-available-p))
+          (setq msg "tree-sitter library is not compiled with Emacs")
+          (throw 'term nil))
+        (when (> (buffer-size) treesit-max-buffer-size)
+          (setq msg "buffer larger than `treesit-max-buffer-size'")
+          (throw 'term nil))
+        (dolist (lang language-list)
+          (pcase-let ((`(,available . ,err)
+                       (treesit-language-available-p lang t)))
+            (when (not available)
+              (setq msg (format "language definition for %s is unavailable (%s): %s"
+                                lang (nth 0 err)
+                                (string-join
+                                 (mapcar (lambda (x) (format "%s" x))
+                                         (cdr err))
+                                 " ")))
+              (throw 'term nil)))))
+      ;; Decide if all conditions met and whether emit a warning.
+      (if (not msg)
+          t
+        (when (eq activate 'demand)
+          (setq msg (concat "Cannot activate tree-sitter, because " msg))
+          (pcase quiet
+            ('nil (display-warning 'treesit msg))
+            ('message (message "%s" msg))))
+        nil))))
+
+(defun treesit-major-mode-setup ()
   "Activate tree-sitter to power major-mode features.
 
-This mode is merely a SUGGESTION of turning on tree-sitter,
-actual activation of tree-sitter functionalities depends on
-whether the major mode supports tree-sitter, availability of
-specific tree-sitter language definition, etc."
-  :version "29.1"
-  :group 'treesit
-  (if treesit-mode
-      (when (treesit-ready-p treesit-required-languages 'warn)
-        ;; Font-lock.
-        (setq-local treesit--local-variable-backup nil)
-        ;; NOTE: If anyone other than the major mode added stuff to
-        ;; `font-lock-keywords', they would need to re-add them after
-        ;; `treesit-mode' turns on.
-        (when treesit-font-lock-settings
-          (treesit--backup-local-variable 'font-lock-keywords-only t)
-          (treesit--backup-local-variable 'font-lock-keywords nil)
-          (treesit--backup-local-variable
-           'font-lock-fontify-region-function
-           #'treesit-font-lock-fontify-region)
-          (treesit-font-lock-recompute-features))
-        ;; Indent.
-        (when treesit-simple-indent-rules
-          (treesit--backup-local-variable
-           'indent-line-function #'treesit-indent))
-        ;; Navigation.
-        (when treesit-defun-type-regexp
-          (treesit--backup-local-variable
-           'beginning-of-defun-function #'treesit-beginning-of-defun)
-          (treesit--backup-local-variable
-           'end-of-defun-function #'treesit-end-of-defun))
-        ;; Imenu.
-        (when treesit-imenu-function
-          (treesit--backup-local-variable
-           'imenu-create-index-function treesit-imenu-function)))
-    ;; Font-lock.
-    (treesit--backup-local-variable 'font-lock-keywords nil t)
-    (treesit--backup-local-variable 'font-lock-keywords-only nil t)
-    (treesit--backup-local-variable
-     'font-lock-fontify-region-function nil t)
-    ;; Indent.
-    (treesit--backup-local-variable 'indent-line-function nil t)
-    ;; Navigation.
-    (treesit--backup-local-variable 'beginning-of-defun-function nil t)
-    (treesit--backup-local-variable 'end-of-defun-function nil t)
-    ;; Imenu.
-    (treesit--backup-local-variable 'imenu-create-index-function nil t)
-    ))
-
-(defun global-treesit-mode--turn-on ()
-  "Function used to determine whether to turn on `treesit-mode'.
-Called in every buffer if `global-treesit-mode' is on."
-  ;; Check tree-sitter readiness and don't emit warnings.
-  (when (and treesit-mode-supported
-             (treesit-ready-p treesit-required-languages))
-    (treesit-mode)))
-
-;;;###autoload
-(define-globalized-minor-mode global-treesit-mode treesit-mode
-  global-treesit-mode--turn-on
-  :version "29.1"
-  :group 'treesit
-  :predicate t
-  nil)
+If `treesit-font-lock-settings' is non-nil, setup fontification and
+enable `font-lock-mode'.
+
+If `treesit-simple-indent-rules' is non-nil, setup indentation.
+
+If `treesit-defun-type-regexp' is non-nil, setup
+`beginning/end-of-defun' functions."
+  ;; Font-lock.
+  (when treesit-font-lock-settings
+    ;; `font-lock-mode' wouldn't setup properly if
+    ;; `font-lock-defaults' is nil, see `font-lock-specified-p'.
+    ;; And we disable syntax-table-based font-lock by setting the
+    ;; KEYWORD-ONLY flag to t, so syntax-table-based font-lock
+    ;; doesn't override tree-sitter's fontification.
+    (setq-local font-lock-defaults '(nil t))
+    (setq-local font-lock-fontify-region-function
+                #'treesit-font-lock-fontify-region)
+    (font-lock-mode 1)
+    (treesit-font-lock-recompute-features))
+  ;; Indent.
+  (when treesit-simple-indent-rules
+    (setq-local indent-line-function #'treesit-indent))
+  ;; Navigation.
+  (when treesit-defun-type-regexp
+    (setq-local beginning-of-defun-function #'treesit-beginning-of-defun)
+    (setq-local end-of-defun-function #'treesit-end-of-defun)))
 
 ;;; Debugging
 
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index adc17bc079..2e26df6925 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -448,6 +448,26 @@ treesit-node-supplemental
     ;; `treesit-search-forward-goto'
     ))
 
+(ert-deftest treesit-misc ()
+  "Misc helper functions."
+  (let ((settings '((t 0 t)
+                    (c-mode 1 t)
+                    (text-mode 2 nil)
+                    (prog-mode 3 t)
+                    (fundamental-mode 4 t))))
+    ;; `treesit--setting-for-mode'.
+    ;; Exact match.
+    (should (eq 1 (treesit--setting-for-mode 'c-mode settings)))
+    ;; Inherit from t.
+    (should (eq 0 (treesit--setting-for-mode 'non-exist settings)))
+    ;; Inherit from prog-mode rather than fundamental-mode.
+    (require 'elisp-mode)
+    (should (eq 3 (treesit--setting-for-mode 'emacs-lisp-mode settings)))
+    ;; Not inherit from text-mode.
+    (require 'outline)
+    (should (not (eq 2 (treesit--setting-for-mode 'outline-mode settings))))
+    ))
+
 ;; TODO
 ;; - Functions in treesit.el
 ;; - treesit-load-name-override-list

commit 06b5ec4bbde119d14d866fc3713a4ed390d531f2
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Oct 24 15:02:41 2022 -0700

    * lisp/progmodes/ts-mode.el (ts-mode): Fix font-lock setup.

diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el
index c23f2bec05..4d57edf65b 100644
--- a/lisp/progmodes/ts-mode.el
+++ b/lisp/progmodes/ts-mode.el
@@ -276,6 +276,7 @@ ts-mode
                       "function_declaration"
                       "lexical_declaration")))
   ;; Font-lock.
+  (setq-local font-lock-defaults '(nil))
   (setq-local treesit-font-lock-settings ts-mode--font-lock-settings)
   (setq-local treesit-font-lock-feature-list '((minimal) (moderate) (full)))
 

commit 6203b9db347d2d002c0cb660d5b4daeea54bf3ad
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Oct 23 18:54:12 2022 -0700

    * lisp/treesit.el (treesit-node-at): Remove argument LARGEST.
    
    LARGEST returns the root node at BOB, finding the smallest node at
    point and search upward is a better practice.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 0df9b6c687..a3bc1259b1 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -101,7 +101,7 @@ treesit-node-language
   (treesit-parser-language
    (treesit-node-parser node)))
 
-(defun treesit-node-at (pos &optional parser-or-lang named largest strict)
+(defun treesit-node-at (pos &optional parser-or-lang named strict)
   "Return the smallest node that starts at or after buffer position POS.
 
 \"Starts at or after POS\" means the start of the node is greater or
@@ -114,9 +114,6 @@ treesit-node-at
 that parser; if PARSER-OR-LANG is a language, find a parser using
 that language in the current buffer, and use that.
 
-If LARGEST is non-nil, return the largest node instead of the
-smallest.
-
 If POS is after all the text in the buffer, i.e., there is no
 node after POS, return the last leaf node in the parse tree, even
 though that node is before POS.  If STRICT is non-nil, return nil
@@ -140,13 +137,7 @@ treesit-node-at
             (while (setq next (treesit-node-child node -1 named))
               (setq node next))
             node)
-        ;; If LARGEST non-nil, find the largest node that has the same
-        ;; starting point as NODE.
-        (if (not largest)
-            node
-          (treesit-parent-while
-           node (lambda (n) (eq (treesit-node-start n)
-                                (treesit-node-start node)))))))))
+        node))))
 
 (defun treesit-node-on (beg end &optional parser-or-lang named)
   "Return the smallest node covering BEG to END.

commit 1787e651d376486909e736478b1be92c949a368d
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Oct 23 18:51:35 2022 -0700

    * lisp/treesit.el (treesit-parser-range-on): New function.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 16c5aab850..0df9b6c687 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -298,6 +298,21 @@ treesit-update-ranges
   (dolist (range-fn treesit-range-functions)
     (funcall range-fn (or start (point-min)) (or end (point-max)))))
 
+(defun treesit-parser-range-on (parser beg &optional end)
+  "Check if PARSER's range covers the portion between BEG and END.
+
+If it does, return the range covering that portion in the form
+of (RANGE-BEG . RANGE-END), if not, return nil.  If nil or
+omitted, default END to BEG."
+  (let ((ranges (treesit-parser-included-ranges parser))
+        (end (or end beg)))
+    (if (null ranges)
+        (cons (point-min) (point-max))
+      (cl-loop for rng in ranges
+               if (<= (car rng) beg end (cdr rng))
+               return rng
+               finally return nil))))
+
 ;;; Font-lock
 
 (define-error 'treesit-font-lock-error

commit c120b0ebdb20cfff73dd1d43541f1ba1bbc54b74
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Oct 23 18:47:02 2022 -0700

    Fix treesit-beginning/end-of-defun
    
    Now they always move to the top-level defun (i.e., skips nested ones).
    
    * lisp/treesit.el (treesit--find-top-level-match): New function
    (treesit-beginning-of-defun): Goes to the top-level match.
    (treesit-end-of-defun): Simply move to the end of current match.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index b391667b1b..16c5aab850 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -889,25 +889,47 @@ treesit-defun-type-regexp
 it buffer-locally and `treesit-mode' will use it for navigating
 defun's.")
 
+(defun treesit--find-top-level-match (node type)
+  "Return the top-level parent of NODE matching TYPE.
+TYPE is a regexp, this function matches TYPE with each parent's
+type."
+  (cl-loop for cursor = (treesit-node-parent node)
+           then (treesit-node-parent cursor)
+           while cursor
+           if (string-match-p type (treesit-node-type cursor))
+           do (setq node cursor)
+           finally return node))
+
 (defun treesit-beginning-of-defun (&optional arg)
   "Tree-sitter `beginning-of-defun' function.
 ARG is the same as in `beginning-of-defun."
-  (let ((arg (or arg 1)))
+  (let ((arg (or arg 1))
+        (node (treesit-node-at (point))))
     (if (> arg 0)
         ;; Go backward.
         (while (and (> arg 0)
-                    (treesit-search-forward-goto
-                     treesit-defun-type-regexp t t))
+                    (setq node (treesit-search-forward-goto
+                                node treesit-defun-type-regexp t t)))
+          (setq node (treesit--find-top-level-match
+                      node treesit-defun-type-regexp))
           (setq arg (1- arg)))
       ;; Go forward.
       (while (and (< arg 0)
-                  (treesit-search-forward-goto
-                   treesit-defun-type-regexp t t))
-        (setq arg (1+ arg))))))
+                  (setq node (treesit-search-forward-goto
+                              node treesit-defun-type-regexp t t)))
+        (setq node (treesit--find-top-level-match
+                    node treesit-defun-type-regexp))
+        (setq arg (1+ arg))))
+    (goto-char (treesit-node-start node))))
 
 (defun treesit-end-of-defun ()
   "Tree-sitter `end-of-defun' function."
-  (treesit-search-forward-goto treesit-defun-type-regexp))
+  ;; Why not simply get the largest node at point: when point is at
+  ;; (point-min), that gives us the root node.
+  (let ((node (treesit--find-top-level-match
+               (treesit-node-at (point))
+               treesit-defun-type-regexp)))
+    (goto-char (treesit-node-end node))))
 
 ;;; Imenu
 

commit 6cf2a9c55dbf8dfbc93409340065cf02881502b1
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Oct 23 18:29:02 2022 -0700

    Make treesit-search-forward-goto accept a NODE argument
    
    With NODE argument we can do
    
    (setq node (treesit-search-forward-goto node))
    
    And we can choose what node to pass to it (maybe we want to pass it
    the largest node at point, rather than the smallest node, and in case
    of multiple parsers, we can choose which parser to use).
    
    * doc/lispref/parsing.texi (Retrieving Node): Update manual.
    * lisp/treesit.el (treesit-search-forward-goto): Accept a NODE
    argument.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 8919a3ea70..bd80357957 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -702,10 +702,14 @@ Retrieving Node
 the buffer that satisfies some condition?''
 @end defun
 
-@defun treesit-search-forward-goto predicate &optional start backward all
-This function moves point to the start or end of the next node in
-the buffer that matches @var{predicate}.  If @var{start} is
-non-nil, stop at the beginning rather than the end of a node.
+@defun treesit-search-forward-goto node predicate &optional start backward all
+This function moves point to the start or end of the next node after
+@var{node} in the buffer that matches @var{predicate}.  If @var{start}
+is non-nil, stop at the beginning rather than the end of a node.
+
+This function guarantees that the matched node it returns makes
+progress in terms of buffer position: the start/end position of the
+returned node is always greater than that of @var{node}.
 
 Arguments @var{predicate}, @var{backward} and @var{all} are the same
 as in @code{treesit-search-forward}.
diff --git a/lisp/treesit.el b/lisp/treesit.el
index f8ab96ddb2..b391667b1b 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -834,10 +834,10 @@ treesit-check-indent
 ;;; Search
 
 (defun treesit-search-forward-goto
-    (predicate &optional start backward all)
+    (node predicate &optional start backward all)
   "Search forward for a node and move to its end position.
 
-Stops at the first node after point that matches PREDICATE.
+Stops at the first node after NODE that matches PREDICATE.
 PREDICATE can be either a regexp that matches against each node's
 type case-insensitively, or a function that takes a node and
 returns nil/non-nil for match/no match.
@@ -846,20 +846,20 @@ treesit-search-forward-goto
 otherwise return nil.  If START is non-nil, stop at the
 beginning rather than the end of a node.
 
+This function guarantees that the matched node it returns makes
+progress in terms of buffer position: the start/end position of
+the returned node is always greater than that of NODE.
+
 BACKWARD and ALL are the same as in `treesit-search-forward'."
-  (let ((node (treesit-node-at (point)))
-        (start-pos (point)))
-    ;; Often the EOF (point-max) is a newline, and `treesit-node-at'
-    ;; will return nil at that point (which is fair).  But we need a
-    ;; node as the starting point to traverse the tree.  So we try to
-    ;; use the node before point.
-    (when (and (not node) (eq (point) (point-max)))
-      (setq node (treesit-node-at (max (1- (point)) (point-min)))))
+  (when-let ((start-pos (if start
+                            (treesit-node-start node)
+                          (treesit-node-end node))))
     ;; When searching forward and stopping at beginnings, or search
     ;; backward stopping at ends, it is possible to "roll back" in
     ;; position.  Take three nodes N1, N2, N3 as an example, if we
     ;; start at N3, search for forward for beginning, and N1 matches,
-    ;; we would stop at beg of N1, which is backwards!  So we skip N1.
+    ;; we would stop at beg of N1, which is backwards!  So we skip N1
+    ;; and keep going.
     ;;
     ;;   |<--------N1------->|
     ;;   |<--N2-->| |<--N3-->|

commit 524d10c86b539ef6fe27f31ed3df2590d1849a83
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Oct 23 18:23:17 2022 -0700

    Make treesit-node-at return the last leaf node at EOB
    
    * doc/lispref/parsing.texi (Retrieving Node): Update manual.
    * lisp/treesit.el (treesit-node-at): Add a (when node) form just to be
    explicit, return the last leaf node if there is no node after POS.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 3a19b1b7ca..8919a3ea70 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -504,6 +504,12 @@ Retrieving Node
 If @var{named} is non-@code{nil}, this function looks for a named node
 only (@pxref{tree-sitter named node, named node}).
 
+When @var{pos} is after all the text in the buffer, technically there
+is no node after @var{pos}.  But for convenience, this function will
+return the last leaf node in the parse tree.  If @var{strict} is
+non-nil, this function will strictly comply to the semantics and
+return @var{nil}.
+
 Example:
 
 @example
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 17c9d3e8b9..f8ab96ddb2 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -101,7 +101,7 @@ treesit-node-language
   (treesit-parser-language
    (treesit-node-parser node)))
 
-(defun treesit-node-at (pos &optional parser-or-lang named largest)
+(defun treesit-node-at (pos &optional parser-or-lang named largest strict)
   "Return the smallest node that starts at or after buffer position POS.
 
 \"Starts at or after POS\" means the start of the node is greater or
@@ -115,20 +115,38 @@ treesit-node-at
 that language in the current buffer, and use that.
 
 If LARGEST is non-nil, return the largest node instead of the
-smallest."
-  (let ((node (if (treesit-parser-p parser-or-lang)
-                  (treesit-parser-root-node parser-or-lang)
-                (treesit-buffer-root-node parser-or-lang)))
-        next)
-    ;; This is very fast so no need for C implementation.
-    (while (setq next (treesit-node-first-child-for-pos
-                       node pos named))
-      (setq node next))
-    (if (not largest)
-        node
-      (treesit-parent-while
-       node (lambda (n) (eq (treesit-node-start n)
-                            (treesit-node-start node)))))))
+smallest.
+
+If POS is after all the text in the buffer, i.e., there is no
+node after POS, return the last leaf node in the parse tree, even
+though that node is before POS.  If STRICT is non-nil, return nil
+in this case."
+  (let* ((root (if (treesit-parser-p parser-or-lang)
+                   (treesit-parser-root-node parser-or-lang)
+                 (treesit-buffer-root-node parser-or-lang)))
+         (node root)
+         next)
+    (when node
+      ;; This is very fast so no need for C implementation.
+      (while (setq next (treesit-node-first-child-for-pos
+                         node pos named))
+        (setq node next))
+      ;; If we are at the end of buffer or after all the text, we will
+      ;; end up with NODE = root node.  For convenience, return the last
+      ;; leaf node in the tree.
+      (if (treesit-node-eq node root)
+          (if strict
+              nil
+            (while (setq next (treesit-node-child node -1 named))
+              (setq node next))
+            node)
+        ;; If LARGEST non-nil, find the largest node that has the same
+        ;; starting point as NODE.
+        (if (not largest)
+            node
+          (treesit-parent-while
+           node (lambda (n) (eq (treesit-node-start n)
+                                (treesit-node-start node)))))))))
 
 (defun treesit-node-on (beg end &optional parser-or-lang named)
   "Return the smallest node covering BEG to END.

commit 591759d508024a666a863cf918287744e72b1267
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Oct 23 18:05:10 2022 -0700

    Make treesit-node-child and fiends accept negative index
    
    * doc/lispref/parsing.texi (Retrieving Node): Update manual.
    * src/treesit.c (Ftreesit_node_child)
    (Ftreesit_node_field_name_for_child): Accept and process negative
    index.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index e26090be1d..3a19b1b7ca 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -567,11 +567,16 @@ Retrieving Node
 @defun treesit-node-child node n &optional named
 This function returns the @var{n}'th child of @var{node}.  If
 @var{named} is non-@code{nil}, it counts only named nodes
-(@pxref{tree-sitter named node, named node}).  For example, in a node
-that represents a string @code{"text"}, there are three children
-nodes: the opening quote @code{"}, the string text @code{text}, and
-the closing quote @code{"}.  Among these nodes, the first child is the
-opening quote @code{"}, and the first named child is the string text.
+(@pxref{tree-sitter named node, named node}).
+
+For example, in a node that represents a string @code{"text"}, there
+are three children nodes: the opening quote @code{"}, the string text
+@code{text}, and the closing quote @code{"}.  Among these nodes, the
+first child is the opening quote @code{"}, and the first named child
+is the string text.
+
+This function returns @code{nil} if there is no @var{n}'th child.
+@var{n} could be negative, e.g., -1 represents the last child.
 @end defun
 
 @defun treesit-node-children node &optional named
@@ -880,7 +885,11 @@ Accessing Node Information
 
 @defun treesit-node-field-name-for-child node n
 This function returns the field name of the @var{n}'th child of
-@var{node}.
+@var{node}.  It returns @code{nil} if there is no @var{n}'th child, or
+the @var{n}'th child doesn't have a field name.
+
+Note that @var{n} counts both named and anonymous child.  And @var{n}
+could be negative, e.g., -1 represents the last child.
 @end defun
 
 @defun treesit-child-count node &optional named
diff --git a/src/treesit.c b/src/treesit.c
index b0e7d0e211..3ac0a0c7b2 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1529,20 +1529,36 @@ DEFUN ("treesit-node-child",
        Ftreesit_node_child, Streesit_node_child, 2, 3, 0,
        doc: /* Return the Nth child of NODE.
 
-Return nil if there is no Nth child.  If NAMED is non-nil, look for named
-child only.  NAMED defaults to nil.  If NODE is nil, return nil.  */)
+Return nil if there is no Nth child.  If NAMED is non-nil, look for
+named child only.  NAMED defaults to nil.  If NODE is nil, return
+nil.
+
+N could be negative, e.g., -1 represents the last child.  */)
   (Lisp_Object node, Lisp_Object n, Lisp_Object named)
 {
   if (NILP (node)) return Qnil;
   treesit_check_node (node);
-  treesit_check_positive_integer (n);
+  CHECK_INTEGER (n);
   EMACS_INT idx = XFIXNUM (n);
-  if (idx > UINT32_MAX)
-    xsignal1 (Qargs_out_of_range, n);
+
   treesit_initialize ();
 
   TSNode treesit_node = XTS_NODE (node)->node;
   TSNode child;
+
+  /* Process negative index.  */
+  if (idx < 0)
+    {
+      if (NILP (named))
+	idx = ts_node_child_count (treesit_node) + idx;
+      else
+	idx = ts_node_named_child_count (treesit_node) + idx;
+    }
+  if (idx < 0)
+    return Qnil;
+  if (idx > UINT32_MAX)
+    xsignal1 (Qargs_out_of_range, n);
+
   if (NILP (named))
     child = ts_node_child (treesit_node, (uint32_t) idx);
   else
@@ -1606,19 +1622,30 @@ DEFUN ("treesit-node-field-name-for-child",
        doc: /* Return the field name of the Nth child of NODE.
 
 Return nil if there's no Nth child, or if it has no field.
-If NODE is nil, return nil.  */)
+If NODE is nil, return nil.
+
+N counts all children, i.e., named ones and anonymous ones.
+
+N could be negative, e.g., -1 represents the last child.  */)
   (Lisp_Object node, Lisp_Object n)
 {
   if (NILP (node))
     return Qnil;
   treesit_check_node (node);
-  treesit_check_positive_integer (n);
+  CHECK_INTEGER (n);
   EMACS_INT idx = XFIXNUM (n);
-  if (idx > UINT32_MAX)
-    xsignal1 (Qargs_out_of_range, n);
   treesit_initialize ();
 
   TSNode treesit_node = XTS_NODE (node)->node;
+
+  /* Process negative index.  */
+  if (idx < 0)
+    idx = ts_node_child_count (treesit_node) + idx;
+  if (idx < 0)
+    return Qnil;
+  if (idx > UINT32_MAX)
+    xsignal1 (Qargs_out_of_range, n);
+
   const char *name
     = ts_node_field_name_for_child (treesit_node, (uint32_t) idx);
 

commit e45d8dbeea488ac14fe486e5582266980d29e82c
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Oct 23 16:45:54 2022 -0700

    ; * lisp/treesit.el (treesit-range-functions): Fix typo.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 5381cccc8e..17c9d3e8b9 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -260,7 +260,7 @@ treesit-query-range
 
 (defvar-local treesit-range-functions nil
   "A list of range functions.
-Font-locking and indenting code uses functions in this alist to
+Font-locking and indenting code uses functions in this list to
 set correct ranges for a language parser before using it.
 
 The signature of each function should be

commit 3114eb807864e19cd8ffdc5d8f8e11366a619769
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Oct 23 16:16:27 2022 -0700

    * lisp/treesit.el (treesit-node-at): Add LARGEST argument.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 2fe48b34aa..5381cccc8e 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -101,7 +101,7 @@ treesit-node-language
   (treesit-parser-language
    (treesit-node-parser node)))
 
-(defun treesit-node-at (pos &optional parser-or-lang named)
+(defun treesit-node-at (pos &optional parser-or-lang named largest)
   "Return the smallest node that starts at or after buffer position POS.
 
 \"Starts at or after POS\" means the start of the node is greater or
@@ -112,7 +112,10 @@ treesit-node-at
 If PARSER-OR-LANG is nil, use the first parser in
 \(`treesit-parser-list'); if PARSER-OR-LANG is a parser, use
 that parser; if PARSER-OR-LANG is a language, find a parser using
-that language in the current buffer, and use that."
+that language in the current buffer, and use that.
+
+If LARGEST is non-nil, return the largest node instead of the
+smallest."
   (let ((node (if (treesit-parser-p parser-or-lang)
                   (treesit-parser-root-node parser-or-lang)
                 (treesit-buffer-root-node parser-or-lang)))
@@ -121,7 +124,11 @@ treesit-node-at
     (while (setq next (treesit-node-first-child-for-pos
                        node pos named))
       (setq node next))
-    node))
+    (if (not largest)
+        node
+      (treesit-parent-while
+       node (lambda (n) (eq (treesit-node-start n)
+                            (treesit-node-start node)))))))
 
 (defun treesit-node-on (beg end &optional parser-or-lang named)
   "Return the smallest node covering BEG to END.

commit fa9bede36c18d063f6f599e102cd42f9d0afc071
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Oct 23 14:56:17 2022 -0700

    Change function signiture of treesit search functions
    
    Justification: We want to make the SIDE argument in
    treesit-search-forward-goto optional, so I changed it to START.
    It makes more sense for BACKWARD to follow START so two common
    case, search for end forward and beginning backwards are
    
    (treesit-search-forward-goto node pred)
    (treesit-search-forward-goto node pred t t)
    
    Then since we swapped BACKWARD and ALL for
    treesit-search-forward-goto, it's best to swap them for
    treesit-search-forward and treesit-search-subtree, too.  And BACKWARD
    will probably be used more frequently than ALL anyway.
    
    * doc/lispref/parsing.texi (Retrieving Node): Resolve FIXME and update
    function signitures.
    * lisp/treesit.el (treesit-search-forward-goto): Change SIDE to
    START, swap BACKWARD and ALL.
    (treesit-beginning-of-defun)
    (treesit-end-of-defun): Update use of treesit-search-forward-goto
    * src/treesit.c (Ftreesit_search_subtree)
    (Ftreesit_search_forward): Swap BACKWARD and ALL.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index ec6cd2757d..e26090be1d 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -633,7 +633,7 @@ Retrieving Node
 
 @heading Searching for node
 
-@defun treesit-search-subtree node predicate &optional all backward limit
+@defun treesit-search-subtree node predicate &optional backward all limit
 This function traverses the subtree of @var{node} (including
 @var{node} itself), looking for a node for which @var{predicate}
 returns non-@code{nil}.  @var{predicate} is a regexp that is matched
@@ -650,7 +650,7 @@ Retrieving Node
 down the tree.
 @end defun
 
-@defun treesit-search-forward start predicate &optional all backward
+@defun treesit-search-forward start predicate &optional backward all
 Like @code{treesit-search-subtree}, this function also traverses the
 parse tree and matches each node with @var{predicate} (except for
 @var{start}), where @var{predicate} can be a (case-insensitive) regexp
@@ -691,15 +691,13 @@ Retrieving Node
 the buffer that satisfies some condition?''
 @end defun
 
-@defun treesit-search-forward-goto predicate side &optional all backward
-This function moves point to the beginning or end of the next node in
-the buffer that matches @var{predicate}.  Arguments @var{predicate},
-@var{all} and @var{backward} are the same as in
-@code{treesit-search-forward}.  @var{side} controls on which side of
-the matched node we stop: it can be @code{start} or @code{end}.
-@c FIXME: Wouldn't it be convenient to make SIDE optional argument,
-@c and by default stop and the beginning (or end), whichever happens
-@c most frequently?
+@defun treesit-search-forward-goto predicate &optional start backward all
+This function moves point to the start or end of the next node in
+the buffer that matches @var{predicate}.  If @var{start} is
+non-nil, stop at the beginning rather than the end of a node.
+
+Arguments @var{predicate}, @var{backward} and @var{all} are the same
+as in @code{treesit-search-forward}.
 @end defun
 
 @defun treesit-induce-sparse-tree root predicate &optional process-fn limit
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 3557d00d66..2fe48b34aa 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -809,8 +809,8 @@ treesit-check-indent
 ;;; Search
 
 (defun treesit-search-forward-goto
-    (predicate side &optional all backward)
-  "Search forward for a node and move to it.
+    (predicate &optional start backward all)
+  "Search forward for a node and move to its end position.
 
 Stops at the first node after point that matches PREDICATE.
 PREDICATE can be either a regexp that matches against each node's
@@ -818,35 +818,40 @@ treesit-search-forward-goto
 returns nil/non-nil for match/no match.
 
 If a node matches, move to that node and return the node,
-otherwise return nil.  SIDE controls whether we move to the start
-or end of the matches node, it can be either \\='start or
-\\='end.
+otherwise return nil.  If START is non-nil, stop at the
+beginning rather than the end of a node.
 
-ALL and BACKWARD are the same as in `treesit-search-forward'."
+BACKWARD and ALL are the same as in `treesit-search-forward'."
   (let ((node (treesit-node-at (point)))
-        (start (point)))
+        (start-pos (point)))
     ;; Often the EOF (point-max) is a newline, and `treesit-node-at'
     ;; will return nil at that point (which is fair).  But we need a
     ;; node as the starting point to traverse the tree.  So we try to
     ;; use the node before point.
     (when (and (not node) (eq (point) (point-max)))
       (setq node (treesit-node-at (max (1- (point)) (point-min)))))
-    ;; When searching forward, it is possible for (point) < start,
-    ;; because `treesit-search-forward' goes to parents.
+    ;; When searching forward and stopping at beginnings, or search
+    ;; backward stopping at ends, it is possible to "roll back" in
+    ;; position.  Take three nodes N1, N2, N3 as an example, if we
+    ;; start at N3, search for forward for beginning, and N1 matches,
+    ;; we would stop at beg of N1, which is backwards!  So we skip N1.
+    ;;
+    ;;   |<--------N1------->|
+    ;;   |<--N2-->| |<--N3-->|
     (while (and node (if backward
-                         (>= (point) start)
-                       (<= (point) start)))
+                         (>= (point) start-pos)
+                       (<= (point) start-pos)))
       (setq node (treesit-search-forward
-                  node predicate all backward))
-      (if-let ((pos (pcase side
-                      ('start (treesit-node-start node))
-                      ('end (treesit-node-end node)))))
+                  node predicate backward all))
+      (if-let ((pos (if start
+                        (treesit-node-start node)
+                      (treesit-node-end node))))
           (goto-char pos)))
     ;; If we made reverse progress, go back to where we started.
     (when (if backward
-              (>= (point) start)
-            (<= (point) start))
-      (goto-char start))
+              (>= (point) start-pos)
+            (<= (point) start-pos))
+      (goto-char start-pos))
     node))
 
 ;;; Navigation
@@ -867,17 +872,17 @@ treesit-beginning-of-defun
         ;; Go backward.
         (while (and (> arg 0)
                     (treesit-search-forward-goto
-                     treesit-defun-type-regexp 'start nil t))
+                     treesit-defun-type-regexp t t))
           (setq arg (1- arg)))
       ;; Go forward.
       (while (and (< arg 0)
                   (treesit-search-forward-goto
-                   treesit-defun-type-regexp 'start))
+                   treesit-defun-type-regexp t t))
         (setq arg (1+ arg))))))
 
 (defun treesit-end-of-defun ()
   "Tree-sitter `end-of-defun' function."
-  (treesit-search-forward-goto treesit-defun-type-regexp 'end))
+  (treesit-search-forward-goto treesit-defun-type-regexp))
 
 ;;; Imenu
 
diff --git a/src/treesit.c b/src/treesit.c
index a23ac7510d..b0e7d0e211 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2503,8 +2503,8 @@ DEFUN ("treesit-search-subtree",
 non-nil, only traverse nodes up to that number of levels down in the tree.
 
 Return the first matched node, or nil if none matches.  */)
-  (Lisp_Object node, Lisp_Object predicate, Lisp_Object all,
-   Lisp_Object backward, Lisp_Object limit)
+  (Lisp_Object node, Lisp_Object predicate, Lisp_Object backward,
+   Lisp_Object all, Lisp_Object limit)
 {
   CHECK_TS_NODE (node);
   CHECK_TYPE (STRINGP (predicate) || FUNCTIONP (predicate),
@@ -2563,8 +2563,8 @@ DEFUN ("treesit-search-forward",
 
 Note that this function doesn't traverse the subtree of START, and it
 always traverse leaf nodes first, then upwards.  */)
-  (Lisp_Object start, Lisp_Object predicate, Lisp_Object all,
-   Lisp_Object backward)
+  (Lisp_Object start, Lisp_Object predicate, Lisp_Object backward,
+   Lisp_Object all)
 {
   CHECK_TS_NODE (start);
   CHECK_TYPE (STRINGP (predicate) || FUNCTIONP (predicate),

commit 6a2399c55e9505be06cb98ffbe1a3878f9e96fb2
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Oct 23 14:23:59 2022 -0700

    ; Resolve FIXME's in tree-sitter manual sections
    
    * doc/lispref/modes.texi (Parser-based Indentation):
    * doc/lispref/parsing.texi (Retrieving Node): Resolve FIXME's.
    * src/treesit.c: Update tree graph in docstring.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index c6269b46ba..d73c443b4c 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -4820,12 +4820,11 @@ Parser-based Indentation
 
 @ftable @code
 @item no-node
-@c FIXME: How many arguments does no-node accept, and what are thos
-@c arguments?
-This matcher is a function that matches the case where @var{node} is
-@code{nil}, i.e., there is no node that starts at @var{bol}.  This is
-the case when @var{bol} is on an empty line or inside a multi-line
-string, etc.
+This matcher is a function that is called with 3 arguments:
+@var{node}, @var{parent}, and @var{bol}, and returns non-@code{nil},
+indicating a match, if @var{node} is @code{nil}, i.e., there is no
+node that starts at @var{bol}.  This is the case when @var{bol} is on
+an empty line or inside a multi-line string, etc.
 
 @item parent-is
 This matcher is a function of one argument, @var{type}; it returns a
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index aaa8f0f64d..ec6cd2757d 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -655,19 +655,19 @@ Retrieving Node
 parse tree and matches each node with @var{predicate} (except for
 @var{start}), where @var{predicate} can be a (case-insensitive) regexp
 or a function.  For a tree like the below where @var{start} is marked
-1, this function traverses as numbered:
+S, this function traverses as numbered from 1 to 12:
 
 @example
 @group
-              16
+              12
               |
-     3--------7-----------15
-     |        |           |
-o--1-+--2  4--+--6    10--+-----14
-|  |             |    |         |
-o  o             5  +-+-+    +--+--+
-                    |   |    |  |  |
-                    8   9    11 12 13
+     S--------3----------11
+     |        |          |
+o--o-+--o  1--+--2    6--+-----10
+|  |                  |        |
+o  o                +-+-+   +--+--+
+                    |   |   |  |  |
+                    4   5   7  8  9
 @end group
 @end example
 
@@ -679,12 +679,14 @@ Retrieving Node
 searches for all nodes.  If @var{backward} is non-@code{nil}, it
 searches backwards.
 
-@c FIXME: Still not very clear: the difference between ``traverse
-@c a subtree of a node'' and ``traverse every node that comes after
-@c it''.
 While @code{treesit-search-subtree} traverses the subtree of a node,
-this function usually starts with a leaf node and traverses every node
-that comes after it in the buffer position order.  It is useful for
+this function starts with node @var{start} and traverses every node
+that comes after it in the buffer position order, i.e., nodes with
+start positions greater than the end position of @var{start}.
+
+In the tree shown above, @code{treesit-search-subtree} traverses node
+S (@var{start}) and nodes marked with @code{o}, where this function
+traverses the nodes marked with numbers.  This function is useful for
 answering questions like ``what is the first node after @var{start} in
 the buffer that satisfies some condition?''
 @end defun
diff --git a/src/treesit.c b/src/treesit.c
index b4dac587b1..a23ac7510d 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2548,17 +2548,18 @@ DEFUN ("treesit-search-forward",
 
 Return the first matched node, or nil if none matches.
 
-For a tree like below, where START is marked by 1, traverse as
-numbered:
-                16
-                |
-       3--------7-----------15
-       |        |           |
-  o--1-+--2  4--+--6    10--+-----14
-  |  |             |    |         |
-  o  o             5  +-+-+    +--+--+
-                      |   |    |  |  |
-                      8   9    11 12 13
+For a tree like below, where START is marked by S, traverse as
+numbered from 1 to 12:
+
+		12
+		|
+       S--------3----------11
+       |        |          |
+  o--o-+--o  1--+--2    6--+-----10
+  |  |                  |        |
+  o  o                +-+-+   +--+--+
+		      |   |   |  |  |
+		      4   5   7  8  9
 
 Note that this function doesn't traverse the subtree of START, and it
 always traverse leaf nodes first, then upwards.  */)

commit 31f75430999b9021fc68739af231261608aac255
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sun Oct 23 11:14:18 2022 +0300

    ; Minor copyedits of tree-sitter stuff in ELisp manual
    
    * doc/lispref/parsing.texi (Pattern Matching):
    * doc/lispref/modes.texi (Parser-based Font Lock)
    (Parser-based Indentation): Fix wording and typos.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 3537d312f2..c6269b46ba 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3904,16 +3904,31 @@ Parser-based Font Lock
 schemes.  The tree-sitter counterpart of @var{font-lock-keywords} is
 @var{treesit-font-lock-settings}.
 
-In general, tree-sitter fontification works like the following: a Lisp
-program provides a @dfn{query} consisting of @dfn{patterns} with
-@dfn{capture names}.  Tree-sitter finds the nodes in the parse tree
-that match these patterns, tags the corresponding capture names onto
-the nodes, and returns them to the Lisp program.  The Lisp program
-takes theses nodes and highlights the corresponding buffer text of
-each node depending on the tagged capture name of the node.  For
-example, a node tagged @code{font-lock-keyword} would simply be
-highlighted in @code{font-lock-keyword} face.  For more information on
-queries, patterns and capture names, @pref{Pattern Matching}.
+@cindex tree-sitter fontifications, overview
+@cindex fontifications with tree-sitter, overview
+In general, tree-sitter fontification works as follows:
+
+@itemize @bullet
+@item
+A Lisp program (usually, part of a major mode) provides a @dfn{query}
+consisting of @dfn{patterns}, each pattern associated with a
+@dfn{capture name}.
+
+@item
+The tree-sitter library finds the nodes in the parse tree
+that match these patterns, tags the nodes with the corresponding
+capture names, and returns them to the Lisp program.
+
+@item
+The Lisp program uses the returned nodes to highlight the portions of
+buffer text corresponding to each node as appropriate, using the
+tagged capture names of the nodes to determine the correct
+fontification.  For example, a node tagged @code{font-lock-keyword}
+would be highlighted in @code{font-lock-keyword} face.
+@end itemize
+
+For more information about queries, patterns, and capture names, see
+@ref{Pattern Matching}.
 
 @defun treesit-font-lock-rules :keyword value query...
 This function is used to set @var{treesit-font-lock-settings}.  It
@@ -3957,7 +3972,7 @@ Parser-based Font Lock
 
 Lisp programs mark patterns in the query with capture names (names
 that starts with @code{@@}), and tree-sitter will return matched nodes
-with capture names tagged onto them.  For the purpose of
+tagged with those same capture names.  For the purpose of
 fontification, capture names in @var{query} should be face names like
 @code{font-lock-keyword-face}.  The captured node will be fontified
 with that face.  Capture names can also be function names, in which
@@ -4010,7 +4025,7 @@ Parser-based Font Lock
 of this variable is considered internal.  One should always use
 @code{treesit-font-lock-rules} to set this variable.
 @c Because the format is internal, we don't document them here.
-@c Though We do have explanations in the docstring.
+@c Though we do have it explained in the docstring.
 @end defvar
 
 Multi-language major modes should provide range functions in
@@ -4805,37 +4820,41 @@ Parser-based Indentation
 
 @ftable @code
 @item no-node
+@c FIXME: How many arguments does no-node accept, and what are thos
+@c arguments?
 This matcher is a function that matches the case where @var{node} is
 @code{nil}, i.e., there is no node that starts at @var{bol}.  This is
 the case when @var{bol} is on an empty line or inside a multi-line
 string, etc.
 
 @item parent-is
-This matcher is a function of one argument, @var{type}; it return a
-function that given @w{@code{(@var{node} @var{parent} @var{bol})}},
-matches if @var{parent}'s type is @var{type}.
+This matcher is a function of one argument, @var{type}; it returns a
+function that is called with 3 arguments: @var{node}, @var{parent},
+and @var{bol}, and returns non-@code{nil} (i.e., a match) if
+@var{parent}'s type is @var{type}.
 
 @item node-is
 This matcher is a function of one argument, @var{type}; it returns a
-function that given @w{@code{(@var{node} @var{parent} @var{bol})}},
-matches if @var{node}'s type is @var{type}.
+function that is called with 3 arguments: @var{node}, @var{parent},
+and @var{bol}, and returns non-@code{nil} if @var{node}'s type is
+@var{type}.
 
 @item query
 This matcher is a function of one argument, @var{query}; it returns a
-function that given @w{@code{(@var{node} @var{parent} @var{bol})}},
-matches if querying @var{parent} with @var{query} captures @var{node}
-(@pxref{Pattern Matching}).
+function that is called with 3 arguments: @var{node}, @var{parent},
+and @var{bol}, and returns non-@code{nil} if querying @var{parent}
+with @var{query} captures @var{node} (@pxref{Pattern Matching}).
 
 @item match
 This matcher is a function of 5 arguments: @var{node-type},
 @var{parent-type}, @var{node-field}, @var{node-index-min}, and
-@var{node-index-max}).  It returns a function that given
-@w{@code{(@var{node} @var{parent} @var{bol})}}, matches if
-@var{node}'s type is @var{node-type}, @var{parent}'s type is
-@var{parent-type}, @var{node}'s field name in @var{parent} is
+@var{node-index-max}).  It returns a function that is called with 3
+arguments: @var{node}, @var{parent}, and @var{bol}, and returns
+non-@code{nil} if @var{node}'s type is @var{node-type}, @var{parent}'s
+type is @var{parent-type}, @var{node}'s field name in @var{parent} is
 @var{node-field}, and @var{node}'s index among its siblings is between
 @var{node-index-min} and @var{node-index-max}.  If the value of an
-argument is @code{nil}, this matcher doesn't check for that argument.
+argument is @code{nil}, this matcher doesn't check that argument.
 For example, to match the first child where parent is
 @code{argument_list}, use
 
@@ -4844,30 +4863,32 @@ Parser-based Indentation
 @end example
 
 @item first-sibling
-This anchor is a function that given @w{@code{(@var{node} @var{parent}
-@var{bol})}}, returns the start of the first child of @var{parent}.
+This anchor is a function that is called with 3 arguments: @var{node},
+@var{parent}, and @var{bol}, and returns the start of the first child
+of @var{parent}.
 
 @item parent
-This anchor is a function that given @w{@code{(@var{node} @var{parent}
-@var{bol})}}, returns the start of @var{parent}.
+This anchor is a function that is called with 3 arguments: @var{node},
+@var{parent}, and @var{bol}, and returns the start of @var{parent}.
 
 @item parent-bol
-This anchor is a function that given @w{@code{(@var{node} @var{parent}
-@var{bol})}}, returns the first non-space character on the line of
-@var{parent}.
+This anchor is a function that is called with 3 arguments: @var{node},
+@var{parent}, and @var{bol}, and returns the first non-space character
+on the line of @var{parent}.
 
 @item prev-sibling
-This anchor is a function that given @w{@code{(@var{node} @var{parent}
-@var{bol})}}, returns the start of the previous sibling of @var{node}.
+This anchor is a function that is called with 3 arguments: @var{node},
+@var{parent}, and @var{bol}, and returns the start of the previous
+sibling of @var{node}.
 
 @item no-indent
-This anchor is a function that given @w{@code{(@var{node} @var{parent}
-@var{bol})}}, returns the start of @var{node}.
+This anchor is a function that is called with 3 arguments: @var{node},
+@var{parent}, and @var{bol}, and returns the start of @var{node}.
 
 @item prev-line
-This anchor is a function that given @w{@code{(@var{node} @var{parent}
-@var{bol})}}, returns the first non-whitespace charater on the
-previous line.
+This anchor is a function that is called with 3 arguments: @var{node},
+@var{parent}, and @var{bol}, and returns the first non-whitespace
+charater on the previous line.
 @end ftable
 
 @end defvar
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index bb0b8c61ee..aaa8f0f64d 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -406,7 +406,7 @@ Using Parser
 
 There is no need to explicitly parse a buffer, because parsing is done
 automatically and lazily.  A parser only parses when a Lisp program
-queris for a node in its syntax tree.  Therefore, when a parser is
+queries for a node in its syntax tree.  Therefore, when a parser is
 first created, it doesn't parse the buffer; it waits until the Lisp
 program queries for a node for the first time.  Similarly, when some
 change is made in the buffer, a parser doesn't re-parse immediately.
@@ -644,20 +644,14 @@ Retrieving Node
 
 By default, this function only traverses named nodes, but if @var{all}
 is non-@code{nil}, it traverses all the nodes.  If @var{backward} is
-non-nil, it traverses backwards (meaning visiting the last child first
+non-@code{nil}, it traverses backwards (i.e., it visits the last child first
 when traversing down the tree).  If @var{limit} is non-@code{nil}, it
 must be a number that limits the tree traversal to that many levels
 down the tree.
 @end defun
 
 @defun treesit-search-forward start predicate &optional all backward
-While @code{treesit-search-subtree} traverses the subtree of a node,
-this function usually starts with a leaf node and traverses every node
-comes after it in terms of buffer position.  It is useful for
-answering questions like ``what is the first node after @var{start} in
-the buffer that satisfies some condition?''
-
-Like @code{treesit-search-subtree}, this function also traverse the
+Like @code{treesit-search-subtree}, this function also traverses the
 parse tree and matches each node with @var{predicate} (except for
 @var{start}), where @var{predicate} can be a (case-insensitive) regexp
 or a function.  For a tree like the below where @var{start} is marked
@@ -675,15 +669,24 @@ Retrieving Node
                     |   |    |  |  |
                     8   9    11 12 13
 @end group
+@end example
 
 Note that this function doesn't traverse the subtree of @var{start},
 and it always traverse leaf nodes first, then upwards.
-@end example
 
 Like @code{treesit-search-subtree}, this function only searches for
 named nodes by default, but if @var{all} is non-@code{nil}, it
 searches for all nodes.  If @var{backward} is non-@code{nil}, it
 searches backwards.
+
+@c FIXME: Still not very clear: the difference between ``traverse
+@c a subtree of a node'' and ``traverse every node that comes after
+@c it''.
+While @code{treesit-search-subtree} traverses the subtree of a node,
+this function usually starts with a leaf node and traverses every node
+that comes after it in the buffer position order.  It is useful for
+answering questions like ``what is the first node after @var{start} in
+the buffer that satisfies some condition?''
 @end defun
 
 @defun treesit-search-forward-goto predicate side &optional all backward
@@ -1172,11 +1175,11 @@ Pattern Matching
 
 @heading S-expression patterns
 
-@cindex patterns as sexps
+@cindex tree-sitter patterns as sexps
 @cindex patterns, tree-sitter, in sexp form
 Besides strings, Emacs provides a s-expression based syntax for
-patterns.  It largely resembles the string-based syntax.  For example,
-the following query
+tree-sitter patterns.  It largely resembles the string-based syntax.
+For example, the following query
 
 @example
 @group

commit 57b904f4bab7aea7ddb9d3b36229008a47b32ff1
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Oct 22 22:50:56 2022 -0700

    Fix infinite loop in treesit-search-forward-goto
    
    * lisp/treesit.el (treesit-search-forward-goto): Remove UP argument.
    * src/treesit.c (treesit_traverse_child_helper): New function.
    (treesit_search_forward): Remove UP_ONLY and SKIP_START argument.
    Don't traverse subtree of START.  And after we've found the next
    sibling/parent, go down to the first leaf node.  Also change recursion
    to loop.
    (Ftreesit_search_forward): Change docstring, remove UP argument.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 502a0e4f26..bb0b8c61ee 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -650,7 +650,7 @@ Retrieving Node
 down the tree.
 @end defun
 
-@defun treesit-search-forward start predicate &optional all backward up
+@defun treesit-search-forward start predicate &optional all backward
 While @code{treesit-search-subtree} traverses the subtree of a node,
 this function usually starts with a leaf node and traverses every node
 comes after it in terms of buffer position.  It is useful for
@@ -665,32 +665,31 @@ Retrieving Node
 
 @example
 @group
-              o
+              16
               |
-     3--------4-----------8
+     3--------7-----------15
      |        |           |
-o--o-+--1  5--+--6    9---+-----12
-|  |    |        |    |         |
-o  o    2        7  +-+-+    +--+--+
+o--1-+--2  4--+--6    10--+-----14
+|  |             |    |         |
+o  o             5  +-+-+    +--+--+
                     |   |    |  |  |
-                    10  11   13 14 15
+                    8   9    11 12 13
 @end group
+
+Note that this function doesn't traverse the subtree of @var{start},
+and it always traverse leaf nodes first, then upwards.
 @end example
 
 Like @code{treesit-search-subtree}, this function only searches for
 named nodes by default, but if @var{all} is non-@code{nil}, it
 searches for all nodes.  If @var{backward} is non-@code{nil}, it
 searches backwards.
-
-If @var{up} is non-@code{nil}, this function will only traverse to
-siblings and parents.  In that case, only the nodes marked by 1, 3, 4,
-and 8 above would be traversed.
 @end defun
 
-@defun treesit-search-forward-goto predicate side &optional all backward up
+@defun treesit-search-forward-goto predicate side &optional all backward
 This function moves point to the beginning or end of the next node in
 the buffer that matches @var{predicate}.  Arguments @var{predicate},
-@var{all}, @var{backward}, and @var{up} are the same as in
+@var{all} and @var{backward} are the same as in
 @code{treesit-search-forward}.  @var{side} controls on which side of
 the matched node we stop: it can be @code{start} or @code{end}.
 @c FIXME: Wouldn't it be convenient to make SIDE optional argument,
diff --git a/lisp/treesit.el b/lisp/treesit.el
index f0a46e17c6..3557d00d66 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -809,7 +809,7 @@ treesit-check-indent
 ;;; Search
 
 (defun treesit-search-forward-goto
-    (predicate side &optional all backward up)
+    (predicate side &optional all backward)
   "Search forward for a node and move to it.
 
 Stops at the first node after point that matches PREDICATE.
@@ -822,7 +822,7 @@ treesit-search-forward-goto
 or end of the matches node, it can be either \\='start or
 \\='end.
 
-ALL, BACKWARD, and UP are the same as in `treesit-search-forward'."
+ALL and BACKWARD are the same as in `treesit-search-forward'."
   (let ((node (treesit-node-at (point)))
         (start (point)))
     ;; Often the EOF (point-max) is a newline, and `treesit-node-at'
@@ -837,7 +837,7 @@ treesit-search-forward-goto
                          (>= (point) start)
                        (<= (point) start)))
       (setq node (treesit-search-forward
-                  node predicate all backward up))
+                  node predicate all backward))
       (if-let ((pos (pcase side
                       ('start (treesit-node-start node))
                       ('end (treesit-node-end node)))))
diff --git a/src/treesit.c b/src/treesit.c
index 990a029ed1..b4dac587b1 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2342,6 +2342,35 @@ treesit_traverse_sibling_helper (TSNode node, bool forward, bool named)
     }
 }
 
+/* Return the first/last named/unamed child of NODE.  FORWARD controls
+   the direction and NAMED controls the nameness.  */
+static TSNode
+treesit_traverse_child_helper (TSNode node, bool forward, bool named)
+{
+  if (forward)
+    {
+      if (named)
+	return ts_node_named_child(node, 0);
+      else
+	return ts_node_child(node, 0);
+    }
+  else
+    {
+      if (named)
+	{
+	  uint32_t count = ts_node_named_child_count (node);
+	  uint32_t idx = count == 0 ? 0 : count - 1;
+	  return ts_node_named_child (node, idx);
+	}
+      else
+	{
+	  uint32_t count = ts_node_child_count (node);
+	  uint32_t idx = count == 0 ? 0 : count - 1;
+	  return ts_node_child (node, idx);
+	}
+    }
+}
+
 /* Return true if NODE matches PRED.  PRED can be a string or a
    function.  This function doesn't check for PRED's type.  */
 static bool
@@ -2416,41 +2445,47 @@ treesit_search_dfs (TSNode *root, Lisp_Object pred, Lisp_Object parser,
 /* Go thought the whole tree linearly depth first, starting from
    START.  PRED, PARSER, NAMED, FORWARD are the same as in
    ts_search_subtre.  If UP_ONLY is true, never go to children, only
-   sibling and parents.  If SKIP_START is true, don'tt match
-   START.  */
+   sibling and parents.  */
 static bool
 treesit_search_forward (TSNode *start, Lisp_Object pred, Lisp_Object parser,
-			bool named, bool forward, bool up_only, bool skip_start)
+			bool named, bool forward)
 {
   TSNode node = *start;
 
-  if (!up_only
-      && treesit_search_dfs (start, pred, parser, named, forward, 0, true,
-			     skip_start))
-    return true;
+  /* We don't search for subtree and always search from the leaf
+     nodes.  This way repeated call of this function traverses each
+     node in the tree once and only once:
 
-  TSNode next = treesit_traverse_sibling_helper (node, forward, named);
-  while (ts_node_is_null (next))
+     (while node (setq node (treesit-search-forward node)))
+  */
+  while (true)
     {
-      node = ts_node_parent (node);
-      if (ts_node_is_null (node))
-	return false;
+      TSNode next = treesit_traverse_sibling_helper (node, forward, named);
+      while (ts_node_is_null (next))
+	{
+	  /* There is no next sibling, go to parent.  */
+	  node = ts_node_parent (node);
+	  if (ts_node_is_null (node))
+	    return false;
 
-      if (treesit_traverse_match_predicate (node, pred, parser))
+	  if (treesit_traverse_match_predicate (node, pred, parser))
+	    {
+	      *start = node;
+	      return true;
+	    }
+	  next = treesit_traverse_sibling_helper (node, forward, named);
+	}
+      /* We are at the next sibling, deep dive into the first leaf
+	 node.  */
+      TSNode next_next = ts_node_child (next, 0);
+      while (!ts_node_is_null (next_next))
 	{
-	  *start = node;
-	  return true;
+	  next = next_next;
+	  next_next = treesit_traverse_child_helper (next, forward, named);
 	}
-      next = treesit_traverse_sibling_helper (node, forward, named);
+      /* At this point NEXT is a leaf node.  */
+      node = next;
     }
-  if (treesit_search_forward (&next, pred, parser, named, forward, up_only,
-			      false))
-    {
-      *start = next;
-      return true;
-    }
-  else
-    return false;
 }
 
 DEFUN ("treesit-search-subtree",
@@ -2500,7 +2535,7 @@ DEFUN ("treesit-search-subtree",
 
 DEFUN ("treesit-search-forward",
        Ftreesit_search_forward,
-       Streesit_search_forward, 2, 5, 0,
+       Streesit_search_forward, 2, 4, 0,
        doc: /* Search for node matching PREDICATE in the parse tree of START.
 
 Start traversing the tree from node START, and match PREDICATE with
@@ -2513,36 +2548,35 @@ DEFUN ("treesit-search-forward",
 
 Return the first matched node, or nil if none matches.
 
-For a tree like below,  where START is marked by 1, traverse in the
-order of numbers:
+For a tree like below, where START is marked by 1, traverse as
+numbered:
                 16
                 |
-       3--------4-----------8
+       3--------7-----------15
        |        |           |
-  o--o-+--1  5--+--6    9---+-----12
-  |  |    |        |    |         |
-  o  o    2        7  +-+-+    +--+--+
+  o--1-+--2  4--+--6    10--+-----14
+  |  |             |    |         |
+  o  o             5  +-+-+    +--+--+
                       |   |    |  |  |
-                      10  11   13 14 15
+                      8   9    11 12 13
 
-If UP is non-nil, only traverse siblings and parents of START.  In that
-case, only the nodes 1, 3, 4, 8, and 16 would be traversed.  */)
+Note that this function doesn't traverse the subtree of START, and it
+always traverse leaf nodes first, then upwards.  */)
   (Lisp_Object start, Lisp_Object predicate, Lisp_Object all,
-   Lisp_Object backward, Lisp_Object up)
+   Lisp_Object backward)
 {
   CHECK_TS_NODE (start);
   CHECK_TYPE (STRINGP (predicate) || FUNCTIONP (predicate),
 	      list3 (Qor, Qstringp, Qfunctionp), predicate);
   CHECK_SYMBOL (all);
   CHECK_SYMBOL (backward);
-  CHECK_SYMBOL (up);
 
   treesit_initialize ();
 
   TSNode treesit_start = XTS_NODE (start)->node;
   Lisp_Object parser = XTS_NODE (start)->parser;
   if (treesit_search_forward (&treesit_start, predicate, parser, NILP (all),
-			      NILP (backward), !NILP (up), true))
+			      NILP (backward)))
     return make_treesit_node (parser, treesit_start);
   else
     return Qnil;

commit 773cce640fc5d67cb1a64622defa073d7ec5fcc4
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Oct 22 18:44:11 2022 -0700

    Resolve FIXME's in tree-sitter manual sections
    
    Pattern vs query: a query consists of many patterns.  I tightened up
    the use of pattern vs query in the manual, now there shouldn't be
    ambiguities.
    
    * doc/lispref/modes.texi (Parser-based Font Lock):
    * doc/lispref/parsing.texi (Language Definitions): Resolve FIXME's.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 24892077d1..3537d312f2 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3904,10 +3904,17 @@ Parser-based Font Lock
 schemes.  The tree-sitter counterpart of @var{font-lock-keywords} is
 @var{treesit-font-lock-settings}.
 
-@c FIXME: The ``query'' part here and thereafter comes ``out of the
-@c blue''.  There should be some text here explaining what those
-@c ``queries'' are and how are they related to fontifications, or a
-@c cross-reference to another place with such an explanation.
+In general, tree-sitter fontification works like the following: a Lisp
+program provides a @dfn{query} consisting of @dfn{patterns} with
+@dfn{capture names}.  Tree-sitter finds the nodes in the parse tree
+that match these patterns, tags the corresponding capture names onto
+the nodes, and returns them to the Lisp program.  The Lisp program
+takes theses nodes and highlights the corresponding buffer text of
+each node depending on the tagged capture name of the node.  For
+example, a node tagged @code{font-lock-keyword} would simply be
+highlighted in @code{font-lock-keyword} face.  For more information on
+queries, patterns and capture names, @pref{Pattern Matching}.
+
 @defun treesit-font-lock-rules :keyword value query...
 This function is used to set @var{treesit-font-lock-settings}.  It
 takes care of compiling queries and other post-processing, and outputs
@@ -3948,9 +3955,10 @@ Parser-based Font Lock
 @item @tab @code{keep} @tab Fill-in regions without an existing face
 @end multitable
 
-@c FIXME: The ``capture names'' part should be expl,ained before it is
-@c first used: what it is and how it's related to fontifications.
-Capture names in @var{query} should be face names like
+Lisp programs mark patterns in the query with capture names (names
+that starts with @code{@@}), and tree-sitter will return matched nodes
+with capture names tagged onto them.  For the purpose of
+fontification, capture names in @var{query} should be face names like
 @code{font-lock-keyword-face}.  The captured node will be fontified
 with that face.  Capture names can also be function names, in which
 case the function is called with 3 arguments: @var{start}, @var{end},
@@ -3966,9 +3974,8 @@ Parser-based Font Lock
 @code{font-lock-maximum-decoration} controls which levels are
 activated.
 
-@c FIXME: This should be rewritten using our style: ``each element of
-@c the list is a list of the form (FOO BAR BAZ), where FOO...'' etc.
-Inside each sublist are feature symbols, which correspond to the
+Each element of the list is a list of the form @w{@code{(@var{feature}
+@dots{})}}, where each @var{feature} corresponds to the
 @code{:feature} value of a query defined in
 @code{treesit-font-lock-rules}.  Removing a feature symbol from this
 list disables the corresponding query during font-lock.
@@ -3992,40 +3999,18 @@ Parser-based Font Lock
 Major modes should set this variable before calling
 @code{treesit-font-lock-enable}.
 
-@c FIXME: ``for further changes''?  This should clarify when this
-@c function has to be called.
 @findex treesit-font-lock-recompute-features
-In addition, for further changes to this variable to take effect, call
-@code{treesit-font-lock-recompute-features}.
+For this variable to take effect, a Lisp program should call
+@code{treesit-font-lock-recompute-features} (which resets
+@code{treesit-font-lock-settings} accordingly).
 @end defvar
 
 @defvar treesit-font-lock-settings
 A list of settings for tree-sitter based font lock.  The exact format
 of this variable is considered internal.  One should always use
 @code{treesit-font-lock-rules} to set this variable.
-
-@c FIXME: If the format is considered ``internal'', why do we need to
-@c describe it here?
-Each @var{setting} is of form
-
-@example
-(@var{query} @var{enable} @var{feature} @var{override})
-@end example
-
-@var{query} must be a compiled query (@pxref{Pattern Matching}).
-
-For @var{setting} to be activated for font-lock, @var{enable} must be
-@code{t}.  To disable this @var{setting}, set @var{enable} to
-@code{nil}.
-
-@var{feature} is the ``feature name'' of the query, users can control
-which features are enabled with @code{font-lock-maximum-decoration}
-and @code{treesit-font-lock-feature-list}.
-
-@var{override} is the override flag for this query.  Its value can be
-@code{t}, @code{nil}, @code{append}, @code{prepend}, or @code{keep}.
-@c FIXME: See where?
-See more in @code{treesit-font-lock-rules}.
+@c Because the format is internal, we don't document them here.
+@c Though We do have explanations in the docstring.
 @end defvar
 
 Multi-language major modes should provide range functions in
@@ -4790,27 +4775,26 @@ Parser-based Indentation
 @var{language} is a language symbol, and @var{rules} is a list of the
 form @w{@code{(@var{matcher} @var{anchor} @var{offset})}}.
 
-@c FIXME: ``node''?
-First, Emacs passes the node at point to @var{matcher}; if it returns
-non-@code{nil}, this rule is applicable.  Then Emacs passes the node
-to @var{anchor}, which returns a buffer position.  Emacs takes the
-column number of that position, adds @var{offset} to it, and the
-result is the indentation column for the current line.
+First, Emacs passes the smallest tree-sitter node at the beginning of
+the current line to @var{matcher}; if it returns non-@code{nil}, this
+rule is applicable.  Then Emacs passes the node to @var{anchor}, which
+returns a buffer position.  Emacs takes the column number of that
+position, adds @var{offset} to it, and the result is the indentation
+column for the current line.
 
 The @var{matcher} and @var{anchor} are functions, and Emacs provides
 convenient defaults for them.
 
-@c FIXME: Clarify the following description.  In particular, how to
-@c find/compute ``the largest node'' and its ``parent''?
 Each @var{matcher} or @var{anchor} is a function that takes three
 arguments: @var{node}, @var{parent}, and @var{bol}.  The argument
 @var{bol} is the buffer position whose indentation is required: the
 position of the first non-whitespace character after the beginning of
 the line.  The argument @var{node} is the largest (highest-in-tree)
 node that starts at that position; and @var{parent} is the parent of
-@var{node}.  @var{matcher} should return non-@code{nil} if the rule is
-applicable, and @var{anchor} should return a buffer position that is
-the basis of the indentation.
+@var{node}.  Emacs finds @var{bol}, @var{node} and @var{parent} and
+passes them to each @var{matcher} and @var{anchor}.  @var{matcher}
+should return non-@code{nil} if the rule is applicable, and
+@var{anchor} should return a buffer position.
 @end defvar
 
 @defvar treesit-simple-indent-presets
@@ -4821,63 +4805,69 @@ Parser-based Indentation
 
 @ftable @code
 @item no-node
-This matcher is a symbol that matches the case where @var{node} is
+This matcher is a function that matches the case where @var{node} is
 @code{nil}, i.e., there is no node that starts at @var{bol}.  This is
 the case when @var{bol} is on an empty line or inside a multi-line
 string, etc.
 
 @item parent-is
-This matcher is a function of one argument, @var{type}; it matches if
-the type of the parent node is @var{type}.
+This matcher is a function of one argument, @var{type}; it return a
+function that given @w{@code{(@var{node} @var{parent} @var{bol})}},
+matches if @var{parent}'s type is @var{type}.
 
 @item node-is
-This matcher is a function of one argument, @var{type}; it matches if
-the node's type is @var{type}.
+This matcher is a function of one argument, @var{type}; it returns a
+function that given @w{@code{(@var{node} @var{parent} @var{bol})}},
+matches if @var{node}'s type is @var{type}.
 
-@c FIXME: The description of this matcher is unclear.  What is
-@c ``parent'' and what does it mean ``captures NODE''?
 @item query
-This matcher is a function of one argument, @var{query}; it matches if
-querying @var{parent} with @var{query} captures @var{node}.  The
-capture name does not matter.   @c Why is this bit important?
+This matcher is a function of one argument, @var{query}; it returns a
+function that given @w{@code{(@var{node} @var{parent} @var{bol})}},
+matches if querying @var{parent} with @var{query} captures @var{node}
+(@pxref{Pattern Matching}).
 
 @item match
 This matcher is a function of 5 arguments: @var{node-type},
 @var{parent-type}, @var{node-field}, @var{node-index-min}, and
-@var{node-index-max}).  It matches if @var{node}'s type is @var{node-type},
-@var{parent}'s type is @var{parent-type}, @var{node}'s field name in
-@var{parent} is @var{node-field}, and @var{node}'s index among its
-siblings is between @var{node-index-min} and @var{node-index-max}.  If
-@c FIXME: ``constraint''?
-the value of a constraint is nil, this matcher doesn't check for that
-constraint.  For example, to match the first child where parent is
+@var{node-index-max}).  It returns a function that given
+@w{@code{(@var{node} @var{parent} @var{bol})}}, matches if
+@var{node}'s type is @var{node-type}, @var{parent}'s type is
+@var{parent-type}, @var{node}'s field name in @var{parent} is
+@var{node-field}, and @var{node}'s index among its siblings is between
+@var{node-index-min} and @var{node-index-max}.  If the value of an
+argument is @code{nil}, this matcher doesn't check for that argument.
+For example, to match the first child where parent is
 @code{argument_list}, use
 
 @example
 (match nil "argument_list" nil nil 0 0)
 @end example
 
-@c FIXME: ``PARENT''? is that an argument of the anchor function
 @item first-sibling
-This anchor returns the start of the first child of @var{parent}.
+This anchor is a function that given @w{@code{(@var{node} @var{parent}
+@var{bol})}}, returns the start of the first child of @var{parent}.
 
 @item parent
-This anchor returns the start of @var{parent}. @c FIXME: Likewise.
+This anchor is a function that given @w{@code{(@var{node} @var{parent}
+@var{bol})}}, returns the start of @var{parent}.
 
 @item parent-bol
-This anchor returns the first non-space character on the line of
+This anchor is a function that given @w{@code{(@var{node} @var{parent}
+@var{bol})}}, returns the first non-space character on the line of
 @var{parent}.
 
-@c FIXME: ``NODE''?
 @item prev-sibling
-This anchor returns the start of the previous sibling of @var{node}.
+This anchor is a function that given @w{@code{(@var{node} @var{parent}
+@var{bol})}}, returns the start of the previous sibling of @var{node}.
 
 @item no-indent
-This anchor returns the start of @var{node}, i.e., no indent. @c ???
+This anchor is a function that given @w{@code{(@var{node} @var{parent}
+@var{bol})}}, returns the start of @var{node}.
 
 @item prev-line
-This anchor returns the first non-whitespace charater on the previous
-line.
+This anchor is a function that given @w{@code{(@var{node} @var{parent}
+@var{bol})}}, returns the first non-whitespace charater on the
+previous line.
 @end ftable
 
 @end defvar
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 9079e0f781..502a0e4f26 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -95,7 +95,7 @@ Language Definitions
 @item (symbol-error @var{error-msg})
 This means Emacs could not find in the library the expected function
 that every language definition library should export.
-@item (version_mismatch @var{error-msg})
+@item (version-mismatch @var{error-msg})
 This means the version of language definition library is incompatible
 with that of the tree-sitter library.
 @end table
@@ -253,7 +253,7 @@ Language Definitions
 The grammar file is usually @file{grammar.js} in a language
 definition's project repository.  The link to a language definition's
 home page can be found on
-@uref{https://tree-sitter.github.io/tree-sitter, the tree-sitter's
+@uref{https://tree-sitter.github.io/tree-sitter, tree-sitter's
 homepage}.
 
 The grammar definition is written in JavaScript.  For example, the
@@ -405,11 +405,11 @@ Using Parser
 @end defun
 
 There is no need to explicitly parse a buffer, because parsing is done
-automatically and lazily.  A parser only parses when the mode queris
-for a node in its syntax tree.  Therefore, when a parser is first
-created, it doesn't parse the buffer; it waits until the mode queries
-for a node for the first time.  Similarly, when some change is made in
-the buffer, a parser doesn't re-parse immediately.
+automatically and lazily.  A parser only parses when a Lisp program
+queris for a node in its syntax tree.  Therefore, when a parser is
+first created, it doesn't parse the buffer; it waits until the Lisp
+program queries for a node for the first time.  Similarly, when some
+change is made in the buffer, a parser doesn't re-parse immediately.
 
 @vindex treesit-buffer-too-large
 When a parser does parse, it checks for the size of the buffer.
@@ -510,7 +510,7 @@ Retrieving Node
 @group
 ;; Find the node at point in a C parser's syntax tree.
 (treesit-node-at (point) 'c)
-  @result{} #<treesit-node from 1 to 4 in *scratch*>
+  @result{} #<treesit-node (primitive_type) in *scratch*>
 @end group
 @end example
 @end defun
@@ -606,7 +606,7 @@ Retrieving Node
 @group
 ;; Get the child that has "body" as its field name.
 (treesit-child-by-field-name node "body")
-  @result{} #<treesit-node from 3 to 11 in *scratch*>
+  @result{} #<treesit-node (compound_statement) in *scratch*>
 @end group
 @end example
 @end defun
@@ -644,20 +644,24 @@ Retrieving Node
 
 By default, this function only traverses named nodes, but if @var{all}
 is non-@code{nil}, it traverses all the nodes.  If @var{backward} is
-@c FIXME: What does it mean to ``traverse backward''?
-non-nil, it traverses backwards.  If @var{limit} is non-@code{nil}, it
+non-nil, it traverses backwards (meaning visiting the last child first
+when traversing down the tree).  If @var{limit} is non-@code{nil}, it
 must be a number that limits the tree traversal to that many levels
 down the tree.
 @end defun
 
 @defun treesit-search-forward start predicate &optional all backward up
-@c FIXME: Explain better what is the differencve between this function
-@c and the previous one.
-This function is somewhat similar to @code{treesit-search-subtree}.
-It also traverse the parse tree and matches each node with
-@var{predicate} (except for @var{start}), where @var{predicate} can be
-a (case-insensitive) regexp or a function.  For a tree like the below
-where @var{start} is marked 1, this function traverses as numbered:
+While @code{treesit-search-subtree} traverses the subtree of a node,
+this function usually starts with a leaf node and traverses every node
+comes after it in terms of buffer position.  It is useful for
+answering questions like ``what is the first node after @var{start} in
+the buffer that satisfies some condition?''
+
+Like @code{treesit-search-subtree}, this function also traverse the
+parse tree and matches each node with @var{predicate} (except for
+@var{start}), where @var{predicate} can be a (case-insensitive) regexp
+or a function.  For a tree like the below where @var{start} is marked
+1, this function traverses as numbered:
 
 @example
 @group
@@ -830,7 +834,7 @@ Accessing Node Information
 
 @cindex tree-sitter extra node
 @cindex extra node, tree-sitter
-A node can be ``extra'': extra nodes represent things like comments,
+A node can be ``extra'': such nodes represent things like comments,
 which can appear anywhere in the text.
 
 @cindex tree-sitter node that has changes
@@ -1007,9 +1011,9 @@ Pattern Matching
 
 @heading More query syntax
 
-Besides node type and capture, tree-sitter's query syntax can express
-anonymous node, field name, wildcard, quantification, grouping,
-alternation, anchor, and predicate.
+Besides node type and capture, tree-sitter's pattern syntax can
+express anonymous node, field name, wildcard, quantification,
+grouping, alternation, anchor, and predicate.
 
 @subheading Anonymous node
 
@@ -1022,9 +1026,9 @@ Pattern Matching
 
 @subheading Wild card
 
-In a query pattern, @samp{(_)} matches any named node, and @samp{_}
-matches any named and anonymous node.  For example, to capture any
-named child of a @code{binary_expression} node, the pattern would be
+In a pattern, @samp{(_)} matches any named node, and @samp{_} matches
+any named and anonymous node.  For example, to capture any named child
+of a @code{binary_expression} node, the pattern would be
 
 @example
 (binary_expression (_) @@in_biexp)
@@ -1032,10 +1036,10 @@ Pattern Matching
 
 @subheading Field name
 
-It is possible to capture child nodes that have specific field names:
+It is possible to capture child nodes that have specific field names.
+In the pattern below, @code{declarator} and @code{body} are field
+names, indicated by the colon following them.
 
-@c FIXME: The significance of ``:'' should be explained, and also what
-@c are ``declarator'' and ``body''.
 @example
 @group
 (function_definition
@@ -1059,7 +1063,6 @@ Pattern Matching
 @samp{*} matches the preceding pattern zero or more times, @samp{+}
 matches one or more times, and @samp{?} matches zero or one time.
 
-@c FIXME: ``pattern'' or :''query''?  Or maybe ``query pattern''?
 For example, the following pattern matches @code{type_declaration}
 nodes that has @emph{zero or more} @code{long} keyword.
 
@@ -1087,9 +1090,9 @@ Pattern Matching
 @subheading Alternation
 
 Again, similar to regular expressions, we can express ``match anyone
-from this group of patterns'' in the query pattern.  The syntax is a
-list of patterns enclosed in square brackets.  For example, to capture
-some keywords in C, the query pattern would be
+from this group of patterns'' in a pattern.  The syntax is a list of
+patterns enclosed in square brackets.  For example, to capture some
+keywords in C, the pattern would be
 
 @example
 @group
@@ -1136,7 +1139,7 @@ Pattern Matching
 @subheading Predicate
 
 It is possible to add predicate constraints to a pattern.  For
-example, with the following query pattern:
+example, with the following pattern:
 
 @example
 @group
@@ -1170,11 +1173,11 @@ Pattern Matching
 
 @heading S-expression patterns
 
-@cindex query patterns as sexps
+@cindex patterns as sexps
 @cindex patterns, tree-sitter, in sexp form
-Besides strings, Emacs provides a s-expression based syntax for query
+Besides strings, Emacs provides a s-expression based syntax for
 patterns.  It largely resembles the string-based syntax.  For example,
-the following pattern
+the following query
 
 @example
 @group

commit 6f28810f6ba112059c09bc3bfbb2ef8e5c3f15ee
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sat Oct 22 18:48:42 2022 +0300

    Clean up tree-sitter sections of the ELisp manual
    
    * doc/lispref/parsing.texi (Parsing Program Source):
    * doc/lispref/modes.texi (Font Lock Mode)
    (Parser-based Font Lock): Fix wording, punctuation, and markup.
    Add index entries.
    
    * lisp/treesit.el (treesit-node-at, treesit-language-at): Rename
    argument POINT to POS.

diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 09e7aad714..e79c8cef18 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -938,6 +938,7 @@ Top
 * Syntactic Font Lock::     Fontification based on syntax tables.
 * Multiline Font Lock::     How to coerce Font Lock into properly
                               highlighting multiline constructs.
+* Parser-based Font Lock::  Use parse data for fontification.
 
 Multiline Font Lock Constructs
 
@@ -948,6 +949,7 @@ Top
 Automatic Indentation of code
 
 * SMIE::                    A simple minded indentation engine.
+* Parser-based Indentation:: Parser-based indentation engine.
 
 Simple Minded Indentation Engine
 
@@ -1365,9 +1367,10 @@ Top
 * Language Definitions::     Loading tree-sitter language definitions.
 * Using Parser::             Introduction to parsers.
 * Retrieving Node::          Retrieving node from syntax tree.
-* Accessing Node::           Accessing node information.
+* Accessing Node Information:: Accessing node information.
 * Pattern Matching::         Pattern matching with query patterns.
 * Multiple Languages::       Parse text written in multiple languages.
+* Tree-sitter major modes::  Develop major modes using tree-sitter.
 * Tree-sitter C API::        Compare the C API and the ELisp API.
 
 Syntax Descriptors
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index ed232556b2..24892077d1 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -2852,12 +2852,13 @@ Font Lock Mode
 a particular major mode.
 
   Font Lock mode finds text to highlight in three ways: through
-syntactic parsing based on the syntax table, through searching
-(usually for regular expressions), and through parsing based on a
-full-blown parser.  Syntactic fontification happens first; it finds
-comments and string constants and highlights them.  Search-based
-fontification happens second.  Parser-based fontification can be
-optionally enabled and it will precede the other two fontifications.
+parsing based on a full-blown parser (usually, via an external library
+or program), through syntactic parsing based on the Emacs's built-in
+syntax table, or through searching (usually for regular expressions).
+If enabled, parser-based fontification happens first
+(@pxref{Parser-based Font Lock}).  Syntactic fontification happens
+next; it finds comments and string constants and highlights them.
+Search-based fontification happens last.
 
 @menu
 * Font Lock Basics::            Overview of customizing Font Lock.
@@ -2872,7 +2873,7 @@ Font Lock Mode
 * Syntactic Font Lock::         Fontification based on syntax tables.
 * Multiline Font Lock::         How to coerce Font Lock into properly
                                   highlighting multiline constructs.
-* Parser-based Font Lock::      Use a parser for fontification.
+* Parser-based Font Lock::      Use parse data for fontification.
 @end menu
 
 @node Font Lock Basics
@@ -3878,34 +3879,40 @@ Region to Refontify
 
 @node Parser-based Font Lock
 @subsection Parser-based Font Lock
+@cindex parser-based font-lock
 
-@c This node is written when the only parser Emacs has is tree-sitter,
-@c if in the future more parser are supported, feel free to reorganize
-@c and rewrite this node to describe multiple parsers in parallel.
+@c This node is written when the only parser Emacs has is tree-sitter;
+@c if in the future more parser are supported, this should be
+@c reorganized and rewritten to describe multiple parsers in parallel.
 
 Besides simple syntactic font lock and regexp-based font lock, Emacs
-also provides complete syntactic font lock with the help of a parser,
-currently provided by the tree-sitter library (@pxref{Parsing Program
-Source}).
+also provides complete syntactic font lock with the help of a parser.
+Currently, Emacs uses the tree-sitter library (@pxref{Parsing Program
+Source}) for this purpose.
 
 @defun treesit-font-lock-enable
 This function enables parser-based font lock in the current buffer.
 @end defun
 
-Parser-based font lock and other font lock mechanism are not mutually
+Parser-based font lock and other font lock mechanisms are not mutually
 exclusive.  By default, if enabled, parser-based font lock runs first,
-then the simple syntactic font lock (if enabled), then regexp-based
+then the syntactic font lock (if enabled), then the regexp-based
 font lock.
 
 Although parser-based font lock doesn't share the same customization
-variables with regexp-based font lock, parser-based font lock uses
-similar customization schemes.  The tree-sitter counterpart of
-@var{font-lock-keywords} is @var{treesit-font-lock-settings}.
-
+variables with regexp-based font lock, it uses similar customization
+schemes.  The tree-sitter counterpart of @var{font-lock-keywords} is
+@var{treesit-font-lock-settings}.
+
+@c FIXME: The ``query'' part here and thereafter comes ``out of the
+@c blue''.  There should be some text here explaining what those
+@c ``queries'' are and how are they related to fontifications, or a
+@c cross-reference to another place with such an explanation.
 @defun treesit-font-lock-rules :keyword value query...
 This function is used to set @var{treesit-font-lock-settings}.  It
-takes care of compiling queries and other post-processing and outputs
-a value that @var{treesit-font-lock-settings} accepts.  An example:
+takes care of compiling queries and other post-processing, and outputs
+a value that @var{treesit-font-lock-settings} accepts.  Here's an
+example:
 
 @example
 @group
@@ -3922,8 +3929,8 @@ Parser-based Font Lock
 @end example
 
 This function takes a list of text or s-exp queries.  Before each
-query, there are @var{:keyword} and @var{value} pairs that configure
-that query.  The @code{:lang} keyword sets the query’s language and
+query, there are @var{:keyword}-@var{value} pairs that configure
+that query.  The @code{:lang} keyword sets the query's language and
 every query must specify the language.  The @code{:feature} keyword
 sets the feature name of the query.  Users can control which features
 are enabled with @code{font-lock-maximum-decoration} and
@@ -3941,34 +3948,37 @@ Parser-based Font Lock
 @item @tab @code{keep} @tab Fill-in regions without an existing face
 @end multitable
 
+@c FIXME: The ``capture names'' part should be expl,ained before it is
+@c first used: what it is and how it's related to fontifications.
 Capture names in @var{query} should be face names like
 @code{font-lock-keyword-face}.  The captured node will be fontified
 with that face.  Capture names can also be function names, in which
-case the function is called with (@var{start} @var{end} @var{node}),
-where @var{start} and @var{end} are the start and end position of the
-node in buffer, and @var{node} is the node itself.  If a capture name
-is both a face and a function, the face takes priority.  If a capture
-name is not a face name nor a function name, it is ignored.
+case the function is called with 3 arguments: @var{start}, @var{end},
+and @var{node}, where @var{start} and @var{end} are the start and end
+position of the node in buffer, and @var{node} is the node itself.  If
+a capture name is both a face and a function, the face takes priority.
+If a capture name is neither a face nor a function, it is ignored.
 @end defun
 
 @defvar treesit-font-lock-feature-list
-This is a list of lists of feature symbols.
-
-Each sublist represents a decoration level.
+This is a list of lists of feature symbols.  Each element of the list
+is a list that represents a decoration level.
 @code{font-lock-maximum-decoration} controls which levels are
 activated.
 
-Inside each sublist are feature symbols, which corresponds to the
+@c FIXME: This should be rewritten using our style: ``each element of
+@c the list is a list of the form (FOO BAR BAZ), where FOO...'' etc.
+Inside each sublist are feature symbols, which correspond to the
 @code{:feature} value of a query defined in
 @code{treesit-font-lock-rules}.  Removing a feature symbol from this
 list disables the corresponding query during font-lock.
 
-Common feature names (for general programming language) include
-function-name, type, variable-name (LHS of assignments), builtin,
-constant, keyword, string-interpolation, comment, doc, string,
-operator, preprocessor, escape-sequence, key (in key-value
-pairs).  Major modes are free to subdivide or extend on these
-common features.
+Common feature names, for many programming languages, include
+function-name, type, variable-name (left-hand-side or @acronym{LHS} of
+assignments), builtin, constant, keyword, string-interpolation,
+comment, doc, string, operator, preprocessor, escape-sequence, and key
+(in key-value pairs).  Major modes are free to subdivide or extend
+these common features.
 
 For example, the value of this variable could be:
 @example
@@ -3982,16 +3992,20 @@ Parser-based Font Lock
 Major modes should set this variable before calling
 @code{treesit-font-lock-enable}.
 
+@c FIXME: ``for further changes''?  This should clarify when this
+@c function has to be called.
 @findex treesit-font-lock-recompute-features
-In addition, for further changes to this variable to take effect, run
+In addition, for further changes to this variable to take effect, call
 @code{treesit-font-lock-recompute-features}.
 @end defvar
 
 @defvar treesit-font-lock-settings
-A list of @var{setting}s for tree-sitter font lock.  The exact format
+A list of settings for tree-sitter based font lock.  The exact format
 of this variable is considered internal.  One should always use
 @code{treesit-font-lock-rules} to set this variable.
 
+@c FIXME: If the format is considered ``internal'', why do we need to
+@c describe it here?
 Each @var{setting} is of form
 
 @example
@@ -4001,15 +4015,17 @@ Parser-based Font Lock
 @var{query} must be a compiled query (@pxref{Pattern Matching}).
 
 For @var{setting} to be activated for font-lock, @var{enable} must be
-t.  To disable this @var{setting}, set @var{enable} to nil.
+@code{t}.  To disable this @var{setting}, set @var{enable} to
+@code{nil}.
 
 @var{feature} is the ``feature name'' of the query, users can control
 which features are enabled with @code{font-lock-maximum-decoration}
 and @code{treesit-font-lock-feature-list}.
 
 @var{override} is the override flag for this query.  Its value can be
-t, nil, append, prepend, keep.  See more in
-@code{treesit-font-lock-rules}.
+@code{t}, @code{nil}, @code{append}, @code{prepend}, or @code{keep}.
+@c FIXME: See where?
+See more in @code{treesit-font-lock-rules}.
 @end defvar
 
 Multi-language major modes should provide range functions in
@@ -4077,7 +4093,7 @@ Auto-Indentation
 
 @menu
 * SMIE::                        A simple minded indentation engine.
-* Parser-based indentation::    Parser-based indentation engine.
+* Parser-based Indentation::    Parser-based indentation engine.
 @end menu
 
 @node SMIE
@@ -4739,108 +4755,100 @@ SMIE Customization
 
 @node Parser-based Indentation
 @subsection Parser-based Indentation
+@cindex parser-based indentation
 
-@c This node is written when the only parser Emacs has is tree-sitter,
-@c if in the future more parser are supported, feel free to reorganize
-@c and rewrite this node to describe multiple parsers in parallel.
+@c This node is written when the only parser Emacs has is tree-sitter;
+@c if in the future more parsers are supported, this should be
+@c reorganized and rewritten to describe multiple parsers in parallel.
 
 When built with the tree-sitter library (@pxref{Parsing Program
-Source}), Emacs could parse program source and produce a syntax tree.
-And this syntax tree can be used for indentation.  For maximum
-flexibility, we could write a custom indent function that queries the
-syntax tree and indents accordingly for each language, but that would
-be a lot of work.  It is more convenient to use the simple indentation
-engine described below: we only need to write some indentation rules
+Source}), Emacs is capable of parsing the program source and producing
+a syntax tree.  This syntax tree can be used for guiding the program
+source indentation commands.  For maximum flexibility, it is possible
+to write a custom indentation function that queries the syntax tree
+and indents accordingly for each language, but that is a lot of work.
+It is more convenient to use the simple indentation engine described
+below: then the major mode needs only to write some indentation rules
 and the engine takes care of the rest.
 
-To enable the indentation engine, set the value of
+To enable the parser-based indentation engine, set the value of
 @code{indent-line-function} to @code{treesit-indent}.
 
 @defvar treesit-indent-function
 This variable stores the actual function called by
 @code{treesit-indent}.  By default, its value is
-@code{treesit-simple-indent}.  In the future we might add other
+@code{treesit-simple-indent}.  In the future we might add other,
 more complex indentation engines.
 @end defvar
 
 @heading Writing indentation rules
+@cindex indentation rules, for parser-based indentation
 
 @defvar treesit-simple-indent-rules
-This local variable stores indentation rules for every language. It is
-a list of
-
-@example
-(@var{language} . @var{rules})
-@end example
-
-where @var{language} is a language symbol, and @var{rules} is a list
-of
-
-@example
-(@var{matcher} @var{anchor} @var{offset})
-@end example
-
-First Emacs passes the node at point to @var{matcher}, if it return
-non-nil, this rule applies.  Then Emacs passes the node to
-@var{anchor}, it returns a point.  Emacs takes the column number of
-that point, add @var{offset} to it, and the result is the indent for
-the current line.
+This local variable stores indentation rules for every language.  It is
+a list of the form: @w{@code{(@var{language} . @var{rules})}}, where
+@var{language} is a language symbol, and @var{rules} is a list of the
+form @w{@code{(@var{matcher} @var{anchor} @var{offset})}}.
+
+@c FIXME: ``node''?
+First, Emacs passes the node at point to @var{matcher}; if it returns
+non-@code{nil}, this rule is applicable.  Then Emacs passes the node
+to @var{anchor}, which returns a buffer position.  Emacs takes the
+column number of that position, adds @var{offset} to it, and the
+result is the indentation column for the current line.
 
 The @var{matcher} and @var{anchor} are functions, and Emacs provides
-convenient presets for them.  You can skip over to
-@code{treesit-simple-indent-presets} below, those presets should be
-more than enough.
-
-A @var{matcher} or an @var{anchor} is a function that takes three
-arguments (@var{node} @var{parent} @var{bol}).  Argument @var{bol} is
-the point at where we are indenting: the position of the first
-non-whitespace character from the beginning of line; @var{node} is the
-largest (highest-in-tree) node that starts at that point; @var{parent}
-is the parent of @var{node}.  A @var{matcher} returns nil/non-nil, and
-@var{anchor} returns a point.
+convenient defaults for them.
+
+@c FIXME: Clarify the following description.  In particular, how to
+@c find/compute ``the largest node'' and its ``parent''?
+Each @var{matcher} or @var{anchor} is a function that takes three
+arguments: @var{node}, @var{parent}, and @var{bol}.  The argument
+@var{bol} is the buffer position whose indentation is required: the
+position of the first non-whitespace character after the beginning of
+the line.  The argument @var{node} is the largest (highest-in-tree)
+node that starts at that position; and @var{parent} is the parent of
+@var{node}.  @var{matcher} should return non-@code{nil} if the rule is
+applicable, and @var{anchor} should return a buffer position that is
+the basis of the indentation.
 @end defvar
 
 @defvar treesit-simple-indent-presets
-This is a list of presets for @var{matcher}s and @var{anchor}s in
-@code{treesit-simple-indent-rules}.  Each of them represent a function
-that takes @var{node}, @var{parent} and @var{bol} as arguments.
-
-@example
-no-node
-@end example
-
-This matcher matches the case where @var{node} is nil, i.e., there is
-no node that starts at @var{bol}.  This is the case when @var{bol} is
-at an empty line or inside a multi-line string, etc.
-
-@example
-(parent-is @var{type})
-@end example
-
-This matcher matches if @var{parent}'s type is @var{type}.
-
-@example
-(node-is @var{type})
-@end example
-
-This matcher matches if @var{node}'s type is @var{type}.
-
-@example
-(query @var{query})
-@end example
+This is a list of defaults for @var{matcher}s and @var{anchor}s in
+@code{treesit-simple-indent-rules}.  Each of them represents a function
+that takes 3 arguments: @var{node}, @var{parent} and @var{bol}.  The
+available default functions are:
 
-This matcher matches if querying @var{parent} with @var{query}
-captures @var{node}.  The capture name does not matter.
-
-@example
-(match @var{node-type} @var{parent-type}
-       @var{node-field} @var{node-index-min} @var{node-index-max})
-@end example
-
-This matcher checks if @var{node}'s type is @var{node-type},
+@ftable @code
+@item no-node
+This matcher is a symbol that matches the case where @var{node} is
+@code{nil}, i.e., there is no node that starts at @var{bol}.  This is
+the case when @var{bol} is on an empty line or inside a multi-line
+string, etc.
+
+@item parent-is
+This matcher is a function of one argument, @var{type}; it matches if
+the type of the parent node is @var{type}.
+
+@item node-is
+This matcher is a function of one argument, @var{type}; it matches if
+the node's type is @var{type}.
+
+@c FIXME: The description of this matcher is unclear.  What is
+@c ``parent'' and what does it mean ``captures NODE''?
+@item query
+This matcher is a function of one argument, @var{query}; it matches if
+querying @var{parent} with @var{query} captures @var{node}.  The
+capture name does not matter.   @c Why is this bit important?
+
+@item match
+This matcher is a function of 5 arguments: @var{node-type},
+@var{parent-type}, @var{node-field}, @var{node-index-min}, and
+@var{node-index-max}).  It matches if @var{node}'s type is @var{node-type},
 @var{parent}'s type is @var{parent-type}, @var{node}'s field name in
 @var{parent} is @var{node-field}, and @var{node}'s index among its
 siblings is between @var{node-index-min} and @var{node-index-max}.  If
+@c FIXME: ``constraint''?
 the value of a constraint is nil, this matcher doesn't check for that
 constraint.  For example, to match the first child where parent is
 @code{argument_list}, use
@@ -4849,60 +4857,48 @@ Parser-based Indentation
 (match nil "argument_list" nil nil 0 0)
 @end example
 
-@example
-first-sibling
-@end example
-
+@c FIXME: ``PARENT''? is that an argument of the anchor function
+@item first-sibling
 This anchor returns the start of the first child of @var{parent}.
 
-@example
-parent
-@end example
-
-This anchor returns the start of @var{parent}.
-
-@example
-parent-bol
-@end example
+@item parent
+This anchor returns the start of @var{parent}. @c FIXME: Likewise.
 
-This anchor returns the beginning of non-space characters on the line
-where @var{parent} is on.
-
-@example
-prev-sibling
-@end example
+@item parent-bol
+This anchor returns the first non-space character on the line of
+@var{parent}.
 
+@c FIXME: ``NODE''?
+@item prev-sibling
 This anchor returns the start of the previous sibling of @var{node}.
 
-@example
-no-indent
-@end example
-
-This anchor returns the start of @var{node}, i.e., no indent.
-
-@example
-prev-line
-@end example
+@item no-indent
+This anchor returns the start of @var{node}, i.e., no indent. @c ???
 
+@item prev-line
 This anchor returns the first non-whitespace charater on the previous
 line.
+@end ftable
+
 @end defvar
 
 @heading Indentation utilities
+@cindex utility functions for parser-based indentation
 
-Here are some utility functions that can help writing indentation
-rules.
+Here are some utility functions that can help writing parser-based
+indentation rules.
 
 @defun treesit-check-indent mode
-This function checks current buffer's indentation against major mode
-@var{mode}.  It indents the current buffer in @var{mode} and compares
-the indentation with the current indentation.  Then it pops up a diff
-buffer showing the difference.  Correct indentation (target) is in
-green, current indentation is in red.
+This function checks the current buffer's indentation against major
+mode @var{mode}.  It indents the current buffer according to
+@var{mode} and compares the results with the current indentation.
+Then it pops up a buffer showing the differences.  Correct
+indentation (target) is shown in green color, current indentation is
+shown in red color.  @c Are colors customizable? faces?
 @end defun
 
-It is also helpful to use @code{treesit-inspect-mode} when writing
-indentation rules.
+It is also helpful to use @code{treesit-inspect-mode} (@pxref{Language
+Definitions}) when writing indentation rules.
 
 @node Desktop Save Mode
 @section Desktop Save Mode
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index ae3724dd4a..9079e0f781 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -5,40 +5,44 @@
 @node Parsing Program Source
 @chapter Parsing Program Source
 
+@cindex syntax tree, from parsing program source
 Emacs provides various ways to parse program source text and produce a
-@dfn{syntax tree}.  In a syntax tree, text is no longer a
-one-dimensional stream but a structured tree of nodes, where each node
-representing a piece of text.  Thus a syntax tree can enable
-interesting features like precise fontification, indentation,
+@dfn{syntax tree}.  In a syntax tree, text is no longer considered a
+one-dimensional stream of characters, but a structured tree of nodes,
+where each node representing a piece of text.  Thus, a syntax tree can
+enable interesting features like precise fontification, indentation,
 navigation, structured editing, etc.
 
 Emacs has a simple facility for parsing balanced expressions
-(@pxref{Parsing Expressions}).  There is also SMIE library for generic
-navigation and indentation (@pxref{SMIE}).
+(@pxref{Parsing Expressions}).  There is also the SMIE library for
+generic navigation and indentation (@pxref{SMIE}).
 
-Emacs also provides integration with tree-sitter library
-(@uref{https://tree-sitter.github.io/tree-sitter}) if compiled with
-it.  The tree-sitter library implements an incremental parser and has
-support from a wide range of programming languages.
+In addition to those, Emacs also provides integration with
+@uref{https://tree-sitter.github.io/tree-sitter, the tree-sitter
+library}) if support for it was compiled in.  The tree-sitter library
+implements an incremental parser and has support from a wide range of
+programming languages.
 
 @defun treesit-available-p
 This function returns non-nil if tree-sitter features are available
-for this Emacs instance.
+for the current Emacs session.
 @end defun
 
-To access the syntax tree of the text in a buffer, we need to first
-load a language definition and create a parser with it.  Next, we can
-query the parser for specific nodes in the syntax tree.  Then, we can
-access various information about the node, and we can pattern-match a
-node with a powerful syntax.  Finally, we explain how to work with
-source files that mixes multiple languages.  The following sections
-explain how to do each of the tasks in detail.
+To be able to parse the program source using the tree-sitter library
+and access the syntax tree of the program, a Lisp program needs to
+load a language definition library, and create a parser for that
+language and the current buffer.  After that, the Lisp program can
+query the parser about specific nodes of the syntax tree.  Then, it
+can access various kinds of information about each node, and search
+for nodes using a powerful pattern-matching syntax.  This chapter
+explains how to do all this, and also how a Lisp program can work with
+source files that mix multiple programming languages.
 
 @menu
 * Language Definitions::     Loading tree-sitter language definitions.
 * Using Parser::             Introduction to parsers.
 * Retrieving Node::          Retrieving node from syntax tree.
-* Accessing Node::           Accessing node information.
+* Accessing Node Information:: Accessing node information.
 * Pattern Matching::         Pattern matching with query patterns.
 * Multiple Languages::       Parse text written in multiple languages.
 * Tree-sitter major modes::  Develop major modes using tree-sitter.
@@ -47,14 +51,17 @@ Parsing Program Source
 
 @node Language Definitions
 @section Tree-sitter Language Definitions
+@cindex language definitions, for tree-sitter
 
 @heading Loading a language definition
+@cindex loading language definition for tree-sitter
 
+@cindex language argument, for tree-sitter
 Tree-sitter relies on language definitions to parse text in that
-language. In Emacs, A language definition is represented by a symbol.
-For example, C language definition is represented as @code{c}, and
-@code{c} can be passed to tree-sitter functions as the @var{language}
-argument.
+language.  In Emacs, a language definition is represented by a symbol.
+For example, C language definition is represented as the symbol
+@code{c}, and @code{c} can be passed to tree-sitter functions as the
+@var{language} argument.
 
 @vindex treesit-extra-load-path
 @vindex treesit-load-language-error
@@ -62,63 +69,92 @@ Language Definitions
 Tree-sitter language definitions are distributed as dynamic libraries.
 In order to use a language definition in Emacs, you need to make sure
 that the dynamic library is installed on the system.  Emacs looks for
-language definitions under load paths in
-@code{treesit-extra-load-path},
-@code{user-emacs-directory}/tree-sitter, and system default locations
-for dynamic libraries, in that order.  Emacs tries each extensions in
-@code{treesit-load-suffixes}.  If Emacs cannot find the library or has
-problem loading it, Emacs signals @code{treesit-load-language-error}.
-
-The signal data could be @code{(not-found @var{error-msg} ...)} if
-Emacs cannot find the language definition, or @code{(symbol-error
-@var{error-msg})} if the Emacs cannot find the correct symbol in the
-language definition, or @code{(version_mismatch @var{error-msg})} if
-the language definition's version does match that of the tree-sitter
-library.
-
-@defun treesit-language-available-p language
-This function returns non-nil if @var{language} exists and is
-loadable.
+language definitions in several places, in the following order:
+
+@itemize @bullet
+@item
+first, in the list of directories specified by the variable
+@code{treesit-extra-load-path};
+@item
+then, in the @file{tree-sitter} subdirectory of the directory
+specified by @code{user-emacs-directory} (@pxref{Init File});
+@item
+and finally, in the system's default locations for dynamic libraries.
+@end itemize
+
+In each of these directories, Emacs looks for a file with file-name
+extensions specified by the variable @code{treesit-load-suffixes}.
+
+If Emacs cannot find the library or has problems loading it, Emacs
+signals the @code{treesit-load-language-error} error.  The data of
+that signal could be one of the following:
+
+@table @code
+@item (not-found @var{error-msg} @dots{})
+This means Emacs could not find the language definition library.
+@item (symbol-error @var{error-msg})
+This means Emacs could not find in the library the expected function
+that every language definition library should export.
+@item (version_mismatch @var{error-msg})
+This means the version of language definition library is incompatible
+with that of the tree-sitter library.
+@end table
+
+@noindent
+In all of these cases, @var{error-msg} might provide additional
+details about the failure.
+
+@defun treesit-language-available-p language &optional detail
+This function returns non-nil if the language definitions for
+@var{language} exist and can be loaded.
 
 If @var{detail} is non-nil, return @code{(t . nil)} when
-@var{language} is available, @code{(nil . DATA)} when unavailable.
-@var{data} is the signal data of @code{treesit-load-language-error}.
+@var{language} is available, and @code{(nil . @var{date})} when it's
+unavailable.  @var{data} is the signal data of
+@code{treesit-load-language-error}.
 @end defun
 
 @vindex treesit-load-name-override-list
-By convention, the dynamic library for @var{language} is
-@code{libtree-sitter-@var{language}.@var{ext}}, where @var{ext} is the
-system-specific extension for dynamic libraries. Also by convention,
+By convention, the file name of the dynamic library for @var{language} is
+@file{libtree-sitter-@var{language}.@var{ext}}, where @var{ext} is the
+system-specific extension for dynamic libraries.  Also by convention,
 the function provided by that library is named
-@code{tree_sitter_@var{language}}.  If a language definition doesn't
-follow this convention, you should add an entry
+@code{tree_sitter_@var{language}}.  If a language definition library
+doesn't follow this convention, you should add an entry
 
 @example
 (@var{language} @var{library-base-name} @var{function-name})
 @end example
 
-to @code{treesit-load-name-override-list}, where
-@var{library-base-name} is the base filename for the dynamic library
-(conventionally @code{libtree-sitter-@var{language}}), and
+to the list in the variable @code{treesit-load-name-override-list}, where
+@var{library-base-name} is the basename of the dynamic library's file name,
+(usually, @file{libtree-sitter-@var{language}}), and
 @var{function-name} is the function provided by the library
-(conventionally @code{tree_sitter_@var{language}}). For example,
+(usually, @code{tree_sitter_@var{language}}). For example,
 
 @example
 (cool-lang "libtree-sitter-coool" "tree_sitter_cooool")
 @end example
 
-for a language too cool to abide by conventions.
+@noindent
+for a language that considers itself too ``cool'' to abide by
+conventions.
 
+@cindex language-definition version, compatibility
 @defun treesit-language-version &optional min-compatible
-Tree-sitter library has a @dfn{language version}, a language
-definition's version needs to match this version to be compatible.
-
-This function returns tree-sitter library’s language version.  If
-@var{min-compatible} is non-nil, it returns the minimal compatible
-version.
+This function returns the version of the language-definition
+Application Binary Interface (@acronym{ABI}) supported by the
+tree-sitter library.  By default, it returns the latest ABI version
+supported by the library, but if @var{min-compatible} is
+non-@code{nil}, it returns the oldest ABI version which the library
+still can support.  Language definition libraries must be built for
+ABI versions between the oldest and the latest versions supported by
+the tree-sitter library, otherwise the library will be unable to load
+them.
 @end defun
 
 @heading Concrete syntax tree
+@cindex syntax tree, concrete
 
 A syntax tree is what a parser generates.  In a syntax tree, each node
 represents a piece of text, and is connected to each other by a
@@ -147,33 +183,37 @@ Language Definitions
 @end group
 @end example
 
-We can also represent it in s-expression:
+We can also represent it as an s-expression:
 
 @example
 (root (expression (number) (operator) (number)))
 @end example
 
 @subheading Node types
+@cindex node types, in a syntax tree
 
-@cindex tree-sitter node type
+@cindex type of node, tree-sitter
 @anchor{tree-sitter node type}
-@cindex tree-sitter named node
+@cindex named node, tree-sitter
 @anchor{tree-sitter named node}
-@cindex tree-sitter anonymous node
-Names like @code{root}, @code{expression}, @code{number},
-@code{operator} are nodes' @dfn{type}.  However, not all nodes in a
-syntax tree have a type.  Nodes that don't are @dfn{anonymous nodes},
-and nodes with a type are @dfn{named nodes}.  Anonymous nodes are
-tokens with fixed spellings, including punctuation characters like
-bracket @samp{]}, and keywords like @code{return}.
+@cindex anonymous node, tree-sitter
+Names like @code{root}, @code{expression}, @code{number}, and
+@code{operator} specify the @dfn{type} of the nodes.  However, not all
+nodes in a syntax tree have a type.  Nodes that don't have a type are
+known as @dfn{anonymous nodes}, and nodes with a type are @dfn{named
+nodes}.  Anonymous nodes are tokens with fixed spellings, including
+punctuation characters like bracket @samp{]}, and keywords like
+@code{return}.
 
 @subheading Field names
 
+@cindex field name, tree-sitter
 @cindex tree-sitter node field name
-@anchor{tree-sitter node field name} To make the syntax tree easier to
-analyze, many language definitions assign @dfn{field names} to child
-nodes.  For example, a @code{function_definition} node could have a
-@code{declarator} and a @code{body}:
+@anchor{tree-sitter node field name}
+To make the syntax tree easier to analyze, many language definitions
+assign @dfn{field names} to child nodes.  For example, a
+@code{function_definition} node could have a @code{declarator} and a
+@code{body}:
 
 @example
 @group
@@ -184,39 +224,40 @@ Language Definitions
 @end example
 
 @deffn Command treesit-inspect-mode
-This minor mode displays the node that @emph{starts} at point in
-mode-line.  The mode-line will display
+This minor mode displays on the mode-line the node that @emph{starts}
+at point.  The mode-line will display
 
 @example
-@var{parent} @var{field-name}: (@var{child} (@var{grand-child} (...)))
+@var{parent} @var{field}: (@var{child} (@var{grandchild} (@dots{})))
 @end example
 
-@var{child}, @var{grand-child}, and @var{grand-grand-child}, etc, are
-nodes that have their beginning at point.  And @var{parent} is the
-parent of @var{child}.
+@var{child}, @var{grand}, @var{grand-grandchild}, etc., are nodes that
+begin at point.  @var{parent} is the parent node of @var{child}.
 
 If there is no node that starts at point, i.e., point is in the middle
 of a node, then the mode-line only displays the smallest node that
-spans point, and its immediate parent.
+spans the position of point, and its immediate parent.
 
 This minor mode doesn't create parsers on its own.  It simply uses the
 first parser in @code{(treesit-parser-list)} (@pxref{Using Parser}).
 @end deffn
 
 @heading Reading the grammar definition
+@cindex reading grammar definition, tree-sitter
 
 Authors of language definitions define the @dfn{grammar} of a
-language, and this grammar determines how does a parser construct a
-concrete syntax tree out of the text.  In order to use the syntax
-tree effectively, we need to read the @dfn{grammar file}.
+programming language, which determines how a parser constructs a
+concrete syntax tree out of the program text.  In order to use the
+syntax tree effectively, you need to consult the @dfn{grammar file}.
 
-The grammar file is usually @code{grammar.js} in a language
-definition’s project repository.  The link to a language definition’s
-home page can be found in tree-sitter’s homepage
-(@uref{https://tree-sitter.github.io/tree-sitter}).
+The grammar file is usually @file{grammar.js} in a language
+definition's project repository.  The link to a language definition's
+home page can be found on
+@uref{https://tree-sitter.github.io/tree-sitter, the tree-sitter's
+homepage}.
 
-The grammar is written in JavaScript syntax.  For example, the rule
-matching a @code{function_definition} node looks like
+The grammar definition is written in JavaScript.  For example, the
+rule matching a @code{function_definition} node looks like
 
 @example
 @group
@@ -228,12 +269,13 @@ Language Definitions
 @end group
 @end example
 
-The rule is represented by a function that takes a single argument
+@noindent
+The rules are represented by functions that take a single argument
 @var{$}, representing the whole grammar.  The function itself is
-constructed by other functions: the @code{seq} function puts together a
-sequence of children; the @code{field} function annotates a child with
-a field name.  If we write the above definition in BNF syntax, it
-would look like
+constructed by other functions: the @code{seq} function puts together
+a sequence of children; the @code{field} function annotates a child
+with a field name.  If we write the above definition in the so-called
+@dfn{Backus-Naur Form} (@acronym{BNF}) syntax, it would look like
 
 @example
 @group
@@ -254,88 +296,74 @@ Language Definitions
 @end group
 @end example
 
-Below is a list of functions that one will see in a grammar
-definition.  Each function takes other rules as arguments and returns
-a new rule.
-
-@itemize @bullet
-@item
-@code{seq(rule1, rule2, ...)} matches each rule one after another.
-
-@item
-@code{choice(rule1, rule2, ...)} matches one of the rules in its
-arguments.
+Below is a list of functions that one can see in a grammar definition.
+Each function takes other rules as arguments and returns a new rule.
 
-@item
-@code{repeat(rule)} matches @var{rule} for @emph{zero or more} times.
+@table @code
+@item seq(@var{rule1}, @var{rule2}, @dots{})
+matches each rule one after another.
+@item choice(@var{rule1}, @var{rule2}, @dots{})
+matches one of the rules in its arguments.
+@item repeat(@var{rule})
+matches @var{rule} for @emph{zero or more} times.
 This is like the @samp{*} operator in regular expressions.
-
-@item
-@code{repeat1(rule)} matches @var{rule} for @emph{one or more} times.
+@item repeat1(@var{rule})
+matches @var{rule} for @emph{one or more} times.
 This is like the @samp{+} operator in regular expressions.
-
-@item
-@code{optional(rule)} matches @var{rule} for @emph{zero or one} time.
+@item optional(@var{rule})
+matches @var{rule} for @emph{zero or one} time.
 This is like the @samp{?} operator in regular expressions.
-
-@item
-@code{field(name, rule)} assigns field name @var{name} to the child
-node matched by @var{rule}.
-
-@item
-@code{alias(rule, alias)} makes nodes matched by @var{rule} appear as
-@var{alias} in the syntax tree generated by the parser.  For example,
+@item field(@var{name}, @var{rule})
+assigns field name @var{name} to the child node matched by @var{rule}.
+@item alias(@var{rule}, @var{alias})
+makes nodes matched by @var{rule} appear as @var{alias} in the syntax
+tree generated by the parser.  For example,
 
 @example
 alias(preprocessor_call_exp, call_expression)
 @end example
 
+@noindent
 makes any node matched by @code{preprocessor_call_exp} to appear as
 @code{call_expression}.
-@end itemize
+@end table
 
-Below are grammar functions less interesting for a reader of a
+Below are grammar functions of lesser importance for reading a
 language definition.
 
-@itemize
-@item
-@code{token(rule)} marks @var{rule} to produce a single leaf node.
-That is, instead of generating a parent node with individual child
-nodes under it, everything is combined into a single leaf node.
-
-@item
-Normally, grammar rules ignore preceding whitespaces,
-@code{token.immediate(rule)} changes @var{rule} to match only when
-there is no preceding whitespaces.
-
-@item
-@code{prec(n, rule)} gives @var{rule} a level @var{n} precedence.
-
-@item
-@code{prec.left([n,] rule)} marks @var{rule} as left-associative,
-optionally with level @var{n}.
-
-@item
-@code{prec.right([n,] rule)} marks @var{rule} as right-associative,
-optionally with level @var{n}.
-
-@item
-@code{prec.dynamic(n, rule)} is like @code{prec}, but the precedence
-is applied at runtime instead.
-@end itemize
-
-The tree-sitter project talks about writing a grammar in more detail:
-@uref{https://tree-sitter.github.io/tree-sitter/creating-parsers}.
-Read especially ``The Grammar DSL'' section.
+@table @code
+@item token(@var{rule})
+marks @var{rule} to produce a single leaf node.  That is, instead of
+generating a parent node with individual child nodes under it,
+everything is combined into a single leaf node.
+@item token.immediate(@var{rule})
+Normally, grammar rules ignore preceding whitespace; this
+changes @var{rule} to match only when there is no preceding
+whitespaces.
+@item prec(@var{n}, @var{rule})
+gives @var{rule} the level-@var{n} precedence.
+@item prec.left([@var{n},] @var{rule})
+marks @var{rule} as left-associative, optionally with level @var{n}.
+@item prec.right([@var{n},] @var{rule})
+marks @var{rule} as right-associative, optionally with level @var{n}.
+@item prec.dynamic(@var{n}, @var{rule})
+this is like @code{prec}, but the precedence is applied at runtime
+instead.
+@end table
+
+The documentation of the tree-sitter project has
+@uref{https://tree-sitter.github.io/tree-sitter/creating-parsers, more
+about writing a grammar}.  Read especially ``The Grammar DSL''
+section.
 
 @node Using Parser
 @section Using Tree-sitter Parser
-@cindex Tree-sitter parser
+@cindex tree-sitter parser, using
 
 This section described how to create and configure a tree-sitter
 parser.  In Emacs, each tree-sitter parser is associated with a
-buffer.  As we edit the buffer, the associated parser and the syntax
-tree is automatically kept up-to-date.
+buffer.  As the user edits the buffer, the associated parser and the
+syntax tree are automatically kept up-to-date.
 
 @defvar treesit-max-buffer-size
 This variable contains the maximum size of buffers in which
@@ -349,44 +377,45 @@ Using Parser
 @code{treesit-available-p} and @code{treesit-max-buffer-size}.
 @end defun
 
-@cindex Creating tree-sitter parsers
+@cindex creating tree-sitter parsers
+@cindex tree-sitter parser, creating
 @defun treesit-parser-create language &optional buffer no-reuse
-To create a parser, we provide a @var{buffer} and the @var{language}
-to use (@pxref{Language Definitions}).  If @var{buffer} is nil, the
-current buffer is used.
+Create a parser for the specified @var{buffer} and @var{language}
+(@pxref{Language Definitions}).  If @var{buffer} is omitted or
+@code{nil}, it stands for the current buffer.
 
 By default, this function reuses a parser if one already exists for
-@var{language} in @var{buffer}, if @var{no-reuse} is non-nil, this
-function always creates a new parser.
+@var{language} in @var{buffer}, but if @var{no-reuse} is
+non-@code{nil}, this function always creates a new parser.
 @end defun
 
-Given a parser, we can query information about it:
+Given a parser, we can query information about it.
 
 @defun treesit-parser-buffer parser
-Returns the buffer associated with @var{parser}.
+This function returns the buffer associated with @var{parser}.
 @end defun
 
 @defun treesit-parser-language parser
-Returns the language that @var{parser} uses.
+This function returns the language used by @var{parser}.
 @end defun
 
 @defun treesit-parser-p object
-Checks if @var{object} is a tree-sitter parser. Return non-nil if it
-is, return nil otherwise.
+This function checks if @var{object} is a tree-sitter parser, and
+returns non-@code{nil} if it is, @code{nil} otherwise.
 @end defun
 
 There is no need to explicitly parse a buffer, because parsing is done
-automatically and lazily.  A parser only parses when we query for a
-node in its syntax tree.  Therefore, when a parser is first created,
-it doesn't parse the buffer; it waits until we query for a node for
-the first time.  Similarly, when some change is made in the buffer, a
-parser doesn't re-parse immediately.
+automatically and lazily.  A parser only parses when the mode queris
+for a node in its syntax tree.  Therefore, when a parser is first
+created, it doesn't parse the buffer; it waits until the mode queries
+for a node for the first time.  Similarly, when some change is made in
+the buffer, a parser doesn't re-parse immediately.
 
 @vindex treesit-buffer-too-large
-When a parser do parse, it checks for the size of the buffer.
+When a parser does parse, it checks for the size of the buffer.
 Tree-sitter can only handle buffer no larger than about 4GB.  If the
-size exceeds that, Emacs signals @code{treesit-buffer-too-large}
-with signal data being the buffer size.
+size exceeds that, Emacs signals the @code{treesit-buffer-too-large}
+error with signal data being the buffer size.
 
 Once a parser is created, Emacs automatically adds it to the
 internal parser list.  Every time a change is made to the buffer,
@@ -394,8 +423,9 @@ Using Parser
 tree incrementally.
 
 @defun treesit-parser-list &optional buffer
-This function returns the parser list of @var{buffer}.  And
-@var{buffer} defaults to the current buffer.
+This function returns the parser list of @var{buffer}.  If
+@var{buffer} is @code{nil} or omitted, it defaults to the current
+buffer.
 @end defun
 
 @defun treesit-parser-delete parser
@@ -403,100 +433,108 @@ Using Parser
 @end defun
 
 @cindex tree-sitter narrowing
-@anchor{tree-sitter narrowing} Normally, a parser ``sees'' the whole
-buffer, but when the buffer is narrowed (@pxref{Narrowing}), the
-parser will only see the visible region.  As far as the parser can
-tell, the hidden region is deleted.  And when the buffer is later
-widened, the parser thinks text is inserted in the beginning and in
-the end.  Although parsers respect narrowing, narrowing shouldn't be
-the mean to handle a multi-language buffer; instead, set the ranges in
-which a parser should operate in.  @xref{Multiple Languages}.
-
-Because a parser parses lazily, when we narrow the buffer, the parser
-is not affected immediately; as long as we don't query for a node
-while the buffer is narrowed, the parser is oblivious of the
-narrowing.
+@anchor{tree-sitter narrowing}
+Normally, a parser ``sees'' the whole buffer, but when the buffer is
+narrowed (@pxref{Narrowing}), the parser will only see the accessible
+portion of the buffer.  As far as the parser can tell, the hidden
+region was deleted.  When the buffer is later widened, the parser
+thinks text is inserted at the beginning and at the end.  Although
+parsers respect narrowing, modes should not use narrowing as a means
+to handle a multi-language buffer; instead, set the ranges in which the
+parser should operate.  @xref{Multiple Languages}.
+
+Because a parser parses lazily, when the user or a Lisp programs
+narrows the buffer, the parser is not affected immediately; as long as
+the mode doesn't query for a node while the buffer is narrowed, the
+parser is oblivious of the narrowing.
 
 @cindex tree-sitter parse string
-@defun treesit-parse-string string language
-Besides creating a parser for a buffer, we can also just parse a
-string.  Unlike a buffer, parsing a string is a one-time deal, and
+@cindex parse string, tree-sitter
+Besides creating a parser for a buffer, a Lisp program can also parse a
+string.  Unlike a buffer, parsing a string is a one-off operation, and
 there is no way to update the result.
 
-This function parses @var{string} with @var{language}, and returns the
-root node of the generated syntax tree.
+@defun treesit-parse-string string language
+This function parses @var{string} using @var{language}, and returns
+the root node of the generated syntax tree.
 @end defun
 
 @node Retrieving Node
 @section Retrieving Node
+@cindex retrieve node, tree-sitter
+@cindex tree-sitter, find node
+@cindex get node, tree-sitter
 
-@cindex tree-sitter find node
-@cindex tree-sitter get node
-Before we continue, lets go over some conventions of tree-sitter
-functions.
+@cindex terminology, for tree-sitter functions
+Here's some terminology and conventions we use when documenting
+tree-sitter functions.
 
 We talk about a node being ``smaller'' or ``larger'', and ``lower'' or
 ``higher''.  A smaller and lower node is lower in the syntax tree and
-therefore spans a smaller piece of text; a larger and higher node is
-higher up in the syntax tree, containing many smaller nodes as its
-children, and therefore spans a larger piece of text.
+therefore spans a smaller portion of buffer text; a larger and higher
+node is higher up in the syntax tree, it contains many smaller nodes
+as its children, and therefore spans a larger portion of text.
 
-When a function cannot find a node, it returns nil.  And for the
-convenience for function chaining, all the functions that take a node
-as argument and returns a node accept the node to be nil; in that
-case, the function just returns nil.
+When a function cannot find a node, it returns @code{nil}.  For
+convenience, all the functions that take a node as argument and return
+a node, also accept the node argument of @code{nil} and in that case
+just return @code{nil}.
 
 @vindex treesit-node-outdated
 Nodes are not automatically updated when the associated buffer is
-modified.  And there is no way to update a node once it is retrieved.
-Using an outdated node throws @code{treesit-node-outdated} error.
+modified, and there is no way to update a node once it is retrieved.
+Using an outdated node signals the @code{treesit-node-outdated} error.
 
 @heading Retrieving node from syntax tree
+@cindex retrieving tree-sitter nodes
+@cindex syntax tree, retrieving nodes
 
-@defun treesit-node-at beg end &optional parser-or-lang named
+@defun treesit-node-at pos &optional parser-or-lang named
 This function returns the @emph{smallest} node that starts at or after
-the @var{point}.  In other words, the start of the node is equal or
-greater than @var{point}.
+the buffer position @var{pos}.  In other words, the start of the node
+is greater or equal to @var{pos}.
 
-When @var{parser-or-lang} is nil, this function uses the first parser
-in @code{(treesit-parser-list)} in the current buffer.  If
-@var{parser-or-lang} is a parser object, it use that parser; if
-@var{parser-or-lang} is a language, it finds the first parser using
-that language in @code{(treesit-parser-list)} and use that.
+When @var{parser-or-lang} is @code{nil} or omitted, this function uses
+the first parser in @code{(treesit-parser-list)} of the current
+buffer.  If @var{parser-or-lang} is a parser object, it uses that
+parser; if @var{parser-or-lang} is a language, it finds the first
+parser using that language in @code{(treesit-parser-list)}, and uses
+that.
 
-If @var{named} is non-nil, this function looks for a named node
+If @var{named} is non-@code{nil}, this function looks for a named node
 only (@pxref{tree-sitter named node, named node}).
 
 Example:
+
 @example
 @group
 ;; Find the node at point in a C parser's syntax tree.
 (treesit-node-at (point) 'c)
-    @c @result{} #<treesit-node from 1 to 4 in *scratch*>
+  @result{} #<treesit-node from 1 to 4 in *scratch*>
 @end group
 @end example
 @end defun
 
 @defun treesit-node-on beg end &optional parser-or-lang named
-This function returns the @emph{smallest} node that covers the span
-from @var{beg} to @var{end}.  In other words, the start of the node is
-less or equal to @var{beg}, and the end of the node is greater or
-equal to @var{end}.
+This function returns the @emph{smallest} node that covers the region
+of buffer text between @var{beg} and @var{end}.  In other words, the
+start of the node is before or at @var{beg}, and the end of the node
+is at or after @var{end}.
 
-@emph{Beware} that calling this function on an empty line that is not
-inside any top-level construct (function definition, etc) most
+@emph{Beware:} calling this function on an empty line that is not
+inside any top-level construct (function definition, etc.) most
 probably will give you the root node, because the root node is the
 smallest node that covers that empty line.  Most of the time, you want
-to use @code{treesit-node-at}.
+to use @code{treesit-node-at}, described above, instead.
 
-When @var{parser-or-lang} is nil, this function uses the first parser
-in @code{(treesit-parser-list)} in the current buffer.  If
-@var{parser-or-lang} is a parser object, it use that parser; if
+When @var{parser-or-lang} is @code{nil}, this function uses the first
+parser in @code{(treesit-parser-list)} of the current buffer.  If
+@var{parser-or-lang} is a parser object, it uses that parser; if
 @var{parser-or-lang} is a language, it finds the first parser using
-that language in @code{(treesit-parser-list)} and use that.
+that language in @code{(treesit-parser-list)}, and uses that.
 
-If @var{named} is non-nil, this function looks for a named node only
-(@pxref{tree-sitter named node, named node}).
+If @var{named} is non-@code{nil}, this function looks for a named node
+only (@pxref{tree-sitter named node, named node}).
 @end defun
 
 @defun treesit-parser-root-node parser
@@ -506,17 +544,21 @@ Retrieving Node
 
 @defun treesit-buffer-root-node &optional language
 This function finds the first parser that uses @var{language} in
-@code{(treesit-parser-list)} in the current buffer, and returns the
-root node of that buffer.  If it cannot find an appropriate parser,
-nil is returned.
+@code{(treesit-parser-list)} of the current buffer, and returns the
+root node generated by that parser.  If it cannot find an appropriate
+parser, it returns @code{nil}.
 @end defun
 
-Once we have a node, we can retrieve other nodes from it, or query for
-information about this node.
+Given a node, a Lisp program can retrieve other nodes starting from
+it, or query for information about this node.
 
 @heading Retrieving node from other nodes
+@cindex syntax tree nodes, retrieving from other nodes
 
 @subheading By kinship
+@cindex kinship, syntax tree nodes
+@cindex nodes, by kinship
+@cindex syntax tree nodes, by kinship
 
 @defun treesit-node-parent node
 This function returns the immediate parent of @var{node}.
@@ -524,87 +566,95 @@ Retrieving Node
 
 @defun treesit-node-child node n &optional named
 This function returns the @var{n}'th child of @var{node}.  If
-@var{named} is non-nil, then it only counts named nodes
+@var{named} is non-@code{nil}, it counts only named nodes
 (@pxref{tree-sitter named node, named node}).  For example, in a node
-that represents a string: @code{"text"}, there are three children
-nodes: the opening quote @code{"}, the string content @code{text}, and
-the enclosing quote @code{"}.  Among these nodes, the first child is
-the opening quote @code{"}, the first named child is the string
-content @code{text}.
+that represents a string @code{"text"}, there are three children
+nodes: the opening quote @code{"}, the string text @code{text}, and
+the closing quote @code{"}.  Among these nodes, the first child is the
+opening quote @code{"}, and the first named child is the string text.
 @end defun
 
 @defun treesit-node-children node &optional named
-This function returns all of @var{node}'s children in a list.  If
-@var{named} is non-nil, then it only retrieves named nodes.
+This function returns all of @var{node}'s children as a list.  If
+@var{named} is non-@code{nil}, then it retrieves only named nodes.
 @end defun
 
 @defun treesit-next-sibling node &optional named
 This function finds the next sibling of @var{node}.  If @var{named} is
-non-nil, it finds the next named sibling.
+non-@code{nil}, it finds the next named sibling.
 @end defun
 
 @defun treesit-prev-sibling node &optional named
 This function finds the previous sibling of @var{node}.  If
-@var{named} is non-nil, it finds the previous named sibling.
+@var{named} is non-@code{nil}, it finds the previous named sibling.
 @end defun
 
 @subheading By field name
+@cindex nodes, by field name
+@cindex syntax tree nodes, by field name
 
 To make the syntax tree easier to analyze, many language definitions
 assign @dfn{field names} to child nodes (@pxref{tree-sitter node field
 name, field name}).  For example, a @code{function_definition} node
-could have a @code{declarator} and a @code{body}.
+could have a @code{declarator} node and a @code{body} node.
 
 @defun treesit-child-by-field-name node field-name
-This function finds the child of @var{node} that has @var{field-name}
-as its field name.
+This function finds the child of @var{node} whose field name is
+@var{field-name}, a string.
 
 @example
 @group
 ;; Get the child that has "body" as its field name.
 (treesit-child-by-field-name node "body")
-    @c @result{} #<treesit-node from 3 to 11 in *scratch*>
+  @result{} #<treesit-node from 3 to 11 in *scratch*>
 @end group
 @end example
 @end defun
 
 @subheading By position
+@cindex nodes, by position
+@cindex syntax tree nodes, by position
 
 @defun treesit-first-child-for-pos node pos &optional named
 This function finds the first child of @var{node} that extends beyond
-@var{pos}.  ``Extend beyond'' means the end of the child node >=
-@var{pos}.  This function only looks for immediate children of
-@var{node}, and doesn't look in its grand children.  If @var{named} is
-non-nil, it only looks for named child (@pxref{tree-sitter named node,
-named node}).
+buffer position @var{pos}.  ``Extends beyond'' means the end of the
+child node is greater or equal to @var{pos}.  This function only looks
+for immediate children of @var{node}, and doesn't look in its
+grandchildren.  If @var{named} is non-@code{nil}, it looks for the
+first named child (@pxref{tree-sitter named node, named node}).
 @end defun
 
 @defun treesit-node-descendant-for-range node beg end &optional named
-This function finds the @emph{smallest} child/grandchild... of
-@var{node} that spans the range from @var{beg} to @var{end}.  It is
-similar to @code{treesit-node-at}.  If @var{named} is non-nil, it only
-looks for named child.
+This function finds the @emph{smallest} descendant node of @var{node}
+that spans the region of text between positions @var{beg} and
+@var{end}.  It is similar to @code{treesit-node-at}.  If @var{named}
+is non-@code{nil}, it looks for smallest named child.
 @end defun
 
 @heading Searching for node
 
 @defun treesit-search-subtree node predicate &optional all backward limit
 This function traverses the subtree of @var{node} (including
-@var{node}), and match @var{predicate} with each node along the way.
-And @var{predicate} is a regexp that matches (case-insensitively)
-against each node's type, or a function that takes a node and returns
-nil/non-nil.  If a node matches, that node is returned, if no node
-ever matches, nil is returned.
-
-By default, this function only traverses named nodes, if @var{all} is
-non-nil, it traverses all nodes.  If @var{backward} is non-nil, it
-traverses backwards.  If @var{limit} is non-nil, it only traverses
-that number of levels down in the tree.
+@var{node} itself), looking for a node for which @var{predicate}
+returns non-@code{nil}.  @var{predicate} is a regexp that is matched
+(case-insensitively) against each node's type, or a predicate function
+that takes a node and returns non-@code{nil} if the node matches.  The
+function returns the first node that matches, or @code{nil} if none
+does.
+
+By default, this function only traverses named nodes, but if @var{all}
+is non-@code{nil}, it traverses all the nodes.  If @var{backward} is
+@c FIXME: What does it mean to ``traverse backward''?
+non-nil, it traverses backwards.  If @var{limit} is non-@code{nil}, it
+must be a number that limits the tree traversal to that many levels
+down the tree.
 @end defun
 
 @defun treesit-search-forward start predicate &optional all backward up
+@c FIXME: Explain better what is the differencve between this function
+@c and the previous one.
 This function is somewhat similar to @code{treesit-search-subtree}.
-It also traverse the parse tree and match each node with
+It also traverse the parse tree and matches each node with
 @var{predicate} (except for @var{start}), where @var{predicate} can be
 a (case-insensitive) regexp or a function.  For a tree like the below
 where @var{start} is marked 1, this function traverses as numbered:
@@ -623,30 +673,35 @@ Retrieving Node
 @end group
 @end example
 
-Same as in @code{treesit-search-subtree}, this function only searches
-for named nodes by default.  But if @var{all} is non-nil, it searches
-for all nodes.  If @var{backward} is non-nil, it searches backwards.
+Like @code{treesit-search-subtree}, this function only searches for
+named nodes by default, but if @var{all} is non-@code{nil}, it
+searches for all nodes.  If @var{backward} is non-@code{nil}, it
+searches backwards.
 
-If @var{up} is non-nil, this function will only traverse to siblings
-and parents.  In that case, only 1 3 4 8 would be traversed.
+If @var{up} is non-@code{nil}, this function will only traverse to
+siblings and parents.  In that case, only the nodes marked by 1, 3, 4,
+and 8 above would be traversed.
 @end defun
 
 @defun treesit-search-forward-goto predicate side &optional all backward up
-This function jumps to the start or end of the next node in buffer
-that matches @var{predicate}.  Parameters @var{predicate}, @var{all},
-@var{backward}, and @var{up} are the same as in
-@code{treesit-search-forward}.  And @var{side} controls which side of
-the matched no do we stop at, it can be @code{start} or @code{end}.
+This function moves point to the beginning or end of the next node in
+the buffer that matches @var{predicate}.  Arguments @var{predicate},
+@var{all}, @var{backward}, and @var{up} are the same as in
+@code{treesit-search-forward}.  @var{side} controls on which side of
+the matched node we stop: it can be @code{start} or @code{end}.
+@c FIXME: Wouldn't it be convenient to make SIDE optional argument,
+@c and by default stop and the beginning (or end), whichever happens
+@c most frequently?
 @end defun
 
 @defun treesit-induce-sparse-tree root predicate &optional process-fn limit
 This function creates a sparse tree from @var{root}'s subtree.
 
-Basically, it takes the subtree under @var{root}, and combs it so only
-the nodes that match @var{predicate} are left, like picking out grapes
-on the vine.  Like previous functions, @var{predicate} can be a regexp
-string that matches against each node's type case-insensitively, or a
-function that takes a node and return nil/non-nil.
+It takes the subtree under @var{root}, and combs it so only the nodes
+that match @var{predicate} are left.  Like previous functions, the
+@var{predicate} can be a regexp string that matches against each
+node's type case-insensitively, or a function that takes a node and
+return non-@code{nil} if it matches.
 
 For example, for a subtree on the left that consist of both numbers
 and letters, if @var{predicate} is ``letter only'', the returned tree
@@ -670,50 +725,51 @@ Retrieving Node
 
 If @var{process-fn} is non-nil, instead of returning the matched
 nodes, this function passes each node to @var{process-fn} and uses the
-returned value instead.  If non-nil, @var{limit} is the number of
+returned value instead.  If non-@code{nil}, @var{limit} is the number of
 levels to go down from @var{root}.
 
-Each node in the returned tree looks like @code{(@var{tree-sitter
-node} . (@var{child} ...))}.  The @var{tree-sitter node} of the root
-of this tree will be nil if @var{ROOT} doesn't match @var{pred}.  If
-no node matches @var{predicate}, return nil.
+Each node in the returned tree looks like
+@w{@code{(@var{tree-sitter-node} . (@var{child} @dots{}))}}.  The
+@var{tree-sitter-node} of the root of this tree will be nil if
+@var{root} doesn't match @var{predicate}.  If no node matches
+@var{predicate}, the function returns @code{nil}.
 @end defun
 
-@heading More convenient functions
+@heading More convenience functions
 
-@defun treesit-filter-child node pred &optional named
-This function finds immediate children of @var{node} that satisfies
-@var{pred}.
+@defun treesit-filter-child node predicate &optional named
+This function finds immediate children of @var{node} that satisfy
+@var{predicate}.
 
-Function @var{pred} takes the child node as the argument and should
-return non-nil to indicated keeping the child.  If @var{named}
-non-nil, this function only searches for named nodes.
+The @var{predicate} function takes a node as the argument and should
+return non-@code{nil} to indicate that the node should be kept.  If
+@var{named} is non-@code{nil}, this function only examines the named
+nodes.
 @end defun
 
-@defun treesit-parent-until node pred
-This function repeatedly finds the parent of @var{node}, and returns
-the parent if it satisfies @var{pred} (which takes the parent as the
-argument).  If no parent satisfies @var{pred}, this function returns
-nil.
+@defun treesit-parent-until node predicate
+This function repeatedly finds the parents of @var{node}, and returns
+the parent that satisfies @var{predicate}, a function that takes a
+node as the argument.  If no parent satisfies @var{predicate}, this
+function returns @code{nil}.
 @end defun
 
-@defun treesit-parent-while
+@defun treesit-parent-while node predicate
 This function repeatedly finds the parent of @var{node}, and keeps
-doing so as long as the parent satisfies @var{pred} (which takes the
-parent as the single argument).  I.e., this function returns the
-farthest parent that still satisfies @var{pred}.
+doing so as long as the nodes satisfy @var{predicate}, a function that
+takes a node as the argument.  That is, this function returns the
+farthest parent that still satisfies @var{predicate}.
 @end defun
 
-@node Accessing Node
+@node Accessing Node Information
 @section Accessing Node Information
+@cindex information of node, syntax trees
+@cindex syntax trees, node information
 
-Before going further, make sure you have read the basic conventions
-about tree-sitter nodes in the previous node.
-
-@heading Basic information
+@heading Basic information of Node
 
 Every node is associated with a parser, and that parser is associated
-with a buffer.  The following functions let you retrieve them.
+with a buffer.  The following functions retrieve them.
 
 @defun treesit-node-parser node
 This function returns @var{node}'s associated parser.
@@ -727,8 +783,8 @@ Accessing Node
 This function returns @var{node}'s parser's associated language.
 @end defun
 
-Each node represents a piece of text in the buffer.  Functions below
-finds relevant information about that text.
+Each node represents a portion of text in the buffer.  Functions below
+find relevant information about that text.
 
 @defun treesit-node-start node
 Return the start position of @var{node}.
@@ -739,11 +795,13 @@ Accessing Node
 @end defun
 
 @defun treesit-node-text node &optional object
-Returns the buffer text that @var{node} represents.  (If @var{node} is
-retrieved from parsing a string, it will be text from that string.)
+Return the buffer text that @var{node} represents, as a string.  (If
+@var{node} is retrieved from parsing a string, it will be the text
+from that string.)
 @end defun
 
-Here are some basic checks on tree-sitter nodes.
+@cindex predicates for syntax tree nodes
+Here are some predicates on tree-sitter nodes:
 
 @defun treesit-node-p object
 Checks if @var{object} is a tree-sitter syntax node.
@@ -762,31 +820,36 @@ Accessing Node
 (@pxref{tree-sitter named node, named node}).
 
 @cindex tree-sitter missing node
-Apart from being named/anonymous, a node can have other properties.  A
-node can be ``missing'': missing nodes are inserted by the parser in
+@cindex missing node, tree-sitter
+Apart from being named or anonymous, a node can have other properties.
+A node can be ``missing'': such nodes are inserted by the parser in
 order to recover from certain kinds of syntax errors, i.e., something
-should probably be there according to the grammar, but not there.
+should probably be there according to the grammar, but is not there.
+This can happen during editing of the program source, when the source
+is not yet in its final form.
 
 @cindex tree-sitter extra node
+@cindex extra node, tree-sitter
 A node can be ``extra'': extra nodes represent things like comments,
 which can appear anywhere in the text.
 
 @cindex tree-sitter node that has changes
-A node ``has changes'' if the buffer changed since when the node is
-retrieved, i.e., outdated.
+@cindex has changes, tree-sitter node
+A node ``has changes'' if the buffer changed since the last time the
+node was retrieved, i.e., the node is outdated.
 
 @cindex tree-sitter node that has error
+@cindex has error, tree-sitter node
 A node ``has error'' if the text it spans contains a syntax error.  It
-can be the node itself has an error, or one of its
-children/grandchildren... has an error.
+can be that the node itself has an error, or one of its descendants
+has an error.
 
 @defun treesit-node-check node property
-This function checks if @var{node} has @var{property}.  @var{property}
-can be @code{'named}, @code{'missing}, @code{'extra},
-@code{'has-changes}, or @code{'has-error}.
+This function checks if @var{node} has the specified @var{property}.
+@var{property} can be @code{named}, @code{missing}, @code{extra},
+@code{has-changes}, or @code{has-error}.
 @end defun
 
-
 @defun treesit-node-type node
 Named nodes have ``types'' (@pxref{tree-sitter node type, node type}).
 For example, a named node can be a @code{string_literal} node, where
@@ -799,7 +862,7 @@ Accessing Node
 
 @defun treesit-node-index node &optional named
 This function returns the index of @var{node} as a child node of its
-parent.  If @var{named} is non-nil, it only count named nodes
+parent.  If @var{named} is non-@code{nil}, it only counts named nodes
 (@pxref{tree-sitter named node, named node}).
 @end defun
 
@@ -816,35 +879,34 @@ Accessing Node
 
 @defun treesit-child-count node &optional named
 This function finds the number of children of @var{node}.  If
-@var{named} is non-nil, it only counts named child (@pxref{tree-sitter
-named node, named node}).
+@var{named} is non-@code{nil}, it only counts named children
+(@pxref{tree-sitter named node, named node}).
 @end defun
 
 @node Pattern Matching
 @section Pattern Matching Tree-sitter Nodes
+@cindex pattern matching with tree-sitter nodes
 
-Tree-sitter let us pattern match with a small declarative language.
-Pattern matching consists of two steps: first tree-sitter matches a
-@dfn{pattern} against nodes in the syntax tree, then it @dfn{captures}
-specific nodes in that pattern and returns the captured nodes.
+@cindex capturing, tree-sitter node
+Tree-sitter lets Lisp programs match patterns using a small
+declarative language.  This pattern matching consists of two steps:
+first tree-sitter matches a @dfn{pattern} against nodes in the syntax
+tree, then it @dfn{captures} specific nodes that matched the pattern
+and returns the captured nodes.
 
 We describe first how to write the most basic query pattern and how to
-capture nodes in a pattern, then the pattern-match function, finally
-more advanced pattern syntax.
+capture nodes in a pattern, then the pattern-matching function, and
+finally the more advanced pattern syntax.
 
 @heading Basic query syntax
 
-@cindex Tree-sitter query syntax
-@cindex Tree-sitter query pattern
+@cindex tree-sitter query pattern syntax
+@cindex pattern syntax, tree-sitter query
+@cindex query, tree-sitter
 A @dfn{query} consists of multiple @dfn{patterns}.  Each pattern is an
 s-expression that matches a certain node in the syntax node.  A
-pattern has the following shape:
+pattern has the form @w{@code{(@var{type} (@var{child}@dots{}))}}
 
-@example
-(@var{type} @var{child}...)
-@end example
-
-@noindent
 For example, a pattern that matches a @code{binary_expression} node that
 contains @code{number_literal} child nodes would look like
 
@@ -852,9 +914,9 @@ Pattern Matching
 (binary_expression (number_literal))
 @end example
 
-To @dfn{capture} a node in the query pattern above, append
-@code{@@capture-name} after the node pattern you want to capture.  For
-example,
+To @dfn{capture} a node using the query pattern above, append
+@code{@@@var{capture-name}} after the node pattern you want to
+capture.  For example,
 
 @example
 (binary_expression (number_literal) @@number-in-exp)
@@ -862,10 +924,11 @@ Pattern Matching
 
 @noindent
 captures @code{number_literal} nodes that are inside a
-@code{binary_expression} node with capture name @code{number-in-exp}.
+@code{binary_expression} node with the capture name
+@code{number-in-exp}.
 
-We can capture the @code{binary_expression} node too, with capture
-name @code{biexp}:
+We can capture the @code{binary_expression} node as well, with, for
+example, the capture name @code{biexp}:
 
 @example
 (binary_expression
@@ -874,33 +937,37 @@ Pattern Matching
 
 @heading Query function
 
-Now we can introduce the query functions.
+@cindex query functions, tree-sitter
+Now we can introduce the @dfn{query functions}.
 
 @defun treesit-query-capture node query &optional beg end node-only
-This function matches patterns in @var{query} in @var{node}.
-Parameter @var{query} can be either a string, a s-expression, or a
+This function matches patterns in @var{query} within @var{node}.
+The argument @var{query} can be either a string, a s-expression, or a
 compiled query object.  For now, we focus on the string syntax;
 s-expression syntax and compiled query are described at the end of the
 section.
 
-Parameter @var{node} can also be a parser or a language symbol.  A
+The argument @var{node} can also be a parser or a language symbol.  A
 parser means using its root node, a language symbol means find or
 create a parser for that language in the current buffer, and use the
 root node.
 
-The function returns all captured nodes in a list of
-@code{(@var{capture_name} . @var{node})}.  If @var{node-only} is
-non-nil, a list of node is returned instead.  If @var{beg} and
-@var{end} are both non-nil, this function only pattern matches nodes
-in that range.
+The function returns all the captured nodes in a list of the form
+@w{@code{(@var{capture_name} . @var{node})}}.  If @var{node-only} is
+non-@code{nil}, it returns the list of nodes instead.  By default the
+entire text of @var{node} is searched, but if @var{beg} and @var{end}
+are both non-@code{nil}, they specify the region of buffer text where
+this function should match nodes.
 
 @vindex treesit-query-error
-This function raise a @var{treesit-query-error} if @var{query} is
-malformed.  The signal data contains a description of the specific
-error.  You can use @code{treesit-query-validate} to debug the query.
+@findex treesit-query-validate
+This function raises the @code{treesit-query-error} error if
+@var{query} is malformed.  The signal data contains a description of
+the specific error.  You can use @code{treesit-query-validate} to
+validate and debug the query.
 @end defun
 
-For example, suppose @var{node}'s content is @code{1 + 2}, and
+For example, suppose @var{node}'s text is @code{1 + 2}, and
 @var{query} is
 
 @example
@@ -911,7 +978,7 @@ Pattern Matching
 @end group
 @end example
 
-Querying that query would return
+Matching that query would return
 
 @example
 @group
@@ -922,8 +989,8 @@ Pattern Matching
 @end group
 @end example
 
-As we mentioned earlier, a @var{query} could contain multiple
-patterns. For example, it could have two top-level patterns:
+As mentioned earlier, @var{query} could contain multiple patterns. For
+example, it could have two top-level patterns:
 
 @example
 @group
@@ -934,8 +1001,8 @@ Pattern Matching
 @end example
 
 @defun treesit-query-string string query language
-This function parses @var{string} with @var{language}, pattern matches
-its root node with @var{query}, and returns the result.
+This function parses @var{string} with @var{language}, matches its
+root node with @var{query}, and returns the result.
 @end defun
 
 @heading More query syntax
@@ -965,8 +1032,10 @@ Pattern Matching
 
 @subheading Field name
 
-We can capture child nodes that has specific field names:
+It is possible to capture child nodes that have specific field names:
 
+@c FIXME: The significance of ``:'' should be explained, and also what
+@c are ``declarator'' and ``body''.
 @example
 @group
 (function_definition
@@ -975,8 +1044,8 @@ Pattern Matching
 @end group
 @end example
 
-We can also capture a node that doesn't have certain field, say, a
-@code{function_definition} without a @code{body} field.
+It is also possible to capture a node that doesn't have a certain
+field, say, a @code{function_definition} without a @code{body} field.
 
 @example
 (function_definition !body) @@func-no-body
@@ -984,19 +1053,21 @@ Pattern Matching
 
 @subheading Quantify node
 
+@cindex quantify node, tree-sitter
 Tree-sitter recognizes quantification operators @samp{*}, @samp{+} and
 @samp{?}.  Their meanings are the same as in regular expressions:
 @samp{*} matches the preceding pattern zero or more times, @samp{+}
 matches one or more times, and @samp{?} matches zero or one time.
 
-For example, this pattern matches @code{type_declaration} nodes
-that has @emph{zero or more} @code{long} keyword.
+@c FIXME: ``pattern'' or :''query''?  Or maybe ``query pattern''?
+For example, the following pattern matches @code{type_declaration}
+nodes that has @emph{zero or more} @code{long} keyword.
 
 @example
 (type_declaration "long"*) @@long-type
 @end example
 
-And this pattern matches a type declaration that has zero or one
+The following pattern matches a type declaration that has zero or one
 @code{long} keyword:
 
 @example
@@ -1005,8 +1076,8 @@ Pattern Matching
 
 @subheading Grouping
 
-Similar to groups in regular expression, we can bundle patterns into a
-group and apply quantification operators to it.  For example, to
+Similar to groups in regular expression, we can bundle patterns into
+groups and apply quantification operators to them.  For example, to
 express a comma separated list of identifiers, one could write
 
 @example
@@ -1043,10 +1114,14 @@ Pattern Matching
 @group
 ;; Anchor the child with the end of its parent.
 (compound_expression (_) @@last-child .)
+@end group
 
+@group
 ;; Anchor the child with the beginning of its parent.
 (compound_expression . (_) @@first-child)
+@end group
 
+@group
 ;; Anchor two adjacent children.
 (compound_expression
  (_) @@prev-child
@@ -1060,8 +1135,8 @@ Pattern Matching
 
 @subheading Predicate
 
-We can add predicate constraints to a pattern.  For example, if we use
-the following query pattern
+It is possible to add predicate constraints to a pattern.  For
+example, with the following query pattern:
 
 @example
 @group
@@ -1072,30 +1147,33 @@ Pattern Matching
 @end group
 @end example
 
-Then tree-sitter only matches arrays where the first element equals to
+@noindent
+tree-sitter only matches arrays where the first element equals to
 the last element.  To attach a predicate to a pattern, we need to
 group then together.  A predicate always starts with a @samp{#}.
 Currently there are two predicates, @code{#equal} and @code{#match}.
 
 @deffn Predicate equal arg1 arg2
-Matches if @var{arg1} equals to @var{arg2}.  Arguments can be either a
-string or a capture name.  Capture names represent the text that the
+Matches if @var{arg1} equals to @var{arg2}.  Arguments can be either
+strings or capture names.  Capture names represent the text that the
 captured node spans in the buffer.
 @end deffn
 
 @deffn Predicate match regexp capture-name
-Matches if the text that @var{capture-name}’s node spans in the buffer
+Matches if the text that @var{capture-name}'s node spans in the buffer
 matches regular expression @var{regexp}.  Matching is case-sensitive.
 @end deffn
 
-Note that a predicate can only refer to capture names appeared in the
-same pattern.  Indeed, it makes little sense to refer to capture names
-in other patterns anyway.
+Note that a predicate can only refer to capture names that appear in
+the same pattern.  Indeed, it makes little sense to refer to capture
+names in other patterns.
 
 @heading S-expression patterns
 
+@cindex query patterns as sexps
+@cindex patterns, tree-sitter, in sexp form
 Besides strings, Emacs provides a s-expression based syntax for query
-patterns. It largely resembles the string-based syntax.  For example,
+patterns.  It largely resembles the string-based syntax.  For example,
 the following pattern
 
 @example
@@ -1125,9 +1203,8 @@ Pattern Matching
 @end group
 @end example
 
-Most pattern syntax can be written directly as strange but
-never-the-less valid s-expressions.  Only a few of them needs
-modification:
+Most patterns can be written directly as strange but nevertheless
+valid s-expressions.  Only a few of them needs modification:
 
 @itemize
 @item
@@ -1154,6 +1231,7 @@ Pattern Matching
 @end group
 @end example
 
+@noindent
 is written in s-expression as
 
 @example
@@ -1167,18 +1245,21 @@ Pattern Matching
 
 @heading Compiling queries
 
-If a query will be used repeatedly, especially in tight loops, it is
-important to compile that query, because a compiled query is much
-faster than an uncompiled one.  A compiled query can be used anywhere
-a query is accepted.
+@cindex compiling tree-sitter queries
+@cindex queries, compiling
+If a query is intended to be used repeatedly, especially in tight
+loops, it is important to compile that query, because a compiled query
+is much faster than an uncompiled one.  A compiled query can be used
+anywhere a query is accepted.
 
 @defun treesit-query-compile language query
 This function compiles @var{query} for @var{language} into a compiled
 query object and returns it.
 
-This function raise a @var{treesit-query-error} if @var{query} is
-malformed.  The signal data contains a description of the specific
-error.  You can use @code{treesit-query-validate} to debug the query.
+This function raises the @code{treesit-query-error} error if
+@var{query} is malformed.  The signal data contains a description of
+the specific error.  You can use @code{treesit-query-validate} to
+validate and debug the query.
 @end defun
 
 @defun treesit-query-language query
@@ -1186,38 +1267,40 @@ Pattern Matching
 @end defun
 
 @defun treesit-query-expand query
-This function expands the s-expression @var{query} into a string
-query.
+This function converts the s-expression @var{query} into the string
+format.
 @end defun
 
 @defun treesit-pattern-expand pattern
-This function expands the s-expression @var{pattern} into a string
-pattern.
+This function converts the s-expression @var{pattern} into the string
+format.
 @end defun
 
-Finally, tree-sitter project's documentation about
-pattern-matching can be found at
+For more details, read the tree-sitter project's documentation about
+pattern-matching, which can be found at
 @uref{https://tree-sitter.github.io/tree-sitter/using-parsers#pattern-matching-with-queries}.
 
 @node Multiple Languages
 @section Parsing Text in Multiple Languages
 
-Sometimes, the source of a programming language could contain sources
-of other languages, HTML + CSS + JavaScript is one example.  In that
-case, we need to assign individual parsers to text segments written in
-different languages.  Traditionally this is achieved by using
+@cindex multiple languages, parsing with tree-sitter
+@cindex parsing multiple languages with tree-sitter
+Sometimes, the source of a programming language could contain snippets
+of other languages; HTML + CSS + JavaScript is one example.  In that
+case, text segments written in different languages need to be assigned
+different parsers.  Traditionally, this is achieved by using
 narrowing.  While tree-sitter works with narrowing (@pxref{tree-sitter
-narrowing, narrowing}), the recommended way is to set ranges in which
-a parser will operate.
+narrowing, narrowing}), the recommended way is instead to set regions
+of buffer text in which a parser will operate.
 
 @defun treesit-parser-set-included-ranges parser ranges
-This function sets the range of @var{parser} to @var{ranges}.  Then
-@var{parser} will only read the text covered in each range.  Each
-range in @var{ranges} is a list of cons @code{(@var{beg}
-. @var{end})}.
+This function sets up @var{parser} to operate on @var{ranges}.  The
+@var{parser} will only read the text of the specified ranges.  Each
+range in @var{ranges} is a list of the form @w{@code{(@var{beg}
+. @var{end})}}.
 
-Each range in @var{ranges} must come in order and not overlap.  That
-is, in pseudo code:
+The ranges in @var{ranges} must come in order and must not overlap.
+That is, in pseudo code:
 
 @example
 @group
@@ -1231,12 +1314,12 @@ Multiple Languages
 
 @vindex treesit-range-invalid
 If @var{ranges} violates this constraint, or something else went
-wrong, this function signals a @code{treesit-range-invalid}.  The
-signal data contains a specific error message and the ranges we are
-trying to set.
+wrong, this function signals the @code{treesit-range-invalid} error.
+The signal data contains a specific error message and the ranges we
+are trying to set.
 
 This function can also be used for disabling ranges.  If @var{ranges}
-is nil, the parser is set to parse the whole buffer.
+is @code{nil}, the parser is set to parse the whole buffer.
 
 Example:
 
@@ -1251,9 +1334,9 @@ Multiple Languages
 @defun treesit-parser-included-ranges parser
 This function returns the ranges set for @var{parser}.  The return
 value is the same as the @var{ranges} argument of
-@code{treesit-parser-included-ranges}: a list of cons
-@code{(@var{beg} . @var{end})}.  And if @var{parser} doesn't have any
-ranges, the return value is nil.
+@code{treesit-parser-included-ranges}: a list of cons cells of the form
+@w{@code{(@var{beg} . @var{end})}}.  If @var{parser} doesn't have any
+ranges, the return value is @code{nil}.
 
 @example
 @group
@@ -1269,7 +1352,7 @@ Multiple Languages
 @var{parser-or-lang} could be either a parser or a language.  If it is
 a language, this function looks for the first parser in
 @code{(treesit-parser-list)} for that language in the current buffer,
-and set range for it.
+and sets the ranges for it.
 @end defun
 
 @defun treesit-get-ranges parser-or-lang
@@ -1281,52 +1364,54 @@ Multiple Languages
 
 @defun treesit-query-range source query &optional beg end
 This function matches @var{source} with @var{query} and returns the
-ranges of captured nodes.  The return value has the same shape of
-other functions: a list of @code{(@var{beg} . @var{end})}.
+ranges of captured nodes.  The return value is a list of cons cells of
+the form @w{@code{(@var{beg} . @var{end})}}, where @var{beg} and
+@var{end} specify the beginning and the end of a region of text.
 
 For convenience, @var{source} can be a language symbol, a parser, or a
-node.  If a language symbol, this function matches in the root node of
-the first parser using that language; if a parser, this function
-matches in the root node of that parser; if a node, this function
-matches in that node.
-
-Parameter @var{query} is the query used to capture nodes
-(@pxref{Pattern Matching}). The capture names don't matter.  Parameter
-@var{beg} and @var{end}, if both non-nil, limits the range in which
-this function queries.
-
-Like other query functions, this function raises an
-@var{treesit-query-error} if @var{query} is malformed.
+node.  If it's a language symbol, this function matches in the root
+node of the first parser using that language; if a parser, this
+function matches in the root node of that parser; if a node, this
+function matches in that node.
+
+The argument @var{query} is the query used to capture nodes
+(@pxref{Pattern Matching}).  The capture names don't matter.  The
+arguments @var{beg} and @var{end}, if both non-@code{nil}, limit the
+range in which this function queries.
+
+Like other query functions, this function raises the
+@code{treesit-query-error} error if @var{query} is malformed.
 @end defun
 
-@defun treesit-language-at point
+@defun treesit-language-at pos
 This function tries to figure out which language is responsible for
-the text at @var{point}.  It goes over each parser in
-@code{(treesit-parser-list)} and see if that parser's range covers
-@var{point}.
+the text at buffer position @var{pos}.  It goes over each parser in
+@code{(treesit-parser-list)} to find a parser whose ranges cover
+@var{pos}.
 @end defun
 
 @defvar treesit-range-functions
-A list of range functions.  Font-locking and indenting code uses
-functions in this alist to set correct ranges for a language parser
-before using it.
+This variable holds the list of range functions.  Font-locking and
+indenting code use functions in this list to set correct ranges for
+a language parser before using it.
 
-The signature of each function should be
+The signature of each function in the list should be:
 
 @example
 (@var{start} @var{end} &rest @var{_})
 @end example
 
-where @var{start} and @var{end} marks the region that is about to be
-used.  A range function only need to (but not limited to) update
+@noindent
+where @var{start} and @var{end} specify the region that is about to be
+used.  A range function only needs to (but is not limited to) update
 ranges in that region.
 
-Each function in the list is called in-order.
+The functions in the list are called in order.
 @end defvar
 
 @defun treesit-update-ranges &optional start end
-This function is used by font-lock and indent to update ranges before
-using any parser.  Each range function in
+This function is used by font-lock and indentation to update ranges
+before using any parser.  Each range function in
 @var{treesit-range-functions} is called in-order.  Arguments
 @var{start} and @var{end} are passed to each range function.
 @end defun
@@ -1334,11 +1419,12 @@ Multiple Languages
 @heading An example
 
 Normally, in a set of languages that can be mixed together, there is a
-major language and several embedded languages. We first parse the
-whole document with the major language’s parser, set ranges for the
-embedded languages, then parse the embedded languages.
+major language and several embedded languages.  A Lisp program usually
+first parses the whole document with the major language's parser, sets
+ranges for the embedded languages, and then parses the embedded
+languages.
 
-Suppose we want to parse a very simple document that mixes HTML, CSS
+Suppose we need to parse a very simple document that mixes HTML, CSS
 and JavaScript:
 
 @example
@@ -1358,14 +1444,18 @@ Multiple Languages
 (setq html (treesit-get-parser-create 'html))
 (setq css (treesit-get-parser-create 'css))
 (setq js (treesit-get-parser-create 'javascript))
+@end group
 
+@group
 ;; Set CSS ranges.
 (setq css-range
       (treesit-query-range
        'html
        "(style_element (raw_text) @@capture)"))
 (treesit-parser-set-included-ranges css css-range)
+@end group
 
+@group
 ;; Set JavaScript ranges.
 (setq js-range
       (treesit-query-range
@@ -1375,21 +1465,24 @@ Multiple Languages
 @end group
 @end example
 
-We use a query pattern @code{(style_element (raw_text) @@capture)} to
-find CSS nodes in the HTML parse tree. For how to write query
+We use a query pattern @w{@code{(style_element (raw_text) @@capture)}} to
+find CSS nodes in the HTML parse tree.  For how to write query
 patterns, @pxref{Pattern Matching}.
 
 @node Tree-sitter major modes
 @section Developing major modes with tree-sitter
+@cindex major mode, developing with tree-sitter
 
 This section covers some general guidelines on developing tree-sitter
 integration for a major mode.  For tree-sitter integration with
-specific Emacs features, @pxref{Parser-based Font Lock},
+specific Emacs features, see @ref{Parser-based Font Lock}, and see
 @ref{Parser-based Indentation}.
 
-Emacs provides @code{treesit-mode} and @code{global-treesit-mode},
-when these two modes are on, major modes should turn on their
-tree-sitter support, should they have one.  Major modes works with
+@findex treesit-mode
+@findex global-treesit-mode
+Emacs provides @code{treesit-mode} and @code{global-treesit-mode}.
+When one of these two modes is turned on, major modes should turn on
+their tree-sitter support, if they have one.  Major modes works with
 @code{treesit-mode} by setting @code{major-mode-backend-function}.
 
 @defvar major-mode-backend-function
@@ -1397,24 +1490,25 @@ Tree-sitter major modes
 @code{treesit-mode} uses this function to turn on/off tree-sitter
 support.
 
-This function is passed two argument @var{backend} and @var{warn}.
+This function is passed two arguments: @var{backend} and @var{warn}.
 @var{backend} is a symbol representing the backend we want to
 activate.  Currently it can be @code{treesit} or @code{elisp}.
 
-If @var{warn} is non-nil, display a warning if a @code{backend} can't
-activate, if @var{warn} is nil, just print an message and don't
-display any warning.
+If @var{warn} is non-@code{nil}, display a warning if a @code{backend}
+can't activated; if @var{warn} is @code{nil}, just print a message
+and don't display any warning.
 @end defvar
 
 @defun treesit-ready-p warn &rest languages
-This is a convenient function that checks for conditions for
+This is a convenience function that checks for conditions for
 activating tree-sitter.  It checks for whether tree-sitter is built
 with Emacs, the buffer's size, and whether each @var{language} is
 available.
 
-If all conditions are met, it returns non-nil.  If not, it signals a
-warning or displays a message depending on the value of @var{warn}.
-If @var{warn} is non-nil, signal warning, if nil, display message.
+If all conditions are met, it returns non-@code{nil}.  If not, it
+shows a warning or displays a message depending on the value of
+@var{warn}.  If @var{warn} is non-@code{nil}, show a warning,
+otherwise display an echo-area message.
 @end defun
 
 
@@ -1422,7 +1516,7 @@ Tree-sitter C API
 @section Tree-sitter C API Correspondence
 
 Emacs' tree-sitter integration doesn't expose every feature
-tree-sitter's C API provides.  Missing features include:
+provided by the tree-sitter's C API.  Missing features include:
 
 @itemize
 @item
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 3096a21f6f..f0a46e17c6 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -60,10 +60,10 @@ treesit-parse-string
     (treesit-parser-root-node
      (treesit-parser-create language))))
 
-(defun treesit-language-at (point)
-  "Return the language used at POINT."
+(defun treesit-language-at (pos)
+  "Return the language used at position POS."
   (cl-loop for parser in (treesit-parser-list)
-           if (treesit-node-on point point parser)
+           if (treesit-node-on pos pos parser)
            return (treesit-parser-language parser)))
 
 (defun treesit-set-ranges (parser-or-lang ranges)
@@ -101,12 +101,13 @@ treesit-node-language
   (treesit-parser-language
    (treesit-node-parser node)))
 
-(defun treesit-node-at (point &optional parser-or-lang named)
-  "Return the smallest node that starts at or after POINT.
+(defun treesit-node-at (pos &optional parser-or-lang named)
+  "Return the smallest node that starts at or after buffer position POS.
 
-\"Starts at or after POINT\" means the start of the node is
-greater or larger than POINT.  Return nil if none find.  If NAMED
-non-nil, only look for named node.
+\"Starts at or after POS\" means the start of the node is greater or
+equal than POS.
+
+Return nil if none find.  If NAMED is non-nil, only look for named node.
 
 If PARSER-OR-LANG is nil, use the first parser in
 \(`treesit-parser-list'); if PARSER-OR-LANG is a parser, use
@@ -118,7 +119,7 @@ treesit-node-at
         next)
     ;; This is very fast so no need for C implementation.
     (while (setq next (treesit-node-first-child-for-pos
-                       node point named))
+                       node pos named))
       (setq node next))
     node))
 

commit 7c750343be6309a78d3fd289959bca241d9daf5d
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Oct 21 18:50:24 2022 -0700

    * lisp/treesit.el (treesit-font-lock-enable): Add function back.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 136b756bad..3096a21f6f 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -508,6 +508,18 @@ treesit-font-lock-fontify-region
   (let ((font-lock-unfontify-region-function #'ignore))
     (funcall #'font-lock-default-fontify-region start end loudly)))
 
+(defun treesit-font-lock-enable ()
+  "Enable tree-sitter font-locking for the current buffer."
+  (treesit-font-lock-recompute-features)
+  (setq-local font-lock-fontify-region-function
+              #'treesit-font-lock-fontify-region)
+  ;; If we don't set `font-lock-defaults' to some non-nil value,
+  ;; font-lock doesn't enable properly (`font-lock-mode-internal'
+  ;; doesn't run).  See `font-lock-specified-p'.
+  (when (null font-lock-defaults)
+    (setq font-lock-defaults '(nil)))
+  (font-lock-mode 1))
+
 ;;; Indent
 
 (defvar treesit--indent-verbose nil

commit 5159789e55d64c7482dff3dc1a621d01f530f83c
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Oct 19 16:44:04 2022 -0700

    Revise the toggle scheme of tree-sitter (again)
    
    Now instead of a toggle function (major-mode-backend-function), we let
    major mode set local variables like treesit-font-lock-settings,
    treesit-imenu-function, then treesit-mode takes care of activating
    those things (clearing font-lock-keywords, setting
    imenu-create-index-function to treesit-imenu-function, etc).
    
    js.el and python.el: I've returned js-mode and python-mode to exactly
    what they were before tree-sitter change, plus lines at the end
    setting up tree-sitter variables.  Sorry about all these fuss :-D
    
    * lisp/treesit.el (treesit-mode-inhibit-message): Remove option.
    (major-mode-backend-function)
    (treesit-remapped-major-mode-alist): Remove variables.
    (treesit-mode): Move down to the end of buffer.  Do more things.
    (global-treesit-mode): Move down to the end of buffer.  Don't handle
    major-mode-remap-alist anymore.
    (global-treesit-mode--turn-on): Move down to the end of buffer.
    (treesit-ready-p): Move down to the end of buffer.  Changed signature.
    (treesit-font-lock-enable): Remove function.
    (treesit-defun-type-regexp): New variable.
    (treesit-beginning-of-defun)
    (treesit-end-of-defun): New function.
    (treesit-imenu-function): New variable.
    (treesit-mode-supported)
    (treesit-required-languages)
    (treesit--local-variable-backup): New variables.
    (treesit--backup-local-variable): New function
    
    * lisp/progmodes/js.el (js-use-tree-sitter): Remove option.
    (js--treesit-defun-type-regexp): Remove variable.  (Now set inline in
    js-mode.)
    (js--treesit-beginning-of-defun)
    (js--treesit-end-of-defun): Remove functions.  (Now use
    treesit-beginning/end-of-defun.)
    (js--backend-toggle)
    (js--json-backend-toggle): Remove function.
    (js-mode)
    (js-json-mode): Restore back to before tree-sitter changes.  Add
    tree-sitter setup at the end.
    
    * lisp/progmodes/python.el (python--backend-toggle): Remove function.
    (python-mode): Restore back to before tree-sitter changes.  Add
    tree-sitter setup at the end.
    
    * lisp/progmodes/ts-mode.el (ts-mode--font-lock-settings): Use
    js--fontify-template-string.
    (ts-mode--fontify-template-string): Remove function (because we can
    just use js--fontify-template-string).
    (ts-mode--defun-type-regexp): Remove variable (now set inline in
    ts-mode).
    (ts-mode--beginning-of-defun)
    (ts-mode--end-of-defun): Remove functions (now using
    treesit-beginning/end-of-defun).
    (ts-mode): Setup tree-sitter variables and then turn on treesit-mode
    or move to js-mode.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index fa548e4df7..52160fbb5e 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3403,13 +3403,6 @@ c-paragraph-start
   js-mode "\\(@[[:alpha:]]+\\>\\|$\\)")
 
 ;;; Tree sitter integration
-(defcustom js-use-tree-sitter nil
-  "If non-nil, `js-mode' tries to use tree-sitter.
-Currently `js-mode' uses tree-sitter for font-locking,
-indentation, which-function and movement functions."
-  :version "29.1"
-  :type 'boolean
-  :safe 'booleanp)
 
 (defun js--treesit-backward-up-list ()
   (lambda (_node _parent _bol &rest _)
@@ -3608,79 +3601,6 @@ js-treesit-current-defun
              do (setq node (treesit-node-parent node))
              finally return  (string-join name-list "."))))
 
-(defvar js--treesit-defun-type-regexp
-  (rx (or "class_declaration"
-          "method_definition"
-          "function_declaration"
-          "lexical_declaration"))
-  "Regular expression that matches type of defun nodes.
-Used in `js--treesit-beginning-of-defun' and friends.")
-
-(defun js--treesit-beginning-of-defun (&optional arg)
-  "Tree-sitter `beginning-of-defun' function.
-ARG is the same as in `beginning-of-defun."
-  (let ((arg (or arg 1)))
-    (if (> arg 0)
-        ;; Go backward.
-        (while (and (> arg 0)
-                    (treesit-search-forward-goto
-                     js--treesit-defun-type-regexp 'start nil t))
-          (setq arg (1- arg)))
-      ;; Go forward.
-      (while (and (< arg 0)
-                  (treesit-search-forward-goto
-                   js--treesit-defun-type-regexp 'start))
-        (setq arg (1+ arg))))))
-
-(defun js--treesit-end-of-defun (&optional arg)
-  "Tree-sitter `end-of-defun' function.
-ARG is the same as in `end-of-defun."
-  (let ((arg (or arg 1)))
-    (if (< arg 0)
-        ;; Go backward.
-        (while (and (< arg 0)
-                    (treesit-search-forward-goto
-                     js--treesit-defun-type-regexp 'end nil t))
-          (setq arg (1+ arg)))
-      ;; Go forward.
-      (while (and (> arg 0)
-                  (treesit-search-forward-goto
-                   js--treesit-defun-type-regexp 'end))
-        (setq arg (1- arg))))))
-
-(defun js--backend-toggle (backend warn)
-  "Toggle backend for `js-mode'.
-For BACKEND and WARN see `treesit-mode-function'."
-  (cond
-   ;; Tree-sitter.
-   ((and (eq backend 'treesit) (treesit-ready-p warn 'javascript))
-    (setq-local treesit-simple-indent-rules js--treesit-indent-rules)
-    (setq-local indent-line-function #'treesit-indent)
-
-    (setq-local beginning-of-defun-function #'js--treesit-beginning-of-defun)
-    (setq-local end-of-defun-function #'js--treesit-end-of-defun)
-
-    (add-hook 'which-func-functions #'js-treesit-current-defun nil t)
-
-    (setq-local font-lock-keywords-only t)
-  (setq-local treesit-font-lock-settings js--treesit-font-lock-settings)
-  (setq-local treesit-font-lock-feature-list '((minimal) (moderate) (full)))
-    (treesit-font-lock-enable))
-   ;; Elisp.
-   ((eq backend 'elisp)
-    (setq-local indent-line-function #'js-indent-line)
-    (setq-local beginning-of-defun-function #'js-beginning-of-defun)
-    (setq-local end-of-defun-function #'js-end-of-defun)
-
-    (setq-local font-lock-defaults
-                (list js--font-lock-keywords nil nil nil nil
-                      '(font-lock-syntactic-face-function
-                        . js-font-lock-syntactic-face-function)))
-
-    ;; Imenu
-    (setq imenu-case-fold-search nil)
-    (setq imenu-create-index-function #'js--imenu-create-index))))
-
 ;;; Main Function
 
 ;;;###autoload
@@ -3689,7 +3609,14 @@ js-mode
   :group 'js
   ;; Ensure all CC Mode "lang variables" are set to valid values.
   (c-init-language-vars js-mode)
+  (setq-local indent-line-function #'js-indent-line)
+  (setq-local beginning-of-defun-function #'js-beginning-of-defun)
+  (setq-local end-of-defun-function #'js-end-of-defun)
   (setq-local open-paren-in-column-0-is-defun-start nil)
+  (setq-local font-lock-defaults
+              (list js--font-lock-keywords nil nil nil nil
+                    '(font-lock-syntactic-face-function
+                      . js-font-lock-syntactic-face-function)))
   (setq-local syntax-propertize-function #'js-syntax-propertize)
   (add-hook 'syntax-propertize-extend-region-functions
             #'syntax-propertize-multiline 'append 'local)
@@ -3704,6 +3631,8 @@ js-mode
   (setq-local comment-start "// ")
   (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
   (setq-local comment-end "")
+  (setq-local fill-paragraph-function #'js-fill-paragraph)
+  (setq-local normal-auto-fill-function #'js-do-auto-fill)
 
   ;; Parse cache
   (add-hook 'before-change-functions #'js--flush-caches t t)
@@ -3716,6 +3645,10 @@ js-mode
     (add-hook 'after-change-functions #'js-jsx--detect-after-change nil t))
   (js-use-syntactic-mode-name)
 
+  ;; Imenu
+  (setq imenu-case-fold-search nil)
+  (setq imenu-create-index-function #'js--imenu-create-index)
+
   ;; for filling, pretend we're cc-mode
   (c-foreign-init-lit-pos-cache)
   (add-hook 'before-change-functions #'c-foreign-truncate-lit-pos-cache nil t)
@@ -3726,9 +3659,6 @@ js-mode
   (setq-local electric-layout-rules
 	      '((?\; . after) (?\{ . after) (?\} . before)))
 
-  (setq-local fill-paragraph-function #'js-fill-paragraph)
-  (setq-local normal-auto-fill-function #'js-do-auto-fill)
-
   (let ((c-buffer-is-cc-mode t))
     ;; FIXME: These are normally set by `c-basic-common-init'.  Should
     ;; we call it instead?  (Bug#6071)
@@ -3756,10 +3686,19 @@ js-mode
   ;; will mysteriously disappear.
   ;; FIXME: We should instead do this fontification lazily by adding
   ;; calls to syntax-propertize wherever it's really needed.
-  ;; (syntax-propertize (point-max))
-
-  (js--backend-toggle 'elisp nil)
-  (setq-local major-mode-backend-function #'js--backend-toggle))
+  ;;(syntax-propertize (point-max))
+
+  ;; Tree-sitter support.
+  (setq-local treesit-mode-supported t)
+  (setq-local treesit-required-languages '(javascript))
+  (setq-local treesit-simple-indent-rules js--treesit-indent-rules)
+  (setq-local treesit-defun-type-regexp
+              (rx (or "class_declaration"
+                      "method_definition"
+                      "function_declaration"
+                      "lexical_declaration")))
+  (setq-local treesit-font-lock-settings js--treesit-font-lock-settings)
+  (setq-local treesit-font-lock-feature-list '((minimal) (moderate) (full))))
 
 (defvar js-json--treesit-font-lock-settings
   (treesit-font-lock-rules
@@ -3791,29 +3730,18 @@ js--json-treesit-indent-rules
      ((parent-is "object") parent-bol ,js-indent-level)
      )))
 
-(defun js--json-backend-toggle (backend warn)
-  "Toggle backend for `json-mode'.
-For BACKEND and WARN see `treesit-mode-function'."
-  (cond
-   ;; Tree-sitter.
-   ((and (eq backend 'treesit) (treesit-ready-p warn 'json))
-    (setq-local treesit-simple-indent-rules js--json-treesit-indent-rules)
-    (setq-local indent-line-function #'treesit-indent)
-
-    (setq-local font-lock-keywords-only t)
-    (setq-local treesit-font-lock-settings js-json--treesit-font-lock-settings)
-    (treesit-font-lock-enable))
-   ;; Elisp.
-   ((eq backend 'elisp)
-    (js--backend-toggle 'elisp nil))))
-
 ;;;###autoload
 (define-derived-mode js-json-mode js-mode "JSON"
   (setq-local js-enabled-frameworks nil)
   ;; Speed up `syntax-ppss': JSON files can be big but can't hold
   ;; regexp matchers nor #! thingies (and `js-enabled-frameworks' is nil).
   (setq-local syntax-propertize-function #'ignore)
-  (setq-local major-mode-backend-function #'js--json-backend-toggle))
+
+  ;; Tree-sitter support.
+  (setq-local treesit-mode-supported t)
+  (setq-local treesit-required-languages '(json))
+  (setq-local treesit-simple-indent-rules js--json-treesit-indent-rules)
+  (setq-local treesit-font-lock-settings js-json--treesit-font-lock-settings))
 
 ;; Since we made JSX support available and automatically-enabled in
 ;; the base `js-mode' (for ease of use), now `js-jsx-mode' simply
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 834e8036a1..4ac5f2e3b0 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -6375,35 +6375,6 @@ python-electric-pair-string-delimiter
 (defvar electric-indent-inhibit)
 (defvar prettify-symbols-alist)
 
-(defun python--backend-toggle (backend warn)
-  "Toggle backend for `python-mode'.
-BACKEND and WARN are explained in `treesit-mode-function'."
-  (cond
-   ;; Tree-sitter.
-   ((and (eq backend 'treesit) (treesit-ready-p warn 'python))
-    (setq-local font-lock-keywords-only t)
-    (setq-local treesit-font-lock-feature-list
-                '((basic) (moderate) (elaborate)))
-    (setq-local treesit-font-lock-settings
-                python--treesit-settings)
-    (treesit-font-lock-enable)
-    (setq-local imenu-create-index-function
-                #'python-imenu-treesit-create-index)
-    (add-hook 'which-func-functions
-              #'python-info-treesit-current-defun nil t))
-   ;; Elisp.
-   ((eq backend 'elisp)
-    (setq-local font-lock-defaults
-                `(,python-font-lock-keywords
-                  nil nil nil nil
-                  (font-lock-syntactic-face-function
-                   . python-font-lock-syntactic-face-function)
-                  (font-lock-extend-after-change-region-function
-                   . python-font-lock-extend-region)))
-    (setq-local imenu-create-index-function
-                #'python-imenu-create-index)
-    (add-hook 'which-func-functions #'python-info-current-defun nil t))))
-
 ;;;###autoload
 (define-derived-mode python-mode prog-mode "Python"
   "Major mode for editing Python files.
@@ -6420,9 +6391,11 @@ python-mode
 
   (setq-local forward-sexp-function python-forward-sexp-function)
 
-  (python--backend-toggle 'elisp nil)
-
-  (setq-local major-mode-backend-function #'python--backend-toggle)
+  (setq-local font-lock-defaults
+              `(,python-font-lock-keywords
+                nil nil nil nil
+                (font-lock-syntactic-face-function
+                 . python-font-lock-syntactic-face-function)))
 
   (setq-local syntax-propertize-function
               python-syntax-propertize-function)
@@ -6451,9 +6424,14 @@ python-mode
   (add-hook 'post-self-insert-hook
             #'python-indent-post-self-insert-function 'append 'local)
 
+  (setq-local imenu-create-index-function
+              #'python-imenu-create-index)
+
   (setq-local add-log-current-defun-function
               #'python-info-current-defun)
 
+  (add-hook 'which-func-functions #'python-info-current-defun nil t)
+
   (setq-local skeleton-further-elements
               '((abbrev-mode nil)
                 (< '(backward-delete-char-untabify (min python-indent-offset
@@ -6462,13 +6440,13 @@ python-mode
 
   (with-no-warnings
     ;; suppress warnings about eldoc-documentation-function being obsolete
-   (if (null eldoc-documentation-function)
-       ;; Emacs<25
-       (setq-local eldoc-documentation-function #'python-eldoc-function)
-     (if (boundp 'eldoc-documentation-functions)
-         (add-hook 'eldoc-documentation-functions #'python-eldoc-function nil t)
-       (add-function :before-until (local 'eldoc-documentation-function)
-                     #'python-eldoc-function))))
+    (if (null eldoc-documentation-function)
+        ;; Emacs<25
+        (setq-local eldoc-documentation-function #'python-eldoc-function)
+      (if (boundp 'eldoc-documentation-functions)
+          (add-hook 'eldoc-documentation-functions #'python-eldoc-function nil t)
+        (add-function :before-until (local 'eldoc-documentation-function)
+                      #'python-eldoc-function))))
 
   (add-to-list
    'hs-special-modes-alist
@@ -6499,7 +6477,15 @@ python-mode
   (when python-indent-guess-indent-offset
     (python-indent-guess-indent-offset))
 
-  (add-hook 'flymake-diagnostic-functions #'python-flymake nil t))
+  (add-hook 'flymake-diagnostic-functions #'python-flymake nil t)
+
+  (setq-local treesit-mode-supported t)
+  (setq-local treesit-required-languages '(python))
+  (setq-local treesit-font-lock-feature-list
+              '((basic) (moderate) (elaborate)))
+  (setq-local treesit-font-lock-settings python--treesit-settings)
+  (setq-local treesit-imenu-function
+              #'python-imenu-treesit-create-index))
 
 ;;; Completion predicates for M-x
 ;; Commands that only make sense when editing Python code
diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el
index a3a2d9f78e..c23f2bec05 100644
--- a/lisp/progmodes/ts-mode.el
+++ b/lisp/progmodes/ts-mode.el
@@ -134,7 +134,7 @@ ts-mode--font-lock-settings
 
      (string) @font-lock-string-face
 
-     (template_string) @ts-mode--fontify-template-string
+     (template_string) @js--fontify-template-string
      (template_substitution ["${" "}"] @font-lock-builtin-face)
 
      (comment) @font-lock-comment-face)
@@ -248,61 +248,6 @@ ts-mode--font-lock-settings
      (jsx_attribute (property_identifier) @font-lock-constant-face)))
   "Tree-sitter font-lock settings.")
 
-(defun ts-mode--fontify-template-string (beg end node)
-  "Fontify template string but not substitution inside it.
-BEG, END, NODE refers to the template_string node."
-  (ignore end)
-  ;; Stolen from `js--fontify-template-string'
-  (let ((child (treesit-node-child node 0)))
-    (while child
-      (if (equal (treesit-node-type child) "template_substitution")
-          (put-text-property beg (treesit-node-start child)
-                             'face 'font-lock-string-face)
-        (put-text-property beg (treesit-node-end child)
-                           'face 'font-lock-string-face))
-      (setq beg (treesit-node-end child)
-            child (treesit-node-next-sibling child)))))
-
-(defvar ts-mode--defun-type-regexp
-  (rx (or "class_declaration"
-          "method_definition"
-          "function_declaration"
-          "lexical_declaration"))
-  "Regular expression that matches type of defun nodes.
-Used in `ts-mode--beginning-of-defun' and friends.")
-
-(defun ts-mode--beginning-of-defun (&optional arg)
-  "Tree-sitter `beginning-of-defun' function.
-ARG is the same as in `beginning-of-defun."
-  (let ((arg (or arg 1)))
-    (if (> arg 0)
-        ;; Go backward.
-        (while (and (> arg 0)
-                    (treesit-search-forward-goto
-                     ts-mode--defun-type-regexp 'start nil t))
-          (setq arg (1- arg)))
-      ;; Go forward.
-      (while (and (< arg 0)
-                  (treesit-search-forward-goto
-                   ts-mode--defun-type-regexp 'start))
-        (setq arg (1+ arg))))))
-
-(defun ts-mode--end-of-defun (&optional arg)
-  "Tree-sitter `end-of-defun' function.
-ARG is the same as in `end-of-defun."
-  (let ((arg (or arg 1)))
-    (if (< arg 0)
-        ;; Go backward.
-        (while (and (< arg 0)
-                    (treesit-search-forward-goto
-                     ts-mode--defun-type-regexp 'end nil t))
-          (setq arg (1+ arg)))
-      ;; Go forward.
-      (while (and (> arg 0)
-                  (treesit-search-forward-goto
-                   ts-mode--defun-type-regexp 'end))
-        (setq arg (1- arg))))))
-
 ;;;###autoload
 (add-to-list 'auto-mode-alist '("\\.ts\\'" . ts-mode))
 
@@ -315,26 +260,31 @@ ts-mode
   :group 'typescript
   :syntax-table ts-mode--syntax-table
 
+  ;; Treesit-mode.
+  (setq-local treesit-mode-supported t)
+  (setq-local treesit-required-languages '(tsx))
+  ;; Comments.
+  (setq-local comment-start "// ")
+  (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
+  (setq-local comment-end "")
+  ;; Indent.
+  (setq-local treesit-simple-indent-rules ts-mode--indent-rules)
+  ;; Navigation.
+  (setq-local treesit-defun-type-regexp
+              (rx (or "class_declaration"
+                      "method_definition"
+                      "function_declaration"
+                      "lexical_declaration")))
+  ;; Font-lock.
+  (setq-local treesit-font-lock-settings ts-mode--font-lock-settings)
+  (setq-local treesit-font-lock-feature-list '((minimal) (moderate) (full)))
+
   (cond
-   ((treesit-ready-p nil 'tsx)
-    ;; Comments
-    (setq-local comment-start "// ")
-    (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
-    (setq-local comment-end "")
-
-    (setq-local treesit-simple-indent-rules ts-mode--indent-rules)
-    (setq-local indent-line-function #'treesit-indent)
-
-    (setq-local beginning-of-defun-function #'ts-mode--beginning-of-defun)
-    (setq-local end-of-defun-function #'ts-mode--end-of-defun)
-
-    (setq font-lock-keywords-only t)
-    (setq-local treesit-font-lock-settings ts-mode--font-lock-settings)
-    (setq treesit-font-lock-feature-list '((minimal) (moderate) (full)))
-    (treesit-font-lock-enable))
+   ((treesit-ready-p '(tsx))
+    (treesit-mode))
    (t
-    (message "Tree-sitter for TypeScript isn't available, falling back to `js-mode'")
-    (js-mode))))
+    (js-mode)
+    (message "Tree-sitter for TypeScript isn't available, falling back to `js-mode'"))))
 
 (provide 'ts-mode)
 
diff --git a/lisp/treesit.el b/lisp/treesit.el
index aadcc729d4..136b756bad 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -33,7 +33,7 @@
 (require 'cl-seq)
 (require 'font-lock)
 
-;;; Activating tree-sitter
+;;; Custom options
 
 ;; Tree-sitter always appear as treesit in symbols.
 (defgroup treesit nil
@@ -48,105 +48,8 @@ treesit-max-buffer-size
   :type 'integer
   :version "29.1")
 
-(defcustom treesit-mode-inhibit-message nil
-  "If non-nil, don't print message when tree-sitter can't activate."
-  :type 'boolean
-  :version "29.1")
-
 (declare-function treesit-available-p "treesit.c")
 
-(defvar-local major-mode-backend-function nil
-  "A function that toggles the \"backend\" for a major mode.
-
-The function is passed two argument BACKEND and WARN.  BACKEND is
-a symbol representing the backend we want to activate.  Currently
-it can be `treesit' or `elisp'.
-
-If WARN is non-nil, display a warning if tree-sitter can't
-activate, if WARN is nil, just print an message and don't display
-warning.")
-
-;;;###autoload
-(define-minor-mode treesit-mode
-  "Activate tree-sitter to power major-mode features.
-
-This mode is merely a SUGGESTION of turning on tree-sitter,
-actual activation of tree-sitter functionalities depends on
-whether the major mode supports tree-sitter, availability of
-specific tree-sitter language definition, etc."
-  :version "29.1"
-  :group 'treesit
-  (when major-mode-backend-function
-    (funcall major-mode-backend-function
-             (if treesit-mode 'treesit 'elisp)
-             (eq this-command 'treesit-mode))))
-
-(defvar treesit-remapped-major-mode-alist nil
-  "A list like `major-mode-remap-alist'.
-
-When major modes activate tree-sitter by switching to another
-major mode and `global-treesit-mode' is on, they add an
-entry (MODE . NEW-MODE) to `major-mode-remap-alist', so next time
-Emacs uses NEW-MODE directly.
-
-These remaps should be removed when `global-treesit-mode' is
-turned off, so we record each (MODE . NEW-MODE) in this variable.")
-
-;;;###autoload
-(define-globalized-minor-mode global-treesit-mode treesit-mode
-  global-treesit-mode--turn-on
-  :version "29.1"
-  :group 'treesit
-  :predicate t
-  (when (not global-treesit-mode)
-    (dolist (map treesit-remapped-major-mode-alist)
-      (setq major-mode-remap-alist
-            (remove map major-mode-remap-alist)))))
-
-(defun global-treesit-mode--turn-on ()
-  "Function used to determine whether to turn on `treesit-mode'.
-Called in every buffer if `global-treesit-mode' is on."
-  (treesit-mode))
-
-(defun treesit-ready-p (warn &rest languages)
-  "Check that tree-sitter is ready to be used.
-
-If tree-sitter is not ready and WARN is nil-nil, emit a warning;
-if WARN is nil, print a message.  But if
-`treesit-mode-inhibit-message' is non-nil, don't even print the
-message.
-
-LANGUAGES are languages we want check for availability."
-  (let (msg)
-    ;; Check for each condition and set MSG.
-    (catch 'term
-      (when (not (treesit-available-p))
-        (setq msg "tree-sitter library is not built with Emacs")
-        (throw 'term nil))
-      (when (> (buffer-size) treesit-max-buffer-size)
-        (setq msg "buffer larger than `treesit-max-buffer-size'")
-        (throw 'term nil))
-      (dolist (lang languages)
-        (pcase-let ((`(,available . ,err)
-                     (treesit-language-available-p lang t)))
-          (when (not available)
-            (setq msg (format "language definition for %s is unavailable (%s): %s"
-                              lang (nth 0 err)
-                              (string-join
-                               (mapcar (lambda (x) (format "%s" x))
-                                       (cdr err))
-                               " ")))
-            (throw 'term nil)))))
-    ;; Decide if all conditions met and whether emit a warning.
-    (if (not msg)
-        t
-      (setq msg (concat "Cannot activate tree-sitter, because " msg))
-      (if warn
-          (display-warning 'treesit msg)
-        (unless treesit-mode-inhibit-message
-          (message "%s" msg)))
-      nil)))
-
 ;;; Parser API supplement
 
 (defun treesit-parse-string (string language)
@@ -605,18 +508,6 @@ treesit-font-lock-fontify-region
   (let ((font-lock-unfontify-region-function #'ignore))
     (funcall #'font-lock-default-fontify-region start end loudly)))
 
-(defun treesit-font-lock-enable ()
-  "Enable tree-sitter font-locking for the current buffer."
-  (treesit-font-lock-recompute-features)
-  (setq-local font-lock-fontify-region-function
-              #'treesit-font-lock-fontify-region)
-  ;; If we don't set `font-lock-defaults' to some non-nil value,
-  ;; font-lock doesn't enable properly (`font-lock-mode-internal'
-  ;; doesn't run).  See `font-lock-specified-p'.
-  (when (null font-lock-defaults)
-    (setq font-lock-defaults '(nil)))
-  (font-lock-mode 1))
-
 ;;; Indent
 
 (defvar treesit--indent-verbose nil
@@ -945,6 +836,177 @@ treesit-search-forward-goto
       (goto-char start))
     node))
 
+;;; Navigation
+
+(defvar-local treesit-defun-type-regexp nil
+  "A regexp that matches the node type of defun nodes.
+For example, \"(function|class)_definition\".
+
+This is used by `treesit-beginning-of-defun' and friends.  Bind
+it buffer-locally and `treesit-mode' will use it for navigating
+defun's.")
+
+(defun treesit-beginning-of-defun (&optional arg)
+  "Tree-sitter `beginning-of-defun' function.
+ARG is the same as in `beginning-of-defun."
+  (let ((arg (or arg 1)))
+    (if (> arg 0)
+        ;; Go backward.
+        (while (and (> arg 0)
+                    (treesit-search-forward-goto
+                     treesit-defun-type-regexp 'start nil t))
+          (setq arg (1- arg)))
+      ;; Go forward.
+      (while (and (< arg 0)
+                  (treesit-search-forward-goto
+                   treesit-defun-type-regexp 'start))
+        (setq arg (1+ arg))))))
+
+(defun treesit-end-of-defun ()
+  "Tree-sitter `end-of-defun' function."
+  (treesit-search-forward-goto treesit-defun-type-regexp 'end))
+
+;;; Imenu
+
+(defvar-local treesit-imenu-function nil
+  "Tree-sitter version of `imenu-create-index-function'.
+
+Set this variable to a function and `treesit-mode' will bind it
+to `imenu-create-index-function'.")
+
+;;; Activating tree-sitter
+
+(defvar-local treesit-mode-supported nil
+  "Set this variable to t to indicate support for `treesit-mode'.")
+
+(defvar-local treesit-required-languages nil
+  "A list of languages this major mode need for tree-sitter.")
+
+(defun treesit-ready-p (languages &optional report)
+  "Check that tree-sitter is ready to be used.
+
+If tree-sitter is not ready and REPORT non-nil, emit a warning or
+message.  Emit a warning if REPORT is `warn', message if REPORT
+is `message'.
+
+LANGUAGES is a list of languages we want check for availability."
+  (let (msg)
+    ;; Check for each condition and set MSG.
+    (catch 'term
+      (when (not treesit-mode-supported)
+        (setq msg "this major mode doesn't support it")
+        (throw 'term nil))
+      (when (not (treesit-available-p))
+        (setq msg "tree-sitter library is not built with Emacs")
+        (throw 'term nil))
+      (when (> (buffer-size) treesit-max-buffer-size)
+        (setq msg "buffer larger than `treesit-max-buffer-size'")
+        (throw 'term nil))
+      (dolist (lang languages)
+        (pcase-let ((`(,available . ,err)
+                     (treesit-language-available-p lang t)))
+          (when (not available)
+            (setq msg (format "language definition for %s is unavailable (%s): %s"
+                              lang (nth 0 err)
+                              (string-join
+                               (mapcar (lambda (x) (format "%s" x))
+                                       (cdr err))
+                               " ")))
+            (throw 'term nil)))))
+    ;; Decide if all conditions met and whether emit a warning.
+    (if (not msg)
+        t
+      (setq msg (concat "Cannot activate tree-sitter, because " msg))
+      (pcase report
+        ('warn (display-warning 'treesit msg))
+        ('message (message "%s" msg)))
+      nil)))
+
+(defvar-local treesit--local-variable-backup nil
+  "An alist of (VAR . VALUE) that backs up pre-treesit-mode values.")
+
+(defun treesit--backup-local-variable (variable value &optional restore)
+  "Backup VARIABLE's value and set it to VALUE.
+If RESTORE is non-nil, ignore VALUE and restore the backup (if
+there is any)."
+  (if restore
+      (when-let ((value (alist-get variable
+                                   treesit--local-variable-backup)))
+        (set variable value))
+    ;; Set.
+    (make-variable-buffer-local variable)
+    (setf (alist-get variable treesit--local-variable-backup)
+          (symbol-value variable))
+    (set variable value)))
+
+;;;###autoload
+(define-minor-mode treesit-mode
+  "Activate tree-sitter to power major-mode features.
+
+This mode is merely a SUGGESTION of turning on tree-sitter,
+actual activation of tree-sitter functionalities depends on
+whether the major mode supports tree-sitter, availability of
+specific tree-sitter language definition, etc."
+  :version "29.1"
+  :group 'treesit
+  (if treesit-mode
+      (when (treesit-ready-p treesit-required-languages 'warn)
+        ;; Font-lock.
+        (setq-local treesit--local-variable-backup nil)
+        ;; NOTE: If anyone other than the major mode added stuff to
+        ;; `font-lock-keywords', they would need to re-add them after
+        ;; `treesit-mode' turns on.
+        (when treesit-font-lock-settings
+          (treesit--backup-local-variable 'font-lock-keywords-only t)
+          (treesit--backup-local-variable 'font-lock-keywords nil)
+          (treesit--backup-local-variable
+           'font-lock-fontify-region-function
+           #'treesit-font-lock-fontify-region)
+          (treesit-font-lock-recompute-features))
+        ;; Indent.
+        (when treesit-simple-indent-rules
+          (treesit--backup-local-variable
+           'indent-line-function #'treesit-indent))
+        ;; Navigation.
+        (when treesit-defun-type-regexp
+          (treesit--backup-local-variable
+           'beginning-of-defun-function #'treesit-beginning-of-defun)
+          (treesit--backup-local-variable
+           'end-of-defun-function #'treesit-end-of-defun))
+        ;; Imenu.
+        (when treesit-imenu-function
+          (treesit--backup-local-variable
+           'imenu-create-index-function treesit-imenu-function)))
+    ;; Font-lock.
+    (treesit--backup-local-variable 'font-lock-keywords nil t)
+    (treesit--backup-local-variable 'font-lock-keywords-only nil t)
+    (treesit--backup-local-variable
+     'font-lock-fontify-region-function nil t)
+    ;; Indent.
+    (treesit--backup-local-variable 'indent-line-function nil t)
+    ;; Navigation.
+    (treesit--backup-local-variable 'beginning-of-defun-function nil t)
+    (treesit--backup-local-variable 'end-of-defun-function nil t)
+    ;; Imenu.
+    (treesit--backup-local-variable 'imenu-create-index-function nil t)
+    ))
+
+(defun global-treesit-mode--turn-on ()
+  "Function used to determine whether to turn on `treesit-mode'.
+Called in every buffer if `global-treesit-mode' is on."
+  ;; Check tree-sitter readiness and don't emit warnings.
+  (when (and treesit-mode-supported
+             (treesit-ready-p treesit-required-languages))
+    (treesit-mode)))
+
+;;;###autoload
+(define-globalized-minor-mode global-treesit-mode treesit-mode
+  global-treesit-mode--turn-on
+  :version "29.1"
+  :group 'treesit
+  :predicate t
+  nil)
+
 ;;; Debugging
 
 (defvar-local treesit--inspect-name nil

commit 4c328daf0130fc139e827a8a8d6689e2b15c73ea
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Oct 18 14:24:22 2022 -0700

    Add a new section to tree-sitter's manual node
    
    * doc/lispref/parsing.texi (Parsing Program Source): New section
    Tree-sitter major modes.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index d2a333027b..ae3724dd4a 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -26,14 +26,6 @@ Parsing Program Source
 for this Emacs instance.
 @end defun
 
-For tree-sitter integration with existing Emacs features,
-@pxref{Parser-based Font Lock}, @ref{Parser-based Indentation}, and
-@ref{List Motion}.
-
-About naming convention: use ``tree-sitter'' when referring to it as a
-noun, like @code{python-use-tree-sitter}, but use ``treesit'' for
-prefixes, like @code{python-treesit-indent-function}.
-
 To access the syntax tree of the text in a buffer, we need to first
 load a language definition and create a parser with it.  Next, we can
 query the parser for specific nodes in the syntax tree.  Then, we can
@@ -49,6 +41,7 @@ Parsing Program Source
 * Accessing Node::           Accessing node information.
 * Pattern Matching::         Pattern matching with query patterns.
 * Multiple Languages::       Parse text written in multiple languages.
+* Tree-sitter major modes::  Develop major modes using tree-sitter.
 * Tree-sitter C API::        Compare the C API and the ELisp API.
 @end menu
 
@@ -1386,6 +1379,45 @@ Multiple Languages
 find CSS nodes in the HTML parse tree. For how to write query
 patterns, @pxref{Pattern Matching}.
 
+@node Tree-sitter major modes
+@section Developing major modes with tree-sitter
+
+This section covers some general guidelines on developing tree-sitter
+integration for a major mode.  For tree-sitter integration with
+specific Emacs features, @pxref{Parser-based Font Lock},
+@ref{Parser-based Indentation}.
+
+Emacs provides @code{treesit-mode} and @code{global-treesit-mode},
+when these two modes are on, major modes should turn on their
+tree-sitter support, should they have one.  Major modes works with
+@code{treesit-mode} by setting @code{major-mode-backend-function}.
+
+@defvar major-mode-backend-function
+This is a buffer-local variable that holds a function.
+@code{treesit-mode} uses this function to turn on/off tree-sitter
+support.
+
+This function is passed two argument @var{backend} and @var{warn}.
+@var{backend} is a symbol representing the backend we want to
+activate.  Currently it can be @code{treesit} or @code{elisp}.
+
+If @var{warn} is non-nil, display a warning if a @code{backend} can't
+activate, if @var{warn} is nil, just print an message and don't
+display any warning.
+@end defvar
+
+@defun treesit-ready-p warn &rest languages
+This is a convenient function that checks for conditions for
+activating tree-sitter.  It checks for whether tree-sitter is built
+with Emacs, the buffer's size, and whether each @var{language} is
+available.
+
+If all conditions are met, it returns non-nil.  If not, it signals a
+warning or displays a message depending on the value of @var{warn}.
+If @var{warn} is non-nil, signal warning, if nil, display message.
+@end defun
+
+
 @node Tree-sitter C API
 @section Tree-sitter C API Correspondence
 

commit 6b475da972d7e2ff7a2a3cafc1aea2a4937e64e9
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Oct 18 14:06:13 2022 -0700

    ; * lisp/progmodes/python.el (python--backend-toggle): Use cond.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 374bc02a78..834e8036a1 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -6378,18 +6378,21 @@ prettify-symbols-alist
 (defun python--backend-toggle (backend warn)
   "Toggle backend for `python-mode'.
 BACKEND and WARN are explained in `treesit-mode-function'."
-  (if (and (eq backend 'treesit) (treesit-ready-p warn 'python))
-      (progn
-        (setq-local font-lock-keywords-only t)
-        (setq-local treesit-font-lock-feature-list
-                    '((basic) (moderate) (elaborate)))
-        (setq-local treesit-font-lock-settings
-                    python--treesit-settings)
-        (treesit-font-lock-enable)
-        (setq-local imenu-create-index-function
-                    #'python-imenu-treesit-create-index)
-        (add-hook 'which-func-functions
-                  #'python-info-treesit-current-defun nil t))
+  (cond
+   ;; Tree-sitter.
+   ((and (eq backend 'treesit) (treesit-ready-p warn 'python))
+    (setq-local font-lock-keywords-only t)
+    (setq-local treesit-font-lock-feature-list
+                '((basic) (moderate) (elaborate)))
+    (setq-local treesit-font-lock-settings
+                python--treesit-settings)
+    (treesit-font-lock-enable)
+    (setq-local imenu-create-index-function
+                #'python-imenu-treesit-create-index)
+    (add-hook 'which-func-functions
+              #'python-info-treesit-current-defun nil t))
+   ;; Elisp.
+   ((eq backend 'elisp)
     (setq-local font-lock-defaults
                 `(,python-font-lock-keywords
                   nil nil nil nil
@@ -6399,7 +6402,7 @@ python--backend-toggle
                    . python-font-lock-extend-region)))
     (setq-local imenu-create-index-function
                 #'python-imenu-create-index)
-    (add-hook 'which-func-functions #'python-info-current-defun nil t)))
+    (add-hook 'which-func-functions #'python-info-current-defun nil t))))
 
 ;;;###autoload
 (define-derived-mode python-mode prog-mode "Python"

commit c4ad36cd2daab764649db451c4a3f1a35c5f519a
Author: Theodor Thornhill <theo@thornhill.no>
Date:   Mon Oct 17 12:49:19 2022 +0200

    Add more granular features in font-locking
    
    There is now support for three font-locking levels, 'minimal',
    'moderate' and 'full'.  The richest experience is to be expected from
    the 'full', and all levels are enabled by default.
    
    * lisp/progmodes/js.el (js--treesit-font-lock-settings): New defvar
    renamed from 'js--treesit-settings'.
    
    (js--treesit-font-lock-settings): New defvar renamed from
    'js--json-treesit-settings'.
    
    * lisp/progmodes/ts-mode.el (ts-mode--font-lock-settings): New defvar
    renamed from 'ts-mode--settings'.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 51f5b72047..fa548e4df7 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3454,19 +3454,34 @@ js--treesit-keywords
     "debugger" "default" "delete" "do" "else" "export" "extends" "finally"
     "for" "from" "function" "get" "if" "import" "in" "instanceof" "let" "new"
     "of" "return" "set" "static" "switch" "switch" "target" "throw" "try"
-    "typeof" "var" "void" "while" "with" "yield"))
+    "typeof" "var" "void" "while" "with" "yield")
+  "JavaScript keywords for tree-sitter font-locking.")
 
-(defvar js--treesit-settings
+(defvar js--treesit-font-lock-settings
   (treesit-font-lock-rules
    :language 'javascript
-   :feature 'basic
    :override t
-   `(((identifier) @font-lock-constant-face
+   :feature 'minimal
+   `(
+     ((identifier) @font-lock-constant-face
       (:match "^[A-Z_][A-Z_\\d]*$" @font-lock-constant-face))
 
-     (new_expression
-      constructor: (identifier) @font-lock-type-face)
+     [(this) (super)] @font-lock-keyword-face
+
+     [(true) (false) (null)] @font-lock-constant-face
+     (regex pattern: (regex_pattern)) @font-lock-string-face
+     (number) @font-lock-constant-face
 
+     (string) @font-lock-string-face
+     (comment) @font-lock-comment-face
+     [,@js--treesit-keywords] @font-lock-keyword-face
+
+     (template_string) @js--fontify-template-string
+     (template_substitution ["${" "}"] @font-lock-constant-face))
+   :language 'javascript
+   :override t
+   :feature 'moderate
+   `(
      (function
       name: (identifier) @font-lock-function-name-face)
 
@@ -3479,6 +3494,21 @@ js--treesit-settings
      (method_definition
       name: (property_identifier) @font-lock-function-name-face)
 
+     (variable_declarator
+      name: (identifier) @font-lock-variable-name-face)
+
+     (new_expression
+      constructor: (identifier) @font-lock-type-face)
+
+     (for_in_statement
+      left: (identifier) @font-lock-variable-name-face)
+
+     (arrow_function
+      parameter: (identifier) @font-lock-variable-name-face))
+   :language 'javascript
+   :override t
+   :feature 'full
+   `(
      (variable_declarator
       name: (identifier) @font-lock-function-name-face
       value: [(function) (arrow_function)])
@@ -3502,20 +3532,11 @@ js--treesit-settings
                   property:
                   (property_identifier) @font-lock-function-name-face)])
 
-     (variable_declarator
-      name: (identifier) @font-lock-variable-name-face)
-
      (assignment_expression
       left: [(identifier) @font-lock-variable-name-face
              (member_expression
               property: (property_identifier) @font-lock-variable-name-face)])
 
-     (for_in_statement
-      left: (identifier) @font-lock-variable-name-face)
-
-     (arrow_function
-      parameter: (identifier) @font-lock-variable-name-face)
-
      (pair key: (property_identifier) @font-lock-variable-name-face)
 
      (pair value: (identifier) @font-lock-variable-name-face)
@@ -3546,20 +3567,8 @@ js--treesit-settings
 
      (jsx_attribute
       (property_identifier)
-      @font-lock-constant-face)
-
-     [(this) (super)] @font-lock-keyword-face
-
-     [(true) (false) (null)] @font-lock-constant-face
-     (regex pattern: (regex_pattern)) @font-lock-string-face
-     (number) @font-lock-constant-face
-
-     (string) @font-lock-string-face
-     (comment) @font-lock-comment-face
-     [,@js--treesit-keywords] @font-lock-keyword-face
-
-     (template_string) @js--fontify-template-string
-     (template_substitution ["${" "}"] @font-lock-constant-face))))
+      @font-lock-constant-face)))
+  "Tree-sitter font-lock settings.")
 
 (defun js--fontify-template-string (beg end node)
   "Fontify template string but not substitution inside it.
@@ -3651,12 +3660,11 @@ js--backend-toggle
     (setq-local beginning-of-defun-function #'js--treesit-beginning-of-defun)
     (setq-local end-of-defun-function #'js--treesit-end-of-defun)
 
-    (setq-local font-lock-keywords-only t)
-    (setq-local treesit-font-lock-settings js--treesit-settings)
-    (setq-local treesit-font-lock-feature-list '((basic)))
-
     (add-hook 'which-func-functions #'js-treesit-current-defun nil t)
 
+    (setq-local font-lock-keywords-only t)
+  (setq-local treesit-font-lock-settings js--treesit-font-lock-settings)
+  (setq-local treesit-font-lock-feature-list '((minimal) (moderate) (full)))
     (treesit-font-lock-enable))
    ;; Elisp.
    ((eq backend 'elisp)
@@ -3753,10 +3761,10 @@ js-mode
   (js--backend-toggle 'elisp nil)
   (setq-local major-mode-backend-function #'js--backend-toggle))
 
-(defvar js--json-treesit-settings
+(defvar js-json--treesit-font-lock-settings
   (treesit-font-lock-rules
    :language 'json
-   :feature 'basic
+   :feature 'minimal
    :override t
    `(
      (pair
@@ -3770,8 +3778,8 @@ js--json-treesit-settings
 
      (escape_sequence) @font-lock-constant-face
 
-     (comment) @font-lock-comment-face
-     )))
+     (comment) @font-lock-comment-face))
+  "Font-lock settings for JSON.")
 
 
 (defvar js--json-treesit-indent-rules
@@ -3793,7 +3801,7 @@ js--json-backend-toggle
     (setq-local indent-line-function #'treesit-indent)
 
     (setq-local font-lock-keywords-only t)
-    (setq-local treesit-font-lock-settings js--json-treesit-settings)
+    (setq-local treesit-font-lock-settings js-json--treesit-font-lock-settings)
     (treesit-font-lock-enable))
    ;; Elisp.
    ((eq backend 'elisp)
diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el
index dffe9fcfcf..a3a2d9f78e 100644
--- a/lisp/progmodes/ts-mode.el
+++ b/lisp/progmodes/ts-mode.el
@@ -104,17 +104,49 @@ ts-mode--indent-rules
      (no-node parent-bol 0)))
   "Tree-sitter indent rules.")
 
-(defvar ts-mode--settings
+(defvar ts-mode--keywords
+  '("!" "abstract" "as" "async" "await" "break"
+    "case" "catch" "class" "const" "continue" "debugger"
+    "declare" "default" "delete" "do" "else" "enum"
+    "export" "extends" "finally" "for" "from" "function"
+    "get" "if" "implements" "import" "in" "instanceof" "interface"
+    "keyof" "let" "namespace" "new" "of" "private" "protected"
+    "public" "readonly" "return" "set" "static" "switch"
+    "target" "throw" "try" "type" "typeof" "var" "void"
+    "while" "with" "yield")
+  "TypeScript keywords for tree-sitter font-locking.")
+
+(defvar ts-mode--font-lock-settings
   (treesit-font-lock-rules
    :language 'tsx
    :override t
-   :feature 'basic
-   '(((identifier) @font-lock-constant-face
+   :feature 'minimal
+   `(
+     ((identifier) @font-lock-constant-face
       (:match "^[A-Z_][A-Z_\\d]*$" @font-lock-constant-face))
 
+     [,@ts-mode--keywords] @font-lock-keyword-face
+     [(this) (super)] @font-lock-keyword-face
+
+     [(true) (false) (null)] @font-lock-constant-face
+     (regex pattern: (regex_pattern)) @font-lock-string-face
+     (number) @font-lock-constant-face
+
+     (string) @font-lock-string-face
+
+     (template_string) @ts-mode--fontify-template-string
+     (template_substitution ["${" "}"] @font-lock-builtin-face)
+
+     (comment) @font-lock-comment-face)
+   :language 'tsx
+   :override t
+   :feature 'moderate
+   '(
      (nested_type_identifier
       module: (identifier) @font-lock-type-face)
+
      (type_identifier) @font-lock-type-face
+
      (predefined_type) @font-lock-type-face
 
      (new_expression
@@ -129,6 +161,29 @@ ts-mode--settings
      (method_definition
       name: (property_identifier) @font-lock-function-name-face)
 
+     (variable_declarator
+      name: (identifier) @font-lock-variable-name-face)
+
+     (enum_declaration (identifier) @font-lock-type-face)
+
+     (enum_body (property_identifier) @font-lock-type-face)
+
+     (enum_assignment name: (property_identifier) @font-lock-type-face)
+
+     (assignment_expression
+      left: [(identifier) @font-lock-variable-name-face
+             (member_expression
+              property: (property_identifier) @font-lock-variable-name-face)])
+
+     (for_in_statement
+      left: (identifier) @font-lock-variable-name-face)
+
+     (arrow_function
+      parameter: (identifier) @font-lock-variable-name-face))
+   :language 'tsx
+   :override t
+   :feature 'full
+   '(
      (variable_declarator
       name: (identifier) @font-lock-function-name-face
       value: [(function) (arrow_function)])
@@ -151,33 +206,12 @@ ts-mode--settings
        (member_expression
         property: (property_identifier) @font-lock-function-name-face)])
 
-     (variable_declarator
-      name: (identifier) @font-lock-variable-name-face)
-
-     (enum_declaration (identifier) @font-lock-type-face)
-
-     (enum_body (property_identifier) @font-lock-type-face)
-
-     (enum_assignment name: (property_identifier) @font-lock-type-face)
-
-     (assignment_expression
-      left: [(identifier) @font-lock-variable-name-face
-             (member_expression
-              property: (property_identifier) @font-lock-variable-name-face)])
-
-     (for_in_statement
-      left: (identifier) @font-lock-variable-name-face)
-
-     (arrow_function
-      parameter: (identifier) @font-lock-variable-name-face)
-
      (arrow_function
       parameters:
       [(_ (identifier) @font-lock-variable-name-face)
        (_ (_ (identifier) @font-lock-variable-name-face))
        (_ (_ (_ (identifier) @font-lock-variable-name-face)))])
 
-
      (pair key: (property_identifier) @font-lock-variable-name-face)
 
      (pair value: (identifier) @font-lock-variable-name-face)
@@ -211,80 +245,24 @@ ts-mode--settings
       [(nested_identifier (identifier)) (identifier)]
       @font-lock-function-name-face)
 
-     (jsx_attribute (property_identifier) @font-lock-constant-face)
-
-     [(this) (super)] @font-lock-keyword-face
-
-     [(true) (false) (null)] @font-lock-constant-face
-     (regex pattern: (regex_pattern)) @font-lock-string-face
-     (number) @font-lock-constant-face
-
-     (string) @font-lock-string-face
-
-     (template_string) @js--fontify-template-string
-     (template_substitution
-      ["${" "}"] @font-lock-constant-face)
-
-     ["!"
-      "abstract"
-      "as"
-      "async"
-      "await"
-      "break"
-      "case"
-      "catch"
-      "class"
-      "const"
-      "continue"
-      "debugger"
-      "declare"
-      "default"
-      "delete"
-      "do"
-      "else"
-      "enum"
-      "export"
-      "extends"
-      "finally"
-      "for"
-      "from"
-      "function"
-      "get"
-      "if"
-      "implements"
-      "import"
-      "in"
-      "instanceof"
-      "interface"
-      "keyof"
-      "let"
-      "namespace"
-      "new"
-      "of"
-      "private"
-      "protected"
-      "public"
-      "readonly"
-      "return"
-      "set"
-      "static"
-      "switch"
-      "target"
-      "throw"
-      "try"
-      "type"
-      "typeof"
-      "var"
-      "void"
-      "while"
-      "with"
-      "yield"
-      ] @font-lock-keyword-face
-
-     (comment) @font-lock-comment-face
-     ))
+     (jsx_attribute (property_identifier) @font-lock-constant-face)))
   "Tree-sitter font-lock settings.")
 
+(defun ts-mode--fontify-template-string (beg end node)
+  "Fontify template string but not substitution inside it.
+BEG, END, NODE refers to the template_string node."
+  (ignore end)
+  ;; Stolen from `js--fontify-template-string'
+  (let ((child (treesit-node-child node 0)))
+    (while child
+      (if (equal (treesit-node-type child) "template_substitution")
+          (put-text-property beg (treesit-node-start child)
+                             'face 'font-lock-string-face)
+        (put-text-property beg (treesit-node-end child)
+                           'face 'font-lock-string-face))
+      (setq beg (treesit-node-end child)
+            child (treesit-node-next-sibling child)))))
+
 (defvar ts-mode--defun-type-regexp
   (rx (or "class_declaration"
           "method_definition"
@@ -351,9 +329,8 @@ ts-mode
     (setq-local end-of-defun-function #'ts-mode--end-of-defun)
 
     (setq font-lock-keywords-only t)
-    (setq-local treesit-font-lock-settings ts-mode--settings)
-
-    (setq treesit-font-lock-feature-list '((basic)))
+    (setq-local treesit-font-lock-settings ts-mode--font-lock-settings)
+    (setq treesit-font-lock-feature-list '((minimal) (moderate) (full)))
     (treesit-font-lock-enable))
    (t
     (message "Tree-sitter for TypeScript isn't available, falling back to `js-mode'")

commit 85073998cb47567cb30fb41f12135bd799ad2588
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Oct 18 13:24:37 2022 -0700

    Rename tree-sitter group to treesit
    
    * lisp/treesit.el (tree-sitter): Rename to treesit.
    (treesit-mode)
    (global-treesit-mode): Use treesit group.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index cc280f5a5e..aadcc729d4 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -35,12 +35,11 @@
 
 ;;; Activating tree-sitter
 
-;; Per our naming guideline, we use "tree-sitter" when referring to it
-;; as a name and only use "treesit" for prefix.  Since a group name is
-;; not a prefix, we use "tree-sitter" here.
-(defgroup tree-sitter
-  nil
-  "Tree-sitter is an incremental parser."
+;; Tree-sitter always appear as treesit in symbols.
+(defgroup treesit nil
+  "Incremental parser.
+It is used to enhance major mode features like font-lock,
+indent, imenu, etc."
   :group 'tools
   :version "29.1")
 
@@ -76,7 +75,7 @@ treesit-mode
 whether the major mode supports tree-sitter, availability of
 specific tree-sitter language definition, etc."
   :version "29.1"
-  :group 'languages
+  :group 'treesit
   (when major-mode-backend-function
     (funcall major-mode-backend-function
              (if treesit-mode 'treesit 'elisp)
@@ -96,7 +95,8 @@ treesit-remapped-major-mode-alist
 ;;;###autoload
 (define-globalized-minor-mode global-treesit-mode treesit-mode
   global-treesit-mode--turn-on
-  :group 'languages
+  :version "29.1"
+  :group 'treesit
   :predicate t
   (when (not global-treesit-mode)
     (dolist (map treesit-remapped-major-mode-alist)

commit 1ee7c3041ac84b6c6f3f4f5275c417d91727312e
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Oct 18 13:21:55 2022 -0700

    * lisp/treesit.el: Add commentary.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 91ffb1eff1..cc280f5a5e 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -19,8 +19,12 @@
 
 ;;; Commentary:
 ;;
-;; Note to self: we don't create parsers automatically in any provided
-;; functions if we don't know what language to use.
+;; This file is the lisp counterpart of treesit.c, together they
+;; provide tree-sitter integration for Emacs.  This file contains
+;; convenient functions that are more idiomatic and flexible than the
+;; exposed C API of tree-sitter.  It also contains frameworks for
+;; integrating tree-sitter with font-lock, indent, activate/deactivate
+;; tree-sitter, debugging tree-sitter, etc.
 
 ;;; Code:
 

commit 17b65f52921b6a9314a2709f0e5c3ef88b37f2ab
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Oct 18 13:06:25 2022 -0700

    Install new toggle scheme for tree-sitter
    
    Basically we now have treesit-mode and global-treesit-mode.  Major
    modes set major-mode-backend-function which treesit-mode calls to
    activate/deactivate tree-sitter.
    
    js.el needs a bit explanation: I'm so sorry for messing up the
    history, but basically now js-mode and js-json-mode should be exactly
    the same as before any tree-sitter change was introduced, sans some
    initialization code that are moved to js(-json)--backend-toggle.
    js-mode and js-json-mode now just sets major-mode-backend-function and
    initialize with js(-json)--backend-toggle.
    
    * lisp/treesit.el (treesit-mode-inhibit-message): New option.
    (treesit-can-enable-p): Remove function.
    (major-mode-backend-function)
    (treesit-remapped-major-mode-alist): New variables.
    (treesit-mode)
    (global-treesit-mode): New minor modes.
    (global-treesit-mode--turn-on)
    (treesit-ready-p): New functions.
    
    * lisp/progmodes/python.el: Remove option.
    (python--backend-toggle): New function.
    (python-mode): Remove the if-form, all the initialization code are
    moved to python--backend-toggle, python-mode now just sets
    major-mode-backend-function and initialize with
    python--backend-toggle.
    * lisp/progmodes/js.el (js--treesit-can-enable-p)
    (js--json-treesit-can-enable-p)
    (js--treesit-enable)
    (js--json-treesit-enable): Remove functions.
    (js--backend-toggle)
    (js-json--backend-toggle): New function.
    
    * lisp/progmodes/ts-mode.el (ts-mode): Use treesit-ready-p.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 667416852e..51f5b72047 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3639,28 +3639,39 @@ js--treesit-end-of-defun
                    js--treesit-defun-type-regexp 'end))
         (setq arg (1- arg))))))
 
-(defun js--treesit-can-enable-p ()
-  (if (and js-use-tree-sitter
-           (treesit-can-enable-p)
-           (treesit-language-available-p 'javascript))
-      t
-    (message "Cannot enable Tree Sitter for JavaScript.")
-    nil))
+(defun js--backend-toggle (backend warn)
+  "Toggle backend for `js-mode'.
+For BACKEND and WARN see `treesit-mode-function'."
+  (cond
+   ;; Tree-sitter.
+   ((and (eq backend 'treesit) (treesit-ready-p warn 'javascript))
+    (setq-local treesit-simple-indent-rules js--treesit-indent-rules)
+    (setq-local indent-line-function #'treesit-indent)
 
-(defun js--treesit-enable ()
-  (setq-local treesit-simple-indent-rules js--treesit-indent-rules)
-  (setq-local indent-line-function #'treesit-indent)
+    (setq-local beginning-of-defun-function #'js--treesit-beginning-of-defun)
+    (setq-local end-of-defun-function #'js--treesit-end-of-defun)
 
-  (setq-local beginning-of-defun-function #'js--treesit-beginning-of-defun)
-  (setq-local end-of-defun-function #'js--treesit-end-of-defun)
+    (setq-local font-lock-keywords-only t)
+    (setq-local treesit-font-lock-settings js--treesit-settings)
+    (setq-local treesit-font-lock-feature-list '((basic)))
 
-  (setq-local font-lock-keywords-only t)
-  (setq-local treesit-font-lock-settings js--treesit-settings)
-  (setq-local treesit-font-lock-feature-list '((basic)))
+    (add-hook 'which-func-functions #'js-treesit-current-defun nil t)
 
-  (add-hook 'which-func-functions #'js-treesit-current-defun nil t)
+    (treesit-font-lock-enable))
+   ;; Elisp.
+   ((eq backend 'elisp)
+    (setq-local indent-line-function #'js-indent-line)
+    (setq-local beginning-of-defun-function #'js-beginning-of-defun)
+    (setq-local end-of-defun-function #'js-end-of-defun)
 
-  (treesit-font-lock-enable))
+    (setq-local font-lock-defaults
+                (list js--font-lock-keywords nil nil nil nil
+                      '(font-lock-syntactic-face-function
+                        . js-font-lock-syntactic-face-function)))
+
+    ;; Imenu
+    (setq imenu-case-fold-search nil)
+    (setq imenu-create-index-function #'js--imenu-create-index))))
 
 ;;; Main Function
 
@@ -3668,98 +3679,79 @@ js--treesit-enable
 (define-derived-mode js-mode prog-mode "JavaScript"
   "Major mode for editing JavaScript."
   :group 'js
+  ;; Ensure all CC Mode "lang variables" are set to valid values.
+  (c-init-language-vars js-mode)
+  (setq-local open-paren-in-column-0-is-defun-start nil)
+  (setq-local syntax-propertize-function #'js-syntax-propertize)
+  (add-hook 'syntax-propertize-extend-region-functions
+            #'syntax-propertize-multiline 'append 'local)
+  (add-hook 'syntax-propertize-extend-region-functions
+            #'js--syntax-propertize-extend-region 'append 'local)
+  (setq-local prettify-symbols-alist js--prettify-symbols-alist)
+
+  (setq-local parse-sexp-ignore-comments t)
+  (setq-local which-func-imenu-joiner-function #'js--which-func-joiner)
+
   ;; Comments
   (setq-local comment-start "// ")
   (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
   (setq-local comment-end "")
 
-  (if (js--treesit-can-enable-p)
-      (js--treesit-enable)
-    ;; Ensure all CC Mode "lang variables" are set to valid values.
-    (c-init-language-vars js-mode)
-    (setq-local indent-line-function #'js-indent-line)
-    (setq-local beginning-of-defun-function #'js-beginning-of-defun)
-    (setq-local end-of-defun-function #'js-end-of-defun)
-    (setq-local open-paren-in-column-0-is-defun-start nil)
-    (setq-local font-lock-defaults
-                (list js--font-lock-keywords nil nil nil nil
-                      '(font-lock-syntactic-face-function
-                        . js-font-lock-syntactic-face-function)))
-    (setq-local syntax-propertize-function #'js-syntax-propertize)
-    (add-hook 'syntax-propertize-extend-region-functions
-              #'syntax-propertize-multiline 'append 'local)
-    (add-hook 'syntax-propertize-extend-region-functions
-              #'js--syntax-propertize-extend-region 'append 'local)
-    (setq-local prettify-symbols-alist js--prettify-symbols-alist)
-
-    (setq-local parse-sexp-ignore-comments t)
-    (setq-local which-func-imenu-joiner-function #'js--which-func-joiner)
-
-    (setq-local fill-paragraph-function #'js-fill-paragraph)
-    (setq-local normal-auto-fill-function #'js-do-auto-fill)
-
-    ;; Parse cache
-    (add-hook 'before-change-functions #'js--flush-caches t t)
-
-    ;; Frameworks
-    (js--update-quick-match-re)
-
-    ;; Syntax extensions
-    (unless (js-jsx--detect-and-enable)
-      (add-hook 'after-change-functions #'js-jsx--detect-after-change nil t))
-    (js-use-syntactic-mode-name)
-
-    ;; Imenu
-    (setq imenu-case-fold-search nil)
-    (setq imenu-create-index-function #'js--imenu-create-index)
-
-    ;; for filling, pretend we're cc-mode
-    (c-foreign-init-lit-pos-cache)
-    (add-hook 'before-change-functions #'c-foreign-truncate-lit-pos-cache nil t)
-    (setq-local comment-line-break-function #'c-indent-new-comment-line)
-    (setq-local comment-multi-line t)
-    (setq-local electric-indent-chars
-	        (append "{}():;," electric-indent-chars)) ;FIXME: js2-mode adds "[]*".
-    (setq-local electric-layout-rules
-	        '((?\; . after) (?\{ . after) (?\} . before)))
-
-    (let ((c-buffer-is-cc-mode t))
-      ;; FIXME: These are normally set by `c-basic-common-init'.  Should
-      ;; we call it instead?  (Bug#6071)
-      (make-local-variable 'paragraph-start)
-      (make-local-variable 'paragraph-separate)
-      (make-local-variable 'paragraph-ignore-fill-prefix)
-      (make-local-variable 'adaptive-fill-mode)
-      (make-local-variable 'adaptive-fill-regexp)
-      ;; While the full CC Mode style system is not yet in use, set the
-      ;; pertinent style variables manually.
-      (c-initialize-builtin-style)
-      (let ((style (cc-choose-style-for-mode 'js-mode c-default-style)))
-        (c-set-style style))
-      (setq c-block-comment-prefix "* "
-            c-comment-prefix-regexp "//+\\|\\**")
-      (c-setup-paragraph-variables))
-
-    ;; Important to fontify the whole buffer syntactically! If we don't,
-    ;; then we might have regular expression literals that aren't marked
-    ;; as strings, which will screw up parse-partial-sexp, scan-lists,
-    ;; etc. and produce maddening "unbalanced parenthesis" errors.
-    ;; When we attempt to find the error and scroll to the portion of
-    ;; the buffer containing the problem, JIT-lock will apply the
-    ;; correct syntax to the regular expression literal and the problem
-    ;; will mysteriously disappear.
-    ;; FIXME: We should instead do this fontification lazily by adding
-    ;; calls to syntax-propertize wherever it's really needed.
-    ;;(syntax-propertize (point-max))
-    ))
-
-(defcustom js-json-use-tree-sitter nil
-  "If non-nil, `js-json-mode' tries to use tree-sitter.
-Currently `js-json-mode' uses tree-sitter for font-locking and
-indentation."
-  :version "29.1"
-  :type 'boolean
-  :safe 'booleanp)
+  ;; Parse cache
+  (add-hook 'before-change-functions #'js--flush-caches t t)
+
+  ;; Frameworks
+  (js--update-quick-match-re)
+
+  ;; Syntax extensions
+  (unless (js-jsx--detect-and-enable)
+    (add-hook 'after-change-functions #'js-jsx--detect-after-change nil t))
+  (js-use-syntactic-mode-name)
+
+  ;; for filling, pretend we're cc-mode
+  (c-foreign-init-lit-pos-cache)
+  (add-hook 'before-change-functions #'c-foreign-truncate-lit-pos-cache nil t)
+  (setq-local comment-line-break-function #'c-indent-new-comment-line)
+  (setq-local comment-multi-line t)
+  (setq-local electric-indent-chars
+	      (append "{}():;," electric-indent-chars)) ;FIXME: js2-mode adds "[]*".
+  (setq-local electric-layout-rules
+	      '((?\; . after) (?\{ . after) (?\} . before)))
+
+  (setq-local fill-paragraph-function #'js-fill-paragraph)
+  (setq-local normal-auto-fill-function #'js-do-auto-fill)
+
+  (let ((c-buffer-is-cc-mode t))
+    ;; FIXME: These are normally set by `c-basic-common-init'.  Should
+    ;; we call it instead?  (Bug#6071)
+    (make-local-variable 'paragraph-start)
+    (make-local-variable 'paragraph-separate)
+    (make-local-variable 'paragraph-ignore-fill-prefix)
+    (make-local-variable 'adaptive-fill-mode)
+    (make-local-variable 'adaptive-fill-regexp)
+    ;; While the full CC Mode style system is not yet in use, set the
+    ;; pertinent style variables manually.
+    (c-initialize-builtin-style)
+    (let ((style (cc-choose-style-for-mode 'js-mode c-default-style)))
+      (c-set-style style))
+    (setq c-block-comment-prefix "* "
+          c-comment-prefix-regexp "//+\\|\\**")
+    (c-setup-paragraph-variables))
+
+  ;; Important to fontify the whole buffer syntactically! If we don't,
+  ;; then we might have regular expression literals that aren't marked
+  ;; as strings, which will screw up parse-partial-sexp, scan-lists,
+  ;; etc. and produce maddening "unbalanced parenthesis" errors.
+  ;; When we attempt to find the error and scroll to the portion of
+  ;; the buffer containing the problem, JIT-lock will apply the
+  ;; correct syntax to the regular expression literal and the problem
+  ;; will mysteriously disappear.
+  ;; FIXME: We should instead do this fontification lazily by adding
+  ;; calls to syntax-propertize wherever it's really needed.
+  ;; (syntax-propertize (point-max))
+
+  (js--backend-toggle 'elisp nil)
+  (setq-local major-mode-backend-function #'js--backend-toggle))
 
 (defvar js--json-treesit-settings
   (treesit-font-lock-rules
@@ -3791,37 +3783,29 @@ js--json-treesit-indent-rules
      ((parent-is "object") parent-bol ,js-indent-level)
      )))
 
-
-(defun js--json-treesit-can-enable-p ()
-  (if (and js-json-use-tree-sitter
-           (treesit-can-enable-p)
-           (treesit-language-available-p 'json))
-      t
-    (error "Cannot enable Tree Sitter for JSON.")
-    nil))
-
-
-(defun js--json-treesit-enable ()
-  (setq-local treesit-simple-indent-rules js--json-treesit-indent-rules)
-  (setq-local indent-line-function #'treesit-indent)
-
-  (setq-local beginning-of-defun-function #'ignore)
-  (setq-local end-of-defun-function #'ignore)
-
-  (setq-local font-lock-defaults '(nil t))
-  (setq-local treesit-font-lock-settings js--json-treesit-settings)
-
-  (treesit-font-lock-enable))
-
+(defun js--json-backend-toggle (backend warn)
+  "Toggle backend for `json-mode'.
+For BACKEND and WARN see `treesit-mode-function'."
+  (cond
+   ;; Tree-sitter.
+   ((and (eq backend 'treesit) (treesit-ready-p warn 'json))
+    (setq-local treesit-simple-indent-rules js--json-treesit-indent-rules)
+    (setq-local indent-line-function #'treesit-indent)
+
+    (setq-local font-lock-keywords-only t)
+    (setq-local treesit-font-lock-settings js--json-treesit-settings)
+    (treesit-font-lock-enable))
+   ;; Elisp.
+   ((eq backend 'elisp)
+    (js--backend-toggle 'elisp nil))))
 
 ;;;###autoload
 (define-derived-mode js-json-mode js-mode "JSON"
-  (if (js--json-treesit-can-enable-p)
-      (js--json-treesit-enable)
-    (setq-local js-enabled-frameworks nil)
-    ;; Speed up `syntax-ppss': JSON files can be big but can't hold
-    ;; regexp matchers nor #! thingies (and `js-enabled-frameworks' is nil).
-    (setq-local syntax-propertize-function #'ignore)))
+  (setq-local js-enabled-frameworks nil)
+  ;; Speed up `syntax-ppss': JSON files can be big but can't hold
+  ;; regexp matchers nor #! thingies (and `js-enabled-frameworks' is nil).
+  (setq-local syntax-propertize-function #'ignore)
+  (setq-local major-mode-backend-function #'js--json-backend-toggle))
 
 ;; Since we made JSX support available and automatically-enabled in
 ;; the base `js-mode' (for ease of use), now `js-jsx-mode' simply
@@ -3848,11 +3832,9 @@ js-jsx-mode
 `js-jsx-enable' in `js-mode-hook'.  You may be better served by
 one of the aforementioned options instead of using this mode."
   :group 'js
-  (if (js--treesit-can-enable-p)
-      (js--treesit-enable)
-    (js-jsx-enable)
-    (setq-local comment-region-function #'js-jsx--comment-region)
-    (js-use-syntactic-mode-name)))
+  (js-jsx-enable)
+  (setq-local comment-region-function #'js-jsx--comment-region)
+  (js-use-syntactic-mode-name))
 
 (defun js-jsx--comment-region (beg end &optional arg)
   (if (or (js-jsx--context)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index c48f9e95e9..374bc02a78 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -286,13 +286,6 @@ python
   :version "24.3"
   :link '(emacs-commentary-link "python"))
 
-(defcustom python-use-tree-sitter nil
-  "If non-nil, `python-mode' tries to use tree-sitter.
-Currently `python-mode' uses tree-sitter for font-locking, imenu,
-and movement functions."
-  :type 'boolean
-  :version "29.1")
-
 (defcustom python-interpreter "python"
   "Python interpreter for noninteractive use.
 To customize the Python shell, modify `python-shell-interpreter'
@@ -6382,6 +6375,32 @@ python-electric-pair-string-delimiter
 (defvar electric-indent-inhibit)
 (defvar prettify-symbols-alist)
 
+(defun python--backend-toggle (backend warn)
+  "Toggle backend for `python-mode'.
+BACKEND and WARN are explained in `treesit-mode-function'."
+  (if (and (eq backend 'treesit) (treesit-ready-p warn 'python))
+      (progn
+        (setq-local font-lock-keywords-only t)
+        (setq-local treesit-font-lock-feature-list
+                    '((basic) (moderate) (elaborate)))
+        (setq-local treesit-font-lock-settings
+                    python--treesit-settings)
+        (treesit-font-lock-enable)
+        (setq-local imenu-create-index-function
+                    #'python-imenu-treesit-create-index)
+        (add-hook 'which-func-functions
+                  #'python-info-treesit-current-defun nil t))
+    (setq-local font-lock-defaults
+                `(,python-font-lock-keywords
+                  nil nil nil nil
+                  (font-lock-syntactic-face-function
+                   . python-font-lock-syntactic-face-function)
+                  (font-lock-extend-after-change-region-function
+                   . python-font-lock-extend-region)))
+    (setq-local imenu-create-index-function
+                #'python-imenu-create-index)
+    (add-hook 'which-func-functions #'python-info-current-defun nil t)))
+
 ;;;###autoload
 (define-derived-mode python-mode prog-mode "Python"
   "Major mode for editing Python files.
@@ -6398,22 +6417,9 @@ python-mode
 
   (setq-local forward-sexp-function python-forward-sexp-function)
 
-  (if (and python-use-tree-sitter
-           (treesit-can-enable-p))
-      (progn
-        (setq-local font-lock-keywords-only t)
-        (setq-local treesit-font-lock-feature-list
-                    '((basic) (moderate) (elaborate)))
-        (setq-local treesit-font-lock-settings
-                    python--treesit-settings)
-        (treesit-font-lock-enable))
-    (setq-local font-lock-defaults
-              `(,python-font-lock-keywords
-                nil nil nil nil
-                (font-lock-syntactic-face-function
-                 . python-font-lock-syntactic-face-function)
-                (font-lock-extend-after-change-region-function
-                 . python-font-lock-extend-region))))
+  (python--backend-toggle 'elisp nil)
+
+  (setq-local major-mode-backend-function #'python--backend-toggle)
 
   (setq-local syntax-propertize-function
               python-syntax-propertize-function)
@@ -6442,22 +6448,9 @@ python-mode
   (add-hook 'post-self-insert-hook
             #'python-indent-post-self-insert-function 'append 'local)
 
-  (if (and python-use-tree-sitter
-           (treesit-can-enable-p))
-      (setq-local imenu-create-index-function
-                  #'python-imenu-treesit-create-index)
-    (setq-local imenu-create-index-function
-                #'python-imenu-create-index))
-
   (setq-local add-log-current-defun-function
               #'python-info-current-defun)
 
-  (if (and python-use-tree-sitter
-           (treesit-can-enable-p))
-      (add-hook 'which-func-functions
-                #'python-info-treesit-current-defun nil t)
-    (add-hook 'which-func-functions #'python-info-current-defun nil t))
-
   (setq-local skeleton-further-elements
               '((abbrev-mode nil)
                 (< '(backward-delete-char-untabify (min python-indent-offset
diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el
index 6e4aeebde8..dffe9fcfcf 100644
--- a/lisp/progmodes/ts-mode.el
+++ b/lisp/progmodes/ts-mode.el
@@ -338,8 +338,7 @@ ts-mode
   :syntax-table ts-mode--syntax-table
 
   (cond
-   ((and (treesit-can-enable-p)
-         (treesit-language-available-p 'tsx))
+   ((treesit-ready-p nil 'tsx)
     ;; Comments
     (setq-local comment-start "// ")
     (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
@@ -351,15 +350,13 @@ ts-mode
     (setq-local beginning-of-defun-function #'ts-mode--beginning-of-defun)
     (setq-local end-of-defun-function #'ts-mode--end-of-defun)
 
-    (unless font-lock-defaults
-      (setq font-lock-defaults '(nil t)))
-
+    (setq font-lock-keywords-only t)
     (setq-local treesit-font-lock-settings ts-mode--settings)
 
     (setq treesit-font-lock-feature-list '((basic)))
     (treesit-font-lock-enable))
    (t
-    (message "Tree sitter for TypeScript isn't available, defaulting to js-mode")
+    (message "Tree-sitter for TypeScript isn't available, falling back to `js-mode'")
     (js-mode))))
 
 (provide 'ts-mode)
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 86da9e1586..91ffb1eff1 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -45,14 +45,103 @@ treesit-max-buffer-size
   :type 'integer
   :version "29.1")
 
+(defcustom treesit-mode-inhibit-message nil
+  "If non-nil, don't print message when tree-sitter can't activate."
+  :type 'boolean
+  :version "29.1")
+
 (declare-function treesit-available-p "treesit.c")
 
-(defun treesit-can-enable-p ()
-  "Return non-nil if current buffer can activate tree-sitter.
-Currently this function checks whether tree-sitter is available
-and the buffer size."
-  (and (treesit-available-p)
-       (< (buffer-size) treesit-max-buffer-size)))
+(defvar-local major-mode-backend-function nil
+  "A function that toggles the \"backend\" for a major mode.
+
+The function is passed two argument BACKEND and WARN.  BACKEND is
+a symbol representing the backend we want to activate.  Currently
+it can be `treesit' or `elisp'.
+
+If WARN is non-nil, display a warning if tree-sitter can't
+activate, if WARN is nil, just print an message and don't display
+warning.")
+
+;;;###autoload
+(define-minor-mode treesit-mode
+  "Activate tree-sitter to power major-mode features.
+
+This mode is merely a SUGGESTION of turning on tree-sitter,
+actual activation of tree-sitter functionalities depends on
+whether the major mode supports tree-sitter, availability of
+specific tree-sitter language definition, etc."
+  :version "29.1"
+  :group 'languages
+  (when major-mode-backend-function
+    (funcall major-mode-backend-function
+             (if treesit-mode 'treesit 'elisp)
+             (eq this-command 'treesit-mode))))
+
+(defvar treesit-remapped-major-mode-alist nil
+  "A list like `major-mode-remap-alist'.
+
+When major modes activate tree-sitter by switching to another
+major mode and `global-treesit-mode' is on, they add an
+entry (MODE . NEW-MODE) to `major-mode-remap-alist', so next time
+Emacs uses NEW-MODE directly.
+
+These remaps should be removed when `global-treesit-mode' is
+turned off, so we record each (MODE . NEW-MODE) in this variable.")
+
+;;;###autoload
+(define-globalized-minor-mode global-treesit-mode treesit-mode
+  global-treesit-mode--turn-on
+  :group 'languages
+  :predicate t
+  (when (not global-treesit-mode)
+    (dolist (map treesit-remapped-major-mode-alist)
+      (setq major-mode-remap-alist
+            (remove map major-mode-remap-alist)))))
+
+(defun global-treesit-mode--turn-on ()
+  "Function used to determine whether to turn on `treesit-mode'.
+Called in every buffer if `global-treesit-mode' is on."
+  (treesit-mode))
+
+(defun treesit-ready-p (warn &rest languages)
+  "Check that tree-sitter is ready to be used.
+
+If tree-sitter is not ready and WARN is nil-nil, emit a warning;
+if WARN is nil, print a message.  But if
+`treesit-mode-inhibit-message' is non-nil, don't even print the
+message.
+
+LANGUAGES are languages we want check for availability."
+  (let (msg)
+    ;; Check for each condition and set MSG.
+    (catch 'term
+      (when (not (treesit-available-p))
+        (setq msg "tree-sitter library is not built with Emacs")
+        (throw 'term nil))
+      (when (> (buffer-size) treesit-max-buffer-size)
+        (setq msg "buffer larger than `treesit-max-buffer-size'")
+        (throw 'term nil))
+      (dolist (lang languages)
+        (pcase-let ((`(,available . ,err)
+                     (treesit-language-available-p lang t)))
+          (when (not available)
+            (setq msg (format "language definition for %s is unavailable (%s): %s"
+                              lang (nth 0 err)
+                              (string-join
+                               (mapcar (lambda (x) (format "%s" x))
+                                       (cdr err))
+                               " ")))
+            (throw 'term nil)))))
+    ;; Decide if all conditions met and whether emit a warning.
+    (if (not msg)
+        t
+      (setq msg (concat "Cannot activate tree-sitter, because " msg))
+      (if warn
+          (display-warning 'treesit msg)
+        (unless treesit-mode-inhibit-message
+          (message "%s" msg)))
+      nil)))
 
 ;;; Parser API supplement
 

commit 851a8f65e9a6b00b51f6a41f4c8f2ec2a797862b
Author: Daniel Martín <mardani29@yahoo.es>
Date:   Tue Oct 18 01:00:13 2022 +0200

    ; Fix typos in treesit.c
    
    * src/treesit.c: Fix a couple of typos.  (Bug#58600)

diff --git a/src/treesit.c b/src/treesit.c
index b0b20e8b25..990a029ed1 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -469,7 +469,7 @@ treesit_find_override_name (Lisp_Object language_symbol, Lisp_Object *name,
 
 /* For example, if Vdynamic_library_suffixes is (".so", ".dylib"),
    this function pushes "lib_base_name.so" and "lib_base_name.dylib"
-   into *path_candidates.  Obiviously path_candidates should be a Lisp
+   into *path_candidates.  Obviously path_candidates should be a Lisp
    list of Lisp strings.  */
 static void
 treesit_load_language_push_for_each_suffix (Lisp_Object lib_base_name,
@@ -2771,7 +2771,7 @@ syms_of_treesit (void)
 	       /* Additional directories to look for tree-sitter language definitions.
 The value should be a list of directories.
 When trying to load a tree-sitter language definition,
-Emacs first looks in the directories mentioned in in this variable,
+Emacs first looks in the directories mentioned in this variable,
 then in the `tree-sitter' subdirectory of `user-emacs-directory', and
 then in the system default locations for dynamic libraries, in that order.  */);
   Vtreesit_extra_load_path = Qnil;

commit c4122067d90857594508f6c00e8af87d91ddb7d4
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Oct 17 17:31:23 2022 -0700

    Change free to xfree in treesit.el
    
    This should be in the last commit but I forgot.
    
    * src/treesit.c (Ftreesit_parser_set_included_ranges): Change free to
    xfree.

diff --git a/src/treesit.c b/src/treesit.c
index 5994f6c263..b0b20e8b25 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1361,7 +1361,7 @@ DEFUN ("treesit-parser-set-included-ranges",
       /* Although XFIXNUM could signal, it should be impossible
 	 because we have checked the input by treesit_check_range_argument.
 	 So there is no need for unwind-protect.  */
-      free (treesit_ranges);
+      xfree (treesit_ranges);
     }
 
   if (!success)

commit ddae8d4a13d58720a3118355fabc225a9d907160
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Oct 17 17:13:25 2022 -0700

    Change malloc to xmalloc in treesit.c
    
    * src/treesit.c (Ftreesit_parser_set_included_ranges): Change malloc
    to xmalloc.

diff --git a/src/treesit.c b/src/treesit.c
index 60280e0289..5994f6c263 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1335,8 +1335,7 @@ DEFUN ("treesit-parser-set-included-ranges",
       if (list_length (ranges) > UINT32_MAX)
 	xsignal (Qargs_out_of_range, list2 (ranges, Flength (ranges)));
       uint32_t len = (uint32_t) list_length (ranges);
-      /* FIXME: We should test the return value of malloc below.  */
-      TSRange *treesit_ranges = malloc (sizeof(TSRange) * len);
+      TSRange *treesit_ranges = xmalloc (sizeof(TSRange) * len);
       struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
 
       for (int idx = 0; !NILP (ranges); idx++, ranges = XCDR (ranges))

commit 954b6e1dc3edb6a8260be810c3f02c335e90b6b8
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Oct 17 17:04:49 2022 -0700

    Fix casts to uint32_t in treesit.c
    
    * src/treesit.c (treesit_tree_edit_1): Add assertion.
    (treesit_ensure_position_synced): Add assertion.
    (treesit_check_buffer_size): Change error message.
    (treesit_ensure_parsed): Move treesit_check_buffer_size and
    treesit_ensure_position_synced together
    (treesit_read_buffer): Add assertion.
    (Ftreesit_parser_set_included_ranges): Add assertion.  Signal error if
    list too long.  Add check for buffer size.
    (Ftreesit_parser_included_ranges): Add check for buffer size.
    (Ftreesit_query_capture): Add assertion.

diff --git a/src/treesit.c b/src/treesit.c
index 036411865d..60280e0289 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -346,6 +346,10 @@ #define ts_tree_root_node fn_ts_tree_root_node
 
    Regarding signals: only raise signals in lisp functions.
 
+   Casts from EMACS_INT and ptrdiff_t to uint32_t: We install checks
+   for buffer size and range and thus able to assume these casts never
+   overflow.
+
    We don't parse at every keystroke.  Instead we only record the
    changes at each keystroke, and only parse when requested.  It is
    possible that lazy parsing is worse: instead of dispersed little
@@ -643,7 +647,8 @@ treesit_check_parser (Lisp_Object obj)
 }
 
 /* An auxiliary function that saves a few lines of code.  Assumes TREE
-   is not NULL.  */
+   is not NULL.  START_BYTE, OLD_END_BYTE, NEW_END_BYTE must not be
+   larger than UINT32_MAX.  */
 static inline void
 treesit_tree_edit_1 (TSTree *tree, ptrdiff_t start_byte,
 		     ptrdiff_t old_end_byte, ptrdiff_t new_end_byte)
@@ -652,8 +657,9 @@ treesit_tree_edit_1 (TSTree *tree, ptrdiff_t start_byte,
   eassert (start_byte <= old_end_byte);
   eassert (start_byte <= new_end_byte);
   TSPoint dummy_point = {0, 0};
-  /* FIXME: We should signal an error below if START_BYTE
-     etc. overflow the 32-bit unsigned data type.  */
+  eassert (start_byte <= UINT32_MAX);
+  eassert (old_end_byte <= UINT32_MAX);
+  eassert (new_end_byte <= UINT32_MAX);
   TSInputEdit edit = {(uint32_t) start_byte,
 		      (uint32_t) old_end_byte,
 		      (uint32_t) new_end_byte,
@@ -737,6 +743,11 @@ treesit_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
     }
 }
 
+/* Make sure PARSER's visible_beg and visible_end are in sync with
+   BUF_BEGV_BYTE and BUG_ZV_BYTE.  When calling this function you must
+   make sure the current buffer's size is not larger than UINT32_MAX.
+   Basically always call treesit_check_buffer_size before this
+   function.  */
 static void
 treesit_ensure_position_synced (Lisp_Object parser)
 {
@@ -751,6 +762,9 @@ treesit_ensure_position_synced (Lisp_Object parser)
   eassert (0 <= visible_beg);
   eassert (visible_beg <= visible_end);
 
+  eassert (BUF_BEGV_BYTE (buffer) <= UINT32_MAX);
+  eassert (BUF_ZV_BYTE (buffer) <= UINT32_MAX);
+
   /* Before we parse or set ranges, catch up with the narrowing
      situation.  We change visible_beg and visible_end to match
      BUF_BEGV_BYTE and BUF_ZV_BYTE, and inform tree-sitter of the
@@ -807,7 +821,7 @@ treesit_check_buffer_size (struct buffer *buffer)
   ptrdiff_t buffer_size = (BUF_Z (buffer) - BUF_BEG (buffer));
   if (buffer_size > UINT32_MAX)
     xsignal2 (Qtreesit_buffer_too_large,
-	      build_pure_c_string ("Buffer size larger than 4GB, size:"),
+	      build_pure_c_string ("Buffer size cannot be larger than 4GB"),
 	      make_fixnum (buffer_size));
 }
 
@@ -822,9 +836,9 @@ treesit_ensure_parsed (Lisp_Object parser)
   TSTree *tree = XTS_PARSER (parser)->tree;
   TSInput input = XTS_PARSER (parser)->input;
   struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
-  treesit_check_buffer_size (buffer);
 
   /* Before we parse, catch up with the narrowing situation.  */
+  treesit_check_buffer_size (buffer);
   treesit_ensure_position_synced (parser);
 
   TSTree *new_tree = ts_parser_parse (treesit_parser, tree, input);
@@ -892,6 +906,9 @@ treesit_read_buffer (void *parser, uint32_t byte_index,
       beg = (char *) BUF_BYTE_ADDRESS (buffer, byte_pos);
       len = BYTES_BY_CHAR_HEAD ((int) *beg);
     }
+  /* We never let tree-sitter to parse buffers that large so this
+     assertion should never hit.  */
+  eassert (len < UINT32_MAX);
   *bytes_read = (uint32_t) len;
   return beg;
 }
@@ -1298,6 +1315,7 @@ DEFUN ("treesit-parser-set-included-ranges",
 
   treesit_initialize ();
   /* Before we parse, catch up with narrowing/widening.  */
+  treesit_check_buffer_size (XBUFFER (XTS_PARSER (parser)->buffer));
   treesit_ensure_position_synced (parser);
 
   bool success;
@@ -1313,7 +1331,10 @@ DEFUN ("treesit-parser-set-included-ranges",
   else
     {
       /* Set ranges for PARSER.  */
-      ptrdiff_t len = list_length (ranges);
+
+      if (list_length (ranges) > UINT32_MAX)
+	xsignal (Qargs_out_of_range, list2 (ranges, Flength (ranges)));
+      uint32_t len = (uint32_t) list_length (ranges);
       /* FIXME: We should test the return value of malloc below.  */
       TSRange *treesit_ranges = malloc (sizeof(TSRange) * len);
       struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
@@ -1325,6 +1346,10 @@ DEFUN ("treesit-parser-set-included-ranges",
 						       XFIXNUM (XCAR (range)));
 	  EMACS_INT end_byte = buf_charpos_to_bytepos (buffer,
 						       XFIXNUM (XCDR (range)));
+	  /* Shouldn't violate assertion since we just checked for
+	     buffer size at the beginning of this function.  */
+	  eassert (beg_byte - BUF_BEGV_BYTE (buffer) <= UINT32_MAX);
+	  eassert (end_byte - BUF_BEGV_BYTE (buffer) <= UINT32_MAX);
 	  /* We don't care about start and end points, put in dummy
 	     values.  */
 	  TSRange rg = {{0,0}, {0,0},
@@ -1332,10 +1357,8 @@ DEFUN ("treesit-parser-set-included-ranges",
 			(uint32_t) end_byte - BUF_BEGV_BYTE (buffer)};
 	  treesit_ranges[idx] = rg;
 	}
-      /* FIXME: 'len' below is ptrdiff_t, so can overflow a 32-bit
-	 unsigned data type.  */
       success = ts_parser_set_included_ranges (XTS_PARSER (parser)->parser,
-					       treesit_ranges, (uint32_t) len);
+					       treesit_ranges, len);
       /* Although XFIXNUM could signal, it should be impossible
 	 because we have checked the input by treesit_check_range_argument.
 	 So there is no need for unwind-protect.  */
@@ -1370,6 +1393,7 @@ DEFUN ("treesit-parser-included-ranges",
 
   /* Our return value depends on the buffer state (BUF_BEGV_BYTE,
      etc), so we need to sync up.  */
+  treesit_check_buffer_size (XBUFFER (XTS_PARSER (parser)->buffer));
   treesit_ensure_position_synced (parser);
 
   struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
@@ -2225,7 +2249,10 @@ DEFUN ("treesit-query-capture",
     {
       EMACS_INT beg_byte = XFIXNUM (beg);
       EMACS_INT end_byte = XFIXNUM (end);
-      /* FIXME: EMACS_INT values could overflow uint32_t.  */
+      /* We never let tree-sitter run on buffers too large, so these
+	 assertion should never hit. */
+      eassert (beg_byte - visible_beg <= UINT32_MAX);
+      eassert (end_byte - visible_beg <= UINT32_MAX);
       ts_query_cursor_set_byte_range (cursor, (uint32_t) beg_byte - visible_beg,
 				      (uint32_t) end_byte - visible_beg);
     }

commit e8df6c311fcf59bf23d31b9db2bb8fec9d78fbe7
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Oct 17 14:12:24 2022 -0700

    Simplify error reported by loading tree-sitter language definition
    
    Before:
    
    Error: Cannot load language definition:
    "javascript",
    ("/home/jostein/.emacs.d/tree-sitter/libtree-sitter-javascript:
    cannot open shared object file: No such file or directory"
    "/home/jostein/.emacs.d/tree-sitter/libtree-sitter-javascript.so:
    cannot open shared object file: No such file or directory"
    "libtree-sitter-javascript: cannot open shared object file: No such
    file or directory" "libtree-sitter-javascript.so: cannot open shared
    object file: No such file or directory")
    
    After:
    
    (treesit-load-language-error
    not-found
    ("libtree-sitter-z.so" "libtree-sitter-z.dylib")
    "No such file or directory")
    
    * src/treesit.c (treesit_load_language): Add base_candidates, remove
    error_list, report base_candidates rather than error_list.

diff --git a/src/treesit.c b/src/treesit.c
index 90a1249ba8..036411865d 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -512,6 +512,8 @@ treesit_load_language (Lisp_Object language_symbol,
   /* First push just the filenames to the candidate list, which will
      make dynlib_open look under standard system load paths.  */
   treesit_load_language_push_for_each_suffix (lib_base_name, &path_candidates);
+  /* This is used for reporting errors (i.e., just filenames).  */
+  Lisp_Object base_candidates = path_candidates;
   /* Then push ~/.emacs.d/tree-sitter paths.  */
   Lisp_Object lib_name =
     Fexpand_file_name (concat2 (build_string ("tree-sitter/"), lib_base_name),
@@ -531,7 +533,6 @@ treesit_load_language (Lisp_Object language_symbol,
      fail.  */
   dynlib_handle_ptr handle;
   char const *error;
-  Lisp_Object error_list = Qnil;
   for (Lisp_Object tail = path_candidates;
        !NILP (tail); tail = XCDR (tail))
     {
@@ -541,13 +542,12 @@ treesit_load_language (Lisp_Object language_symbol,
       error = dynlib_error ();
       if (error == NULL)
 	break;
-      else
-	error_list = Fcons (build_string (error), error_list);
     }
   if (error != NULL)
     {
       *signal_symbol = Qtreesit_load_language_error;
-      *signal_data = Fcons (Qnot_found, Fnreverse (error_list));
+      *signal_data = list3 (Qnot_found, base_candidates,
+			    build_string ("No such file or directory"));
       return NULL;
     }
 

commit 0be9a639fca70c278d1b79fcea5d6beebdf7799c
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Oct 17 14:00:12 2022 -0700

    Skip tree-sitter tests unless language definition is available
    
    * test/src/treesit-tests.el (treesit-basic-parsing)
    (treesit-node-api)
    (treesit-query-api)
    (treesit-narrow)
    (treesit-cross-boundary)
    (treesit-multi-lang)
    (treesit-node-supplemental): Add skip-unless form.

diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index 6fa891a136..adc17bc079 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -24,6 +24,7 @@
 
 (ert-deftest treesit-basic-parsing ()
   "Test basic parsing routines."
+  (skip-unless (treesit-language-available-p 'json))
   (with-temp-buffer
     (let ((parser (treesit-parser-create 'json)))
       (should
@@ -50,6 +51,7 @@ treesit-basic-parsing
 
 (ert-deftest treesit-node-api ()
   "Tests for node API."
+  (skip-unless (treesit-language-available-p 'json))
   (with-temp-buffer
     (let (parser root-node doc-node object-node pair-node)
       (progn
@@ -123,6 +125,7 @@ treesit-node-api
 
 (ert-deftest treesit-query-api ()
   "Tests for query API."
+  (skip-unless (treesit-language-available-p 'json))
   (with-temp-buffer
     (let (parser root-node pattern doc-node object-node pair-node)
       (progn
@@ -173,6 +176,7 @@ treesit-query-api
 
 (ert-deftest treesit-narrow ()
   "Tests if narrowing works."
+  (skip-unless (treesit-language-available-p 'json))
   (with-temp-buffer
     (let (parser root-node pattern doc-node object-node pair-node)
       (progn
@@ -230,6 +234,7 @@ treesit-cross-boundary
 edits like this don't produce assertion errors.  (I inserted a
 bunch of assertions that checks e.g. visible_beg <=
 visible_end.)"
+  (skip-unless (treesit-language-available-p 'json))
   (with-temp-buffer
     (let (parser root-node pattern doc-node object-node pair-node)
       (progn
@@ -308,6 +313,7 @@ treesit-cross-boundary
 
 (ert-deftest treesit-range ()
   "Tests if range works."
+  (skip-unless (treesit-language-available-p 'json))
   (with-temp-buffer
     (let (parser root-node pattern doc-node object-node pair-node)
       (progn
@@ -332,6 +338,9 @@ treesit-range
 
 (ert-deftest treesit-multi-lang ()
   "Tests if parsing multiple language works."
+  (skip-unless (and (treesit-language-available-p 'html)
+                    (treesit-language-available-p 'css)
+                    (treesit-language-available-p 'javascript)))
   (with-temp-buffer
     (let (html css js html-range css-range js-range)
       (progn
@@ -365,6 +374,7 @@ treesit-multi-lang
 
 (ert-deftest treesit-parser-supplemental ()
   "Supplemental node functions."
+  (skip-unless (treesit-language-available-p 'json))
   ;; `treesit-parse-string'.
   (should (equal (treesit-node-string
                   (treesit-parse-string
@@ -390,6 +400,7 @@ treesit-parser-supplemental
 
 (ert-deftest treesit-node-supplemental ()
   "Supplemental node functions."
+  (skip-unless (treesit-language-available-p 'json))
   (let (parser root-node doc-node array-node)
     (progn
       (insert "[1,2,{\"name\": \"Bob\"},3]")

commit 1cd42bfb8a5ff2aade43f31b864a8d2cd643d5a3
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Oct 17 13:43:06 2022 -0700

    Fix memory leak in ts_load_language
    
    * src/treesit.c (ts_load_language): Move initialization of c_name down
    and free it right after use.

diff --git a/src/treesit.c b/src/treesit.c
index 8417b3bb1c..90a1249ba8 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -497,9 +497,6 @@ treesit_load_language (Lisp_Object language_symbol,
     concat2 (build_pure_c_string ("libtree-sitter-"), symbol_name);
   Lisp_Object base_name =
     concat2 (build_pure_c_string ("tree-sitter-"), symbol_name);
-  /* FIXME: The result of strdup leaks memory in some cases.  */
-  char *c_name = strdup (SSDATA (base_name));
-  treesit_symbol_to_c_name (c_name);
 
   /* Override the library name and C name, if appropriate.  */
   Lisp_Object override_name;
@@ -508,10 +505,7 @@ treesit_load_language (Lisp_Object language_symbol,
 						    &override_name,
 						    &override_c_name);
   if (found_override)
-    {
       lib_base_name = override_name;
-      c_name = SSDATA (override_c_name);
-    }
 
   /* Now we generate a list of possible library paths.  */
   Lisp_Object path_candidates = Qnil;
@@ -560,7 +554,12 @@ treesit_load_language (Lisp_Object language_symbol,
   /* Load TSLanguage.  */
   dynlib_error ();
   TSLanguage *(*langfn) (void);
+  char *c_name = strdup (SSDATA (base_name));
+  treesit_symbol_to_c_name (c_name);
+  if (found_override)
+    c_name = SSDATA (override_c_name);
   langfn = dynlib_sym (handle, c_name);
+  free(c_name);
   error = dynlib_error ();
   if (error != NULL)
     {

commit 5a2c1a743b54f7d3355f9b1dc893bbe72e8df6bc
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Mon Oct 17 20:39:23 2022 +0300

    Make sure the treesit path variables are lists
    
    * src/treesit.c: (treesit_load_language)
    (treesit_find_override_name): Make sure the lists we use are
    really lists.

diff --git a/src/treesit.c b/src/treesit.c
index a2da44b4a7..8417b3bb1c 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -445,6 +445,7 @@ treesit_symbol_to_c_name (char *symbol_name)
 treesit_find_override_name (Lisp_Object language_symbol, Lisp_Object *name,
 			    Lisp_Object *c_symbol)
 {
+  CHECK_LIST (Vtreesit_load_name_override_list);
   for (Lisp_Object list = Vtreesit_load_name_override_list;
        !NILP (list); list = XCDR (list))
     {
@@ -489,6 +490,8 @@ treesit_load_language (Lisp_Object language_symbol,
 {
   Lisp_Object symbol_name = Fsymbol_name (language_symbol);
 
+  CHECK_LIST (Vtreesit_extra_load_path);
+
   /* Figure out the library name and C name.  */
   Lisp_Object lib_base_name =
     concat2 (build_pure_c_string ("libtree-sitter-"), symbol_name);

commit 02f78c09b0a97ba044a43682a366a9d7732b885d
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Mon Oct 17 13:11:13 2022 +0300

    ; Rename ts_* symbols in treesit.c
    
    * src/treesit.c: Rename all ts_* functions and variables to
    treesit_*; all references changed.  Fix whitespace.

diff --git a/src/alloc.c b/src/alloc.c
index 7197c183be..4b6f9b57b3 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3171,9 +3171,9 @@ cleanup_vector (struct Lisp_Vector *vector)
     }
 #ifdef HAVE_TREE_SITTER
   else if (PSEUDOVECTOR_TYPEP (&vector->header, PVEC_TS_PARSER))
-    ts_delete_parser (PSEUDOVEC_STRUCT (vector, Lisp_TS_Parser));
+    treesit_delete_parser (PSEUDOVEC_STRUCT (vector, Lisp_TS_Parser));
   else if (PSEUDOVECTOR_TYPEP (&vector->header, PVEC_TS_COMPILED_QUERY))
-    ts_delete_query (PSEUDOVEC_STRUCT (vector, Lisp_TS_Query));
+    treesit_delete_query (PSEUDOVEC_STRUCT (vector, Lisp_TS_Query));
 #endif
 #ifdef HAVE_MODULES
   else if (PSEUDOVECTOR_TYPEP (&vector->header, PVEC_MODULE_FUNCTION))
diff --git a/src/casefiddle.c b/src/casefiddle.c
index 3022c5cc7d..de2325ebf3 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -558,7 +558,7 @@ casify_region (enum case_action flag, Lisp_Object b, Lisp_Object e)
       signal_after_change (start, end - start - added, end - start);
       update_compositions (start, end, CHECK_ALL);
 #ifdef HAVE_TREE_SITTER
-      ts_record_change (start_byte, old_end_byte, CHAR_TO_BYTE (end));
+      treesit_record_change (start_byte, old_end_byte, CHAR_TO_BYTE (end));
 #endif
     }
 
diff --git a/src/insdel.c b/src/insdel.c
index 7cbc88e51d..b9fba4cd74 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -947,7 +947,7 @@ insert_1_both (const char *string,
 #ifdef HAVE_TREE_SITTER
   eassert (nbytes >= 0);
   eassert (PT_BYTE >= 0);
-  ts_record_change (PT_BYTE, PT_BYTE, PT_BYTE + nbytes);
+  treesit_record_change (PT_BYTE, PT_BYTE, PT_BYTE + nbytes);
 #endif
 
   adjust_point (nchars, nbytes);
@@ -1084,7 +1084,7 @@ insert_from_string_1 (Lisp_Object string, ptrdiff_t pos, ptrdiff_t pos_byte,
 #ifdef HAVE_TREE_SITTER
   eassert (nbytes >= 0);
   eassert (PT_BYTE >= 0);
-  ts_record_change (PT_BYTE, PT_BYTE, PT_BYTE + nbytes);
+  treesit_record_change (PT_BYTE, PT_BYTE, PT_BYTE + nbytes);
 #endif
 
   adjust_point (nchars, outgoing_nbytes);
@@ -1157,7 +1157,7 @@ insert_from_gap (ptrdiff_t nchars, ptrdiff_t nbytes, bool text_at_gap_tail)
 #ifdef HAVE_TREE_SITTER
   eassert (nbytes >= 0);
   eassert (ins_bytepos >= 0);
-  ts_record_change (ins_bytepos, ins_bytepos, ins_bytepos + nbytes);
+  treesit_record_change (ins_bytepos, ins_bytepos, ins_bytepos + nbytes);
 #endif
 
   if (ins_charpos < PT)
@@ -1313,7 +1313,7 @@ insert_from_buffer_1 (struct buffer *buf,
 #ifdef HAVE_TREE_SITTER
   eassert (outgoing_nbytes >= 0);
   eassert (PT_BYTE >= 0);
-  ts_record_change (PT_BYTE, PT_BYTE, PT_BYTE + outgoing_nbytes);
+  treesit_record_change (PT_BYTE, PT_BYTE, PT_BYTE + outgoing_nbytes);
 #endif
 
   adjust_point (nchars, outgoing_nbytes);
@@ -1568,7 +1568,7 @@ replace_range (ptrdiff_t from, ptrdiff_t to, Lisp_Object new,
   eassert (to_byte >= from_byte);
   eassert (outgoing_insbytes >= 0);
   eassert (from_byte >= 0);
-  ts_record_change (from_byte, to_byte, from_byte + outgoing_insbytes);
+  treesit_record_change (from_byte, to_byte, from_byte + outgoing_insbytes);
 #endif
 
   /* Relocate point as if it were a marker.  */
@@ -1609,7 +1609,7 @@ replace_range (ptrdiff_t from, ptrdiff_t to, Lisp_Object new,
    Because this function is called in a loop, one character at a time.
    The caller of 'replace_range_2' calls these hooks for the entire
    region once.  Apart from signal_after_change, any caller of this
-   function should also call ts_record_change.  */
+   function should also call treesit_record_change.  */
 
 void
 replace_range_2 (ptrdiff_t from, ptrdiff_t from_byte,
@@ -1935,7 +1935,7 @@ del_range_2 (ptrdiff_t from, ptrdiff_t from_byte,
 #ifdef HAVE_TREE_SITTER
   eassert (from_byte <= to_byte);
   eassert (from_byte >= 0);
-  ts_record_change (from_byte, to_byte, from_byte);
+  treesit_record_change (from_byte, to_byte, from_byte);
 #endif
 
   return deletion;
diff --git a/src/print.c b/src/print.c
index a9afe1dd2b..0c50cbab09 100644
--- a/src/print.c
+++ b/src/print.c
@@ -2027,7 +2027,7 @@ print_vectorlike (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag,
       /* Prints #<treesit-node (identifier) in #<buffer xxx>> or
          #<treesit-node "keyword" in #<buffer xxx>>. */
       print_c_string ("#<treesit-node ", printcharfun);
-      bool named = ts_named_node_p (XTS_NODE (obj)->node);
+      bool named = treesit_named_node_p (XTS_NODE (obj)->node);
       const char *delim1 = named ? "(" : "\"";
       const char *delim2 = named ? ")" : "\"";
       print_c_string (delim1, printcharfun);
diff --git a/src/treesit.c b/src/treesit.c
index 7b80ea71d7..a2da44b4a7 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -312,11 +312,11 @@ #define ts_tree_root_node fn_ts_tree_root_node
      REF: https://github.com/tree-sitter/tree-sitter/issues/445
 
    treesit.h has some commentary on the two main data structure
-   for the parser and node.  ts_ensure_position_synced has some
+   for the parser and node.  treesit_ensure_position_synced has some
    commentary on how do we make tree-sitter play well with narrowing
    (tree-sitter parser only sees the visible region, so we need to
    translate positions back and forth).  Most action happens in
-   ts_ensure_parsed, ts_read_buffer and ts_record_change.
+   treesit_ensure_parsed, treesit_read_buffer and treesit_record_change.
 
    A complete correspondence list between tree-sitter functions and
    exposed Lisp functions can be found in the manual (elisp)API
@@ -377,9 +377,10 @@ #define ts_tree_root_node fn_ts_tree_root_node
    These are all imagined scenarios but they are not impossible :-)
  */
 
+
 /*** Initialization */
 
-bool ts_initialized = false;
+bool treesit_initialized = false;
 
 static bool
 load_tree_sitter_if_necessary (bool required)
@@ -409,28 +410,29 @@ load_tree_sitter_if_necessary (bool required)
 }
 
 static void *
-ts_calloc_wrapper (size_t n, size_t size)
+treesit_calloc_wrapper (size_t n, size_t size)
 {
   return xzalloc (n * size);
 }
 
 static void
-ts_initialize (void)
+treesit_initialize (void)
 {
-  if (!ts_initialized)
+  if (!treesit_initialized)
     {
       load_tree_sitter_if_necessary (true);
-      ts_set_allocator (xmalloc, ts_calloc_wrapper, xrealloc, xfree);
-      ts_initialized = true;
+      ts_set_allocator (xmalloc, treesit_calloc_wrapper, xrealloc, xfree);
+      treesit_initialized = true;
     }
 }
 
+
 /*** Loading language library */
 
 /* Translates a symbol treesit-<lang> to a C name
    treesit_<lang>.  */
 static void
-ts_symbol_to_c_name (char *symbol_name)
+treesit_symbol_to_c_name (char *symbol_name)
 {
   for (int idx = 0; idx < strlen (symbol_name); idx++)
     {
@@ -440,8 +442,8 @@ ts_symbol_to_c_name (char *symbol_name)
 }
 
 static bool
-ts_find_override_name (Lisp_Object language_symbol, Lisp_Object *name,
-		       Lisp_Object *c_symbol)
+treesit_find_override_name (Lisp_Object language_symbol, Lisp_Object *name,
+			    Lisp_Object *c_symbol)
 {
   for (Lisp_Object list = Vtreesit_load_name_override_list;
        !NILP (list); list = XCDR (list))
@@ -465,8 +467,8 @@ ts_find_override_name (Lisp_Object language_symbol, Lisp_Object *name,
    into *path_candidates.  Obiviously path_candidates should be a Lisp
    list of Lisp strings.  */
 static void
-ts_load_language_push_for_each_suffix (Lisp_Object lib_base_name,
-				       Lisp_Object *path_candidates)
+treesit_load_language_push_for_each_suffix (Lisp_Object lib_base_name,
+					    Lisp_Object *path_candidates)
 {
   for (Lisp_Object suffixes = Vdynamic_library_suffixes;
        !NILP (suffixes); suffixes = XCDR (suffixes))
@@ -482,8 +484,8 @@ ts_load_language_push_for_each_suffix (Lisp_Object lib_base_name,
    If error occurs, return NULL and fill SIGNAL_SYMBOL and SIGNAL_DATA
    with values suitable for xsignal. */
 static TSLanguage *
-ts_load_language (Lisp_Object language_symbol,
-		  Lisp_Object *signal_symbol, Lisp_Object *signal_data)
+treesit_load_language (Lisp_Object language_symbol,
+		       Lisp_Object *signal_symbol, Lisp_Object *signal_data)
 {
   Lisp_Object symbol_name = Fsymbol_name (language_symbol);
 
@@ -494,13 +496,14 @@ ts_load_language (Lisp_Object language_symbol,
     concat2 (build_pure_c_string ("tree-sitter-"), symbol_name);
   /* FIXME: The result of strdup leaks memory in some cases.  */
   char *c_name = strdup (SSDATA (base_name));
-  ts_symbol_to_c_name (c_name);
+  treesit_symbol_to_c_name (c_name);
 
   /* Override the library name and C name, if appropriate.  */
   Lisp_Object override_name;
   Lisp_Object override_c_name;
-  bool found_override = ts_find_override_name (language_symbol, &override_name,
-					       &override_c_name);
+  bool found_override = treesit_find_override_name (language_symbol,
+						    &override_name,
+						    &override_c_name);
   if (found_override)
     {
       lib_base_name = override_name;
@@ -511,19 +514,19 @@ ts_load_language (Lisp_Object language_symbol,
   Lisp_Object path_candidates = Qnil;
   /* First push just the filenames to the candidate list, which will
      make dynlib_open look under standard system load paths.  */
-  ts_load_language_push_for_each_suffix (lib_base_name, &path_candidates);
+  treesit_load_language_push_for_each_suffix (lib_base_name, &path_candidates);
   /* Then push ~/.emacs.d/tree-sitter paths.  */
   Lisp_Object lib_name =
     Fexpand_file_name (concat2 (build_string ("tree-sitter/"), lib_base_name),
 		       Fsymbol_value (Quser_emacs_directory));
-  ts_load_language_push_for_each_suffix (lib_name, &path_candidates);
+  treesit_load_language_push_for_each_suffix (lib_name, &path_candidates);
   /* Then push paths from treesit-extra-load-path.  */
   for (Lisp_Object tail = Freverse (Vtreesit_extra_load_path);
        !NILP (tail); tail = XCDR (tail))
     {
-      ts_load_language_push_for_each_suffix (Fexpand_file_name (lib_base_name,
-								XCAR (tail)),
-					     &path_candidates);
+      Lisp_Object expanded_lib = Fexpand_file_name (lib_base_name, XCAR (tail));
+      treesit_load_language_push_for_each_suffix (expanded_lib,
+						  &path_candidates);
     }
 
   /* Try loading the dynamic library by each path candidate.  Stop
@@ -590,10 +593,10 @@ DEFUN ("treesit-language-available-p",
   (Lisp_Object language, Lisp_Object detail)
 {
   CHECK_SYMBOL (language);
-  ts_initialize ();
+  treesit_initialize ();
   Lisp_Object signal_symbol = Qnil;
   Lisp_Object signal_data = Qnil;
-  if (ts_load_language (language, &signal_symbol, &signal_data) == NULL)
+  if (treesit_load_language (language, &signal_symbol, &signal_data) == NULL)
     {
       if (NILP (detail))
 	return Qnil;
@@ -630,7 +633,7 @@ DEFUN ("treesit-language-version",
 /*** Parsing functions */
 
 static void
-ts_check_parser (Lisp_Object obj)
+treesit_check_parser (Lisp_Object obj)
 {
   CHECK_TS_PARSER (obj);
   if (XTS_PARSER (obj)->deleted)
@@ -640,8 +643,8 @@ ts_check_parser (Lisp_Object obj)
 /* An auxiliary function that saves a few lines of code.  Assumes TREE
    is not NULL.  */
 static inline void
-ts_tree_edit_1 (TSTree *tree, ptrdiff_t start_byte,
-		ptrdiff_t old_end_byte, ptrdiff_t new_end_byte)
+treesit_tree_edit_1 (TSTree *tree, ptrdiff_t start_byte,
+		     ptrdiff_t old_end_byte, ptrdiff_t new_end_byte)
 {
   eassert (start_byte >= 0);
   eassert (start_byte <= old_end_byte);
@@ -660,8 +663,8 @@ ts_tree_edit_1 (TSTree *tree, ptrdiff_t start_byte,
 function does not parse the buffer and only updates the tree. (So it
 should be very fast.)  */
 void
-ts_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
-		  ptrdiff_t new_end_byte)
+treesit_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
+		       ptrdiff_t new_end_byte)
 {
   for (Lisp_Object parser_list = BVAR (current_buffer, ts_parser_list);
        !NILP (parser_list);
@@ -669,7 +672,7 @@ ts_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
     {
       CHECK_CONS (parser_list);
       Lisp_Object lisp_parser = XCAR (parser_list);
-      ts_check_parser (lisp_parser);
+      treesit_check_parser (lisp_parser);
       TSTree *tree = XTS_PARSER (lisp_parser)->tree;
       if (tree != NULL)
 	{
@@ -700,8 +703,8 @@ ts_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
 	  eassert (start_offset <= old_end_offset);
 	  eassert (start_offset <= new_end_offset);
 
-	  ts_tree_edit_1 (tree, start_offset, old_end_offset,
-			  new_end_offset);
+	  treesit_tree_edit_1 (tree, start_offset, old_end_offset,
+			       new_end_offset);
 	  XTS_PARSER (lisp_parser)->need_reparse = true;
 	  XTS_PARSER (lisp_parser)->timestamp++;
 
@@ -733,7 +736,7 @@ ts_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
 }
 
 static void
-ts_ensure_position_synced (Lisp_Object parser)
+treesit_ensure_position_synced (Lisp_Object parser)
 {
   TSTree *tree = XTS_PARSER (parser)->tree;
 
@@ -758,7 +761,7 @@ ts_ensure_position_synced (Lisp_Object parser)
   if (visible_beg > BUF_BEGV_BYTE (buffer))
     {
       /* Tree-sitter sees: insert at the beginning. */
-      ts_tree_edit_1 (tree, 0, 0, visible_beg - BUF_BEGV_BYTE (buffer));
+      treesit_tree_edit_1 (tree, 0, 0, visible_beg - BUF_BEGV_BYTE (buffer));
       visible_beg = BUF_BEGV_BYTE (buffer);
       eassert (visible_beg <= visible_end);
     }
@@ -766,18 +769,18 @@ ts_ensure_position_synced (Lisp_Object parser)
   if (visible_end < BUF_ZV_BYTE (buffer))
     {
       /* Tree-sitter sees: insert at the end.  */
-      ts_tree_edit_1 (tree, visible_end - visible_beg,
-		      visible_end - visible_beg,
-		      BUF_ZV_BYTE (buffer) - visible_beg);
+      treesit_tree_edit_1 (tree, visible_end - visible_beg,
+			   visible_end - visible_beg,
+			   BUF_ZV_BYTE (buffer) - visible_beg);
       visible_end = BUF_ZV_BYTE (buffer);
       eassert (visible_beg <= visible_end);
     }
   else if (visible_end > BUF_ZV_BYTE (buffer))
     {
       /* Tree-sitter sees: delete at the end.  */
-      ts_tree_edit_1 (tree, BUF_ZV_BYTE (buffer) - visible_beg,
-		      visible_end - visible_beg,
-		      BUF_ZV_BYTE (buffer) - visible_beg);
+      treesit_tree_edit_1 (tree, BUF_ZV_BYTE (buffer) - visible_beg,
+			   visible_end - visible_beg,
+			   BUF_ZV_BYTE (buffer) - visible_beg);
       visible_end = BUF_ZV_BYTE (buffer);
       eassert (visible_beg <= visible_end);
     }
@@ -785,7 +788,7 @@ ts_ensure_position_synced (Lisp_Object parser)
   if (visible_beg < BUF_BEGV_BYTE (buffer))
     {
       /* Tree-sitter sees: delete at the beginning.  */
-      ts_tree_edit_1 (tree, 0, BUF_BEGV_BYTE (buffer) - visible_beg, 0);
+      treesit_tree_edit_1 (tree, 0, BUF_BEGV_BYTE (buffer) - visible_beg, 0);
       visible_beg = BUF_BEGV_BYTE (buffer);
       eassert (visible_beg <= visible_end);
     }
@@ -797,7 +800,7 @@ ts_ensure_position_synced (Lisp_Object parser)
 }
 
 static void
-ts_check_buffer_size (struct buffer *buffer)
+treesit_check_buffer_size (struct buffer *buffer)
 {
   ptrdiff_t buffer_size = (BUF_Z (buffer) - BUF_BEG (buffer));
   if (buffer_size > UINT32_MAX)
@@ -809,20 +812,20 @@ ts_check_buffer_size (struct buffer *buffer)
 /* Parse the buffer.  We don't parse until we have to. When we have
 to, we call this function to parse and update the tree.  */
 static void
-ts_ensure_parsed (Lisp_Object parser)
+treesit_ensure_parsed (Lisp_Object parser)
 {
   if (!XTS_PARSER (parser)->need_reparse)
     return;
-  TSParser *ts_parser = XTS_PARSER (parser)->parser;
-  TSTree *tree = XTS_PARSER(parser)->tree;
+  TSParser *treesit_parser = XTS_PARSER (parser)->parser;
+  TSTree *tree = XTS_PARSER (parser)->tree;
   TSInput input = XTS_PARSER (parser)->input;
   struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
-  ts_check_buffer_size (buffer);
+  treesit_check_buffer_size (buffer);
 
   /* Before we parse, catch up with the narrowing situation.  */
-  ts_ensure_position_synced (parser);
+  treesit_ensure_position_synced (parser);
 
-  TSTree *new_tree = ts_parser_parse (ts_parser, tree, input);
+  TSTree *new_tree = ts_parser_parse (treesit_parser, tree, input);
   /* This should be very rare (impossible, really): it only happens
      when 1) language is not set (impossible in Emacs because the user
      has to supply a language to create a parser), 2) parse canceled
@@ -847,15 +850,15 @@ ts_ensure_parsed (Lisp_Object parser)
    buffer.  It reads one character at a time and automatically skips
    the gap.  */
 static const char*
-ts_read_buffer (void *parser, uint32_t byte_index,
-		TSPoint position, uint32_t *bytes_read)
+treesit_read_buffer (void *parser, uint32_t byte_index,
+		     TSPoint position, uint32_t *bytes_read)
 {
   struct buffer *buffer = XBUFFER (((struct Lisp_TS_Parser *) parser)->buffer);
   ptrdiff_t visible_beg = ((struct Lisp_TS_Parser *) parser)->visible_beg;
   ptrdiff_t visible_end = ((struct Lisp_TS_Parser *) parser)->visible_end;
   ptrdiff_t byte_pos = byte_index + visible_beg;
   /* We will make sure visible_beg = BUF_BEGV_BYTE before re-parse (in
-     ts_ensure_parsed), so byte_pos will never be smaller than
+     treesit_ensure_parsed), so byte_pos will never be smaller than
      BUF_BEG_BYTE.  */
   eassert (visible_beg = BUF_BEGV_BYTE (buffer));
   eassert (visible_end = BUF_ZV_BYTE (buffer));
@@ -895,8 +898,8 @@ ts_read_buffer (void *parser, uint32_t byte_index,
 
 /* Wrap the parser in a Lisp_Object to be used in the Lisp machine.  */
 Lisp_Object
-make_ts_parser (Lisp_Object buffer, TSParser *parser,
-		TSTree *tree, Lisp_Object language_symbol)
+make_treesit_parser (Lisp_Object buffer, TSParser *parser,
+		     TSTree *tree, Lisp_Object language_symbol)
 {
   struct Lisp_TS_Parser *lisp_parser =
     ALLOCATE_PSEUDOVECTOR (struct Lisp_TS_Parser, buffer, PVEC_TS_PARSER);
@@ -905,7 +908,7 @@ make_ts_parser (Lisp_Object buffer, TSParser *parser,
   lisp_parser->buffer = buffer;
   lisp_parser->parser = parser;
   lisp_parser->tree = tree;
-  TSInput input = {lisp_parser, ts_read_buffer, TSInputEncodingUTF8};
+  TSInput input = {lisp_parser, treesit_read_buffer, TSInputEncodingUTF8};
   lisp_parser->input = input;
   lisp_parser->need_reparse = true;
   lisp_parser->visible_beg = BUF_BEGV (XBUFFER (buffer));
@@ -918,7 +921,7 @@ make_ts_parser (Lisp_Object buffer, TSParser *parser,
 
 /* Wrap the node in a Lisp_Object to be used in the Lisp machine.  */
 Lisp_Object
-make_ts_node (Lisp_Object parser, TSNode node)
+make_treesit_node (Lisp_Object parser, TSNode node)
 {
   struct Lisp_TS_Node *lisp_node =
     ALLOCATE_PSEUDOVECTOR (struct Lisp_TS_Node, parser, PVEC_TS_NODE);
@@ -931,9 +934,9 @@ make_ts_node (Lisp_Object parser, TSNode node)
 /* Make a compiled query.  QUERY has to be either a cons or a
    string.  */
 static Lisp_Object
-make_ts_query (Lisp_Object query, Lisp_Object language)
+make_treesit_query (Lisp_Object query, Lisp_Object language)
 {
-  TSQueryCursor *ts_cursor = ts_query_cursor_new ();
+  TSQueryCursor *treesit_cursor = ts_query_cursor_new ();
   struct Lisp_TS_Query *lisp_query =
     ALLOCATE_PSEUDOVECTOR (struct Lisp_TS_Query, source,
 			   PVEC_TS_COMPILED_QUERY);
@@ -941,20 +944,20 @@ make_ts_query (Lisp_Object query, Lisp_Object language)
   lisp_query->language = language;
   lisp_query->source = query;
   lisp_query->query = NULL;
-  lisp_query->cursor = ts_cursor;
+  lisp_query->cursor = treesit_cursor;
   return make_lisp_ptr (lisp_query, Lisp_Vectorlike);
 }
 
 /* The following two functions are called from alloc.c:cleanup_vector.  */
 void
-ts_delete_parser (struct Lisp_TS_Parser *lisp_parser)
+treesit_delete_parser (struct Lisp_TS_Parser *lisp_parser)
 {
   ts_tree_delete (lisp_parser->tree);
   ts_parser_delete (lisp_parser->parser);
 }
 
 void
-ts_delete_query (struct Lisp_TS_Query *lisp_query)
+treesit_delete_query (struct Lisp_TS_Query *lisp_query)
 {
   ts_query_delete (lisp_query->query);
   ts_query_cursor_delete (lisp_query->cursor);
@@ -962,13 +965,13 @@ ts_delete_query (struct Lisp_TS_Query *lisp_query)
 
 /* The following function is called from print.c:print_vectorlike.  */
 bool
-ts_named_node_p (TSNode node)
+treesit_named_node_p (TSNode node)
 {
   return ts_node_is_named (node);
 }
 
 static const char*
-ts_query_error_to_string (TSQueryError error)
+treesit_query_error_to_string (TSQueryError error)
 {
   switch (error)
     {
@@ -990,11 +993,12 @@ ts_query_error_to_string (TSQueryError error)
 }
 
 static Lisp_Object
-ts_compose_query_signal_data (uint32_t error_offset, TSQueryError error_type)
+treesit_compose_query_signal_data (uint32_t error_offset,
+				   TSQueryError error_type)
 {
-  return list3 (build_string (ts_query_error_to_string (error_type)),
+  return list3 (build_string (treesit_query_error_to_string (error_type)),
 		make_fixnum (error_offset + 1),
-		build_pure_c_string("Debug the query with `treesit-query-validate'"));
+		build_pure_c_string ("Debug the query with `treesit-query-validate'"));
 }
 
 /* Ensure the QUERY is compiled.  Return the TSQuery.  It could be
@@ -1002,23 +1006,23 @@ ts_compose_query_signal_data (uint32_t error_offset, TSQueryError error_type)
    bound.  If error occures, return NULL, and assign SIGNAL_SYMBOL and
    SIGNAL_DATA accordingly.  */
 static TSQuery *
-ts_ensure_query_compiled (Lisp_Object query, Lisp_Object *signal_symbol,
-			  Lisp_Object *signal_data)
+treesit_ensure_query_compiled (Lisp_Object query, Lisp_Object *signal_symbol,
+			       Lisp_Object *signal_data)
 {
   /* If query is already compiled (not null), return that, otherwise
      compile and return it.  */
-  TSQuery *ts_query = XTS_COMPILED_QUERY (query)->query;
-  if (ts_query != NULL)
-    return ts_query;
+  TSQuery *treesit_query = XTS_COMPILED_QUERY (query)->query;
+  if (treesit_query != NULL)
+    return treesit_query;
 
   /* Get query source and TSLanguage ready.  */
   Lisp_Object source = XTS_COMPILED_QUERY (query)->source;
   Lisp_Object language = XTS_COMPILED_QUERY (query)->language;
   /* This is the main reason why we compile query lazily: to avoid
      loading languages early.  */
-  TSLanguage *ts_lang = ts_load_language (language, signal_symbol,
-					  signal_data);
-  if (ts_lang == NULL)
+  TSLanguage *treesit_lang = treesit_load_language (language, signal_symbol,
+						    signal_data);
+  if (treesit_lang == NULL)
     return NULL;
 
   if (CONSP (source))
@@ -1027,17 +1031,18 @@ ts_ensure_query_compiled (Lisp_Object query, Lisp_Object *signal_symbol,
   /* Create TSQuery.  */
   uint32_t error_offset;
   TSQueryError error_type;
-  char *ts_source = SSDATA (source);
-  ts_query = ts_query_new (ts_lang, ts_source, strlen (ts_source),
-			   &error_offset, &error_type);
-  if (ts_query == NULL)
+  char *treesit_source = SSDATA (source);
+  treesit_query = ts_query_new (treesit_lang, treesit_source,
+				strlen (treesit_source),
+				&error_offset, &error_type);
+  if (treesit_query == NULL)
     {
       *signal_symbol = Qtreesit_query_error;
-      *signal_data = ts_compose_query_signal_data
-	(error_offset, error_type);
+      *signal_data = treesit_compose_query_signal_data (error_offset,
+							error_type);
     }
-  XTS_COMPILED_QUERY (query)->query = ts_query;
-  return ts_query;
+  XTS_COMPILED_QUERY (query)->query = treesit_query;
+  return treesit_query;
 }
 
 DEFUN ("treesit-parser-p",
@@ -1092,7 +1097,7 @@ DEFUN ("treesit-query-language",
   (Lisp_Object query)
 {
   CHECK_TS_COMPILED_QUERY (query);
-  return XTS_COMPILED_QUERY(query)->language;
+  return XTS_COMPILED_QUERY (query)->language;
 }
 
 DEFUN ("treesit-node-parser",
@@ -1118,7 +1123,7 @@ DEFUN ("treesit-parser-create",
 create a new parser.  */)
   (Lisp_Object language, Lisp_Object buffer, Lisp_Object no_reuse)
 {
-  ts_initialize ();
+  treesit_initialize ();
 
   CHECK_SYMBOL (language);
   struct buffer *buf;
@@ -1129,7 +1134,7 @@ DEFUN ("treesit-parser-create",
       CHECK_BUFFER (buffer);
       buf = XBUFFER (buffer);
     }
-  ts_check_buffer_size (buf);
+  treesit_check_buffer_size (buf);
 
   /* See if we can reuse a parser.  */
   for (Lisp_Object tail = BVAR (buf, ts_parser_list);
@@ -1145,8 +1150,8 @@ DEFUN ("treesit-parser-create",
   Lisp_Object signal_symbol = Qnil;
   Lisp_Object signal_data = Qnil;
   TSParser *parser = ts_parser_new ();
-  TSLanguage *lang = ts_load_language (language, &signal_symbol,
-				       &signal_data);
+  TSLanguage *lang = treesit_load_language (language, &signal_symbol,
+					    &signal_data);
   if (lang == NULL)
     xsignal (signal_symbol, signal_data);
   /* We check language version when loading a language, so this should
@@ -1155,7 +1160,7 @@ DEFUN ("treesit-parser-create",
 
   /* Create parser.  */
   Lisp_Object lisp_parser
-    = make_ts_parser (Fcurrent_buffer (), parser, NULL, language);
+    = make_treesit_parser (Fcurrent_buffer (), parser, NULL, language);
 
   /* Update parser-list.  */
   BVAR (buf, ts_parser_list) = Fcons (lisp_parser, BVAR (buf, ts_parser_list));
@@ -1170,7 +1175,7 @@ DEFUN ("treesit-parser-delete",
 See `treesit-parser-list' for the buffer's parser list.  */)
   (Lisp_Object parser)
 {
-  ts_check_parser (parser);
+  treesit_check_parser (parser);
 
   Lisp_Object buffer = XTS_PARSER (parser)->buffer;
   struct buffer *buf = XBUFFER (buffer);
@@ -1213,7 +1218,7 @@ DEFUN ("treesit-parser-buffer",
        doc: /* Return the buffer of PARSER.  */)
   (Lisp_Object parser)
 {
-  ts_check_parser (parser);
+  treesit_check_parser (parser);
   Lisp_Object buf;
   XSETBUFFER (buf, XBUFFER (XTS_PARSER (parser)->buffer));
   return buf;
@@ -1226,7 +1231,7 @@ DEFUN ("treesit-parser-language",
 This symbol is the one used to create the parser.  */)
   (Lisp_Object parser)
 {
-  ts_check_parser (parser);
+  treesit_check_parser (parser);
   return XTS_PARSER (parser)->language_symbol;
 }
 
@@ -1238,17 +1243,17 @@ DEFUN ("treesit-parser-root-node",
        doc: /* Return the root node of PARSER.  */)
   (Lisp_Object parser)
 {
-  ts_check_parser (parser);
-  ts_initialize ();
-  ts_ensure_parsed (parser);
+  treesit_check_parser (parser);
+  treesit_initialize ();
+  treesit_ensure_parsed (parser);
   TSNode root_node = ts_tree_root_node (XTS_PARSER (parser)->tree);
-  return make_ts_node (parser, root_node);
+  return make_treesit_node (parser, root_node);
 }
 
 /* Checks that the RANGES argument of
    treesit-parser-set-included-ranges is valid.  */
 static void
-ts_check_range_argument (Lisp_Object ranges)
+treesit_check_range_argument (Lisp_Object ranges)
 {
   struct buffer *buffer = current_buffer;
   ptrdiff_t point_min = BUF_BEGV (buffer);
@@ -1285,13 +1290,13 @@ DEFUN ("treesit-parser-set-included-ranges",
 is nil, the PARSER is to parse the whole buffer.  */)
   (Lisp_Object parser, Lisp_Object ranges)
 {
-  ts_check_parser (parser);
+  treesit_check_parser (parser);
   CHECK_CONS (ranges);
-  ts_check_range_argument (ranges);
+  treesit_check_range_argument (ranges);
 
-  ts_initialize ();
+  treesit_initialize ();
   /* Before we parse, catch up with narrowing/widening.  */
-  ts_ensure_position_synced (parser);
+  treesit_ensure_position_synced (parser);
 
   bool success;
   if (NILP (ranges))
@@ -1299,16 +1304,16 @@ DEFUN ("treesit-parser-set-included-ranges",
       /* If RANGES is nil, make parser to parse the whole document.
 	 To do that we give tree-sitter a 0 length, the range is a
 	 dummy.  */
-      TSRange ts_range = {{0, 0}, {0, 0}, 0, 0};
+      TSRange treesit_range = {{0, 0}, {0, 0}, 0, 0};
       success = ts_parser_set_included_ranges (XTS_PARSER (parser)->parser,
-					       &ts_range , 0);
+					       &treesit_range , 0);
     }
   else
     {
       /* Set ranges for PARSER.  */
       ptrdiff_t len = list_length (ranges);
       /* FIXME: We should test the return value of malloc below.  */
-      TSRange *ts_ranges = malloc (sizeof(TSRange) * len);
+      TSRange *treesit_ranges = malloc (sizeof(TSRange) * len);
       struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
 
       for (int idx = 0; !NILP (ranges); idx++, ranges = XCDR (ranges))
@@ -1323,16 +1328,16 @@ DEFUN ("treesit-parser-set-included-ranges",
 	  TSRange rg = {{0,0}, {0,0},
 			(uint32_t) beg_byte - BUF_BEGV_BYTE (buffer),
 			(uint32_t) end_byte - BUF_BEGV_BYTE (buffer)};
-	  ts_ranges[idx] = rg;
+	  treesit_ranges[idx] = rg;
 	}
       /* FIXME: 'len' below is ptrdiff_t, so can overflow a 32-bit
 	 unsigned data type.  */
       success = ts_parser_set_included_ranges (XTS_PARSER (parser)->parser,
-					       ts_ranges, (uint32_t) len);
+					       treesit_ranges, (uint32_t) len);
       /* Although XFIXNUM could signal, it should be impossible
-	 because we have checked the input by ts_check_range_argument.
+	 because we have checked the input by treesit_check_range_argument.
 	 So there is no need for unwind-protect.  */
-      free (ts_ranges);
+      free (treesit_ranges);
     }
 
   if (!success)
@@ -1353,8 +1358,8 @@ DEFUN ("treesit-parser-included-ranges",
 return nil.  */)
   (Lisp_Object parser)
 {
-  ts_check_parser (parser);
-  ts_initialize ();
+  treesit_check_parser (parser);
+  treesit_initialize ();
   uint32_t len;
   const TSRange *ranges =
     ts_parser_included_ranges (XTS_PARSER (parser)->parser, &len);
@@ -1363,7 +1368,7 @@ DEFUN ("treesit-parser-included-ranges",
 
   /* Our return value depends on the buffer state (BUF_BEGV_BYTE,
      etc), so we need to sync up.  */
-  ts_ensure_position_synced (parser);
+  treesit_ensure_position_synced (parser);
 
   struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
 
@@ -1390,7 +1395,7 @@ DEFUN ("treesit-parser-included-ranges",
 /* Check that OBJ is a positive integer and signal an error if
    otherwise. */
 static void
-ts_check_positive_integer (Lisp_Object obj)
+treesit_check_positive_integer (Lisp_Object obj)
 {
   CHECK_INTEGER (obj);
   if (XFIXNUM (obj) < 0)
@@ -1398,7 +1403,7 @@ ts_check_positive_integer (Lisp_Object obj)
 }
 
 static void
-ts_check_node (Lisp_Object obj)
+treesit_check_node (Lisp_Object obj)
 {
   CHECK_TS_NODE (obj);
   Lisp_Object lisp_parser = XTS_NODE (obj)->parser;
@@ -1413,11 +1418,11 @@ DEFUN ("treesit-node-type",
   (Lisp_Object node)
 {
   if (NILP (node)) return Qnil;
-  ts_check_node (node);
-  ts_initialize ();
+  treesit_check_node (node);
+  treesit_initialize ();
 
-  TSNode ts_node = XTS_NODE (node)->node;
-  const char *type = ts_node_type (ts_node);
+  TSNode treesit_node = XTS_NODE (node)->node;
+  const char *type = ts_node_type (treesit_node);
   return build_string (type);
 }
 
@@ -1428,12 +1433,12 @@ DEFUN ("treesit-node-start",
   (Lisp_Object node)
 {
   if (NILP (node)) return Qnil;
-  ts_check_node (node);
-  ts_initialize ();
+  treesit_check_node (node);
+  treesit_initialize ();
 
-  TSNode ts_node = XTS_NODE (node)->node;
+  TSNode treesit_node = XTS_NODE (node)->node;
   ptrdiff_t visible_beg = XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
-  uint32_t start_byte_offset = ts_node_start_byte (ts_node);
+  uint32_t start_byte_offset = ts_node_start_byte (treesit_node);
   struct buffer *buffer =
     XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer);
   ptrdiff_t start_pos =
@@ -1448,12 +1453,12 @@ DEFUN ("treesit-node-end",
   (Lisp_Object node)
 {
   if (NILP (node)) return Qnil;
-  ts_check_node (node);
-  ts_initialize ();
+  treesit_check_node (node);
+  treesit_initialize ();
 
-  TSNode ts_node = XTS_NODE (node)->node;
+  TSNode treesit_node = XTS_NODE (node)->node;
   ptrdiff_t visible_beg = XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
-  uint32_t end_byte_offset = ts_node_end_byte (ts_node);
+  uint32_t end_byte_offset = ts_node_end_byte (treesit_node);
   struct buffer *buffer =
     XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer);
   ptrdiff_t end_pos =
@@ -1468,11 +1473,11 @@ DEFUN ("treesit-node-string",
   (Lisp_Object node)
 {
   if (NILP (node)) return Qnil;
-  ts_check_node (node);
-  ts_initialize ();
+  treesit_check_node (node);
+  treesit_initialize ();
 
-  TSNode ts_node = XTS_NODE (node)->node;
-  char *string = ts_node_string (ts_node);
+  TSNode treesit_node = XTS_NODE (node)->node;
+  char *string = ts_node_string (treesit_node);
   return build_string (string);
 }
 
@@ -1483,16 +1488,16 @@ DEFUN ("treesit-node-parent",
   (Lisp_Object node)
 {
   if (NILP (node)) return Qnil;
-  ts_check_node (node);
-  ts_initialize ();
+  treesit_check_node (node);
+  treesit_initialize ();
 
-  TSNode ts_node = XTS_NODE (node)->node;
-  TSNode parent = ts_node_parent (ts_node);
+  TSNode treesit_node = XTS_NODE (node)->node;
+  TSNode parent = ts_node_parent (treesit_node);
 
   if (ts_node_is_null (parent))
     return Qnil;
 
-  return make_ts_node (XTS_NODE (node)->parser, parent);
+  return make_treesit_node (XTS_NODE (node)->parser, parent);
 }
 
 DEFUN ("treesit-node-child",
@@ -1504,24 +1509,24 @@ DEFUN ("treesit-node-child",
   (Lisp_Object node, Lisp_Object n, Lisp_Object named)
 {
   if (NILP (node)) return Qnil;
-  ts_check_node (node);
-  ts_check_positive_integer (n);
+  treesit_check_node (node);
+  treesit_check_positive_integer (n);
   EMACS_INT idx = XFIXNUM (n);
   if (idx > UINT32_MAX)
     xsignal1 (Qargs_out_of_range, n);
-  ts_initialize ();
+  treesit_initialize ();
 
-  TSNode ts_node = XTS_NODE (node)->node;
+  TSNode treesit_node = XTS_NODE (node)->node;
   TSNode child;
   if (NILP (named))
-    child = ts_node_child (ts_node, (uint32_t) idx);
+    child = ts_node_child (treesit_node, (uint32_t) idx);
   else
-    child = ts_node_named_child (ts_node, (uint32_t) idx);
+    child = ts_node_named_child (treesit_node, (uint32_t) idx);
 
   if (ts_node_is_null (child))
     return Qnil;
 
-  return make_ts_node (XTS_NODE (node)->parser, child);
+  return make_treesit_node (XTS_NODE (node)->parser, child);
 }
 
 DEFUN ("treesit-node-check",
@@ -1548,22 +1553,22 @@ DEFUN ("treesit-node-check",
   (Lisp_Object node, Lisp_Object property)
 {
   if (NILP (node)) return Qnil;
-  ts_check_node (node);
+  treesit_check_node (node);
   CHECK_SYMBOL (property);
-  ts_initialize ();
+  treesit_initialize ();
 
-  TSNode ts_node = XTS_NODE (node)->node;
+  TSNode treesit_node = XTS_NODE (node)->node;
   bool result;
   if (EQ (property, Qnamed))
-    result = ts_node_is_named (ts_node);
+    result = ts_node_is_named (treesit_node);
   else if (EQ (property, Qmissing))
-    result = ts_node_is_missing (ts_node);
+    result = ts_node_is_missing (treesit_node);
   else if (EQ (property, Qextra))
-    result = ts_node_is_extra (ts_node);
+    result = ts_node_is_extra (treesit_node);
   else if (EQ (property, Qhas_error))
-    result = ts_node_has_error (ts_node);
+    result = ts_node_has_error (treesit_node);
   else if (EQ (property, Qhas_changes))
-    result = ts_node_has_changes (ts_node);
+    result = ts_node_has_changes (treesit_node);
   else
     signal_error ("Expecting `named', `missing', `extra', `has-changes' or `has-error', but got",
 		  property);
@@ -1581,16 +1586,16 @@ DEFUN ("treesit-node-field-name-for-child",
 {
   if (NILP (node))
     return Qnil;
-  ts_check_node (node);
-  ts_check_positive_integer (n);
+  treesit_check_node (node);
+  treesit_check_positive_integer (n);
   EMACS_INT idx = XFIXNUM (n);
   if (idx > UINT32_MAX)
     xsignal1 (Qargs_out_of_range, n);
-  ts_initialize ();
+  treesit_initialize ();
 
-  TSNode ts_node = XTS_NODE (node)->node;
+  TSNode treesit_node = XTS_NODE (node)->node;
   const char *name
-    = ts_node_field_name_for_child (ts_node, (uint32_t) idx);
+    = ts_node_field_name_for_child (treesit_node, (uint32_t) idx);
 
   if (name == NULL)
     return Qnil;
@@ -1609,15 +1614,15 @@ DEFUN ("treesit-node-child-count",
 {
   if (NILP (node))
     return Qnil;
-  ts_check_node (node);
-  ts_initialize ();
+  treesit_check_node (node);
+  treesit_initialize ();
 
-  TSNode ts_node = XTS_NODE (node)->node;
+  TSNode treesit_node = XTS_NODE (node)->node;
   uint32_t count;
   if (NILP (named))
-    count = ts_node_child_count (ts_node);
+    count = ts_node_child_count (treesit_node);
   else
-    count = ts_node_named_child_count (ts_node);
+    count = ts_node_named_child_count (treesit_node);
   return make_fixnum (count);
 }
 
@@ -1630,19 +1635,19 @@ DEFUN ("treesit-node-child-by-field-name",
 {
   if (NILP (node))
     return Qnil;
-  ts_check_node (node);
+  treesit_check_node (node);
   CHECK_STRING (field_name);
-  ts_initialize ();
+  treesit_initialize ();
 
   char *name_str = SSDATA (field_name);
-  TSNode ts_node = XTS_NODE (node)->node;
+  TSNode treesit_node = XTS_NODE (node)->node;
   TSNode child
-    = ts_node_child_by_field_name (ts_node, name_str, strlen (name_str));
+    = ts_node_child_by_field_name (treesit_node, name_str, strlen (name_str));
 
   if (ts_node_is_null (child))
     return Qnil;
 
-  return make_ts_node(XTS_NODE (node)->parser, child);
+  return make_treesit_node (XTS_NODE (node)->parser, child);
 }
 
 DEFUN ("treesit-node-next-sibling",
@@ -1655,20 +1660,20 @@ DEFUN ("treesit-node-next-sibling",
   (Lisp_Object node, Lisp_Object named)
 {
   if (NILP (node)) return Qnil;
-  ts_check_node (node);
-  ts_initialize ();
+  treesit_check_node (node);
+  treesit_initialize ();
 
-  TSNode ts_node = XTS_NODE (node)->node;
+  TSNode treesit_node = XTS_NODE (node)->node;
   TSNode sibling;
   if (NILP (named))
-    sibling = ts_node_next_sibling (ts_node);
+    sibling = ts_node_next_sibling (treesit_node);
   else
-    sibling = ts_node_next_named_sibling (ts_node);
+    sibling = ts_node_next_named_sibling (treesit_node);
 
-  if (ts_node_is_null(sibling))
+  if (ts_node_is_null (sibling))
     return Qnil;
 
-  return make_ts_node(XTS_NODE (node)->parser, sibling);
+  return make_treesit_node (XTS_NODE (node)->parser, sibling);
 }
 
 DEFUN ("treesit-node-prev-sibling",
@@ -1682,21 +1687,21 @@ DEFUN ("treesit-node-prev-sibling",
   (Lisp_Object node, Lisp_Object named)
 {
   if (NILP (node)) return Qnil;
-  ts_check_node (node);
-  ts_initialize ();
+  treesit_check_node (node);
+  treesit_initialize ();
 
-  TSNode ts_node = XTS_NODE (node)->node;
+  TSNode treesit_node = XTS_NODE (node)->node;
   TSNode sibling;
 
   if (NILP (named))
-    sibling = ts_node_prev_sibling (ts_node);
+    sibling = ts_node_prev_sibling (treesit_node);
   else
-    sibling = ts_node_prev_named_sibling (ts_node);
+    sibling = ts_node_prev_named_sibling (treesit_node);
 
-  if (ts_node_is_null(sibling))
+  if (ts_node_is_null (sibling))
     return Qnil;
 
-  return make_ts_node(XTS_NODE (node)->parser, sibling);
+  return make_treesit_node (XTS_NODE (node)->parser, sibling);
 }
 
 DEFUN ("treesit-node-first-child-for-pos",
@@ -1713,8 +1718,8 @@ DEFUN ("treesit-node-first-child-for-pos",
 {
   if (NILP (node))
     return Qnil;
-  ts_check_node (node);
-  ts_check_positive_integer (pos);
+  treesit_check_node (node);
+  treesit_check_positive_integer (pos);
 
   struct buffer *buf = XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer);
   ptrdiff_t visible_beg = XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
@@ -1723,20 +1728,20 @@ DEFUN ("treesit-node-first-child-for-pos",
   if (byte_pos < BUF_BEGV_BYTE (buf) || byte_pos > BUF_ZV_BYTE (buf))
     xsignal1 (Qargs_out_of_range, pos);
 
-  ts_initialize ();
+  treesit_initialize ();
 
-  TSNode ts_node = XTS_NODE (node)->node;
+  TSNode treesit_node = XTS_NODE (node)->node;
   TSNode child;
   if (NILP (named))
-    child = ts_node_first_child_for_byte (ts_node, byte_pos - visible_beg);
+    child = ts_node_first_child_for_byte (treesit_node, byte_pos - visible_beg);
   else
-    child = ts_node_first_named_child_for_byte (ts_node,
+    child = ts_node_first_named_child_for_byte (treesit_node,
 						byte_pos - visible_beg);
 
   if (ts_node_is_null (child))
     return Qnil;
 
-  return make_ts_node (XTS_NODE (node)->parser, child);
+  return make_treesit_node (XTS_NODE (node)->parser, child);
 }
 
 DEFUN ("treesit-node-descendant-for-range",
@@ -1751,7 +1756,7 @@ DEFUN ("treesit-node-descendant-for-range",
   (Lisp_Object node, Lisp_Object beg, Lisp_Object end, Lisp_Object named)
 {
   if (NILP (node)) return Qnil;
-  ts_check_node (node);
+  treesit_check_node (node);
   CHECK_INTEGER (beg);
   CHECK_INTEGER (end);
 
@@ -1766,22 +1771,22 @@ DEFUN ("treesit-node-descendant-for-range",
 	&& byte_end <= BUF_ZV_BYTE (buf)))
     xsignal2 (Qargs_out_of_range, beg, end);
 
-  ts_initialize ();
+  treesit_initialize ();
 
-  TSNode ts_node = XTS_NODE (node)->node;
+  TSNode treesit_node = XTS_NODE (node)->node;
   TSNode child;
   if (NILP (named))
-    child = ts_node_descendant_for_byte_range (ts_node, byte_beg - visible_beg,
+    child = ts_node_descendant_for_byte_range (treesit_node, byte_beg - visible_beg,
 					       byte_end - visible_beg);
   else
-    child = ts_node_named_descendant_for_byte_range (ts_node,
+    child = ts_node_named_descendant_for_byte_range (treesit_node,
 						     byte_beg - visible_beg,
 						     byte_end - visible_beg);
 
   if (ts_node_is_null (child))
     return Qnil;
 
-  return make_ts_node (XTS_NODE (node)->parser, child);
+  return make_treesit_node (XTS_NODE (node)->parser, child);
 }
 
 DEFUN ("treesit-node-eq",
@@ -1796,12 +1801,12 @@ DEFUN ("treesit-node-eq",
   CHECK_TS_NODE (node1);
   CHECK_TS_NODE (node2);
 
-  ts_initialize ();
+  treesit_initialize ();
 
-  TSNode ts_node_1 = XTS_NODE (node1)->node;
-  TSNode ts_node_2 = XTS_NODE (node2)->node;
+  TSNode treesit_node_1 = XTS_NODE (node1)->node;
+  TSNode treesit_node_2 = XTS_NODE (node2)->node;
 
-  bool same_node = ts_node_eq (ts_node_1, ts_node_2);
+  bool same_node = ts_node_eq (treesit_node_1, treesit_node_2);
   return same_node ? Qt : Qnil;
 }
 
@@ -1832,17 +1837,17 @@ DEFUN ("treesit-pattern-expand",
   (Lisp_Object pattern)
 {
   if (EQ (pattern, intern_c_string (":anchor")))
-    return build_pure_c_string(".");
+    return build_pure_c_string (".");
   if (EQ (pattern, intern_c_string (":?")))
-    return build_pure_c_string("?");
+    return build_pure_c_string ("?");
   if (EQ (pattern, intern_c_string (":*")))
-    return build_pure_c_string("*");
+    return build_pure_c_string ("*");
   if (EQ (pattern, intern_c_string (":+")))
-    return build_pure_c_string("+");
+    return build_pure_c_string ("+");
   if (EQ (pattern, intern_c_string (":equal")))
-    return build_pure_c_string("#equal");
+    return build_pure_c_string ("#equal");
   if (EQ (pattern, intern_c_string (":match")))
-    return build_pure_c_string("#match");
+    return build_pure_c_string ("#match");
   Lisp_Object opening_delimeter =
     build_pure_c_string (VECTORP (pattern) ? "[" : "(");
   Lisp_Object closing_delimiter =
@@ -1853,7 +1858,7 @@ DEFUN ("treesit-pattern-expand",
 				pattern,
 				build_pure_c_string (" ")),
 		    closing_delimiter);
-  return CALLN (Fformat, build_pure_c_string("%S"), pattern);
+  return CALLN (Fformat, build_pure_c_string ("%S"), pattern);
 }
 
 DEFUN ("treesit-query-expand",
@@ -1902,8 +1907,7 @@ DEFUN ("treesit-query-expand",
 /* Collect predicates for this match and return them in a list.  Each
    predicate is a list of strings and symbols.  */
 static Lisp_Object
-ts_predicates_for_pattern
-(TSQuery *query, uint32_t pattern_index)
+treesit_predicates_for_pattern (TSQuery *query, uint32_t pattern_index)
 {
   uint32_t len;
   const TSQueryPredicateStep *predicate_list =
@@ -1946,8 +1950,8 @@ DEFUN ("treesit-query-expand",
 /* Translate a capture NAME (symbol) to the text of the captured node.
    Signals treesit-query-error if such node is not captured.  */
 static Lisp_Object
-ts_predicate_capture_name_to_text (Lisp_Object name,
-				   struct capture_range captures)
+treesit_predicate_capture_name_to_text (Lisp_Object name,
+					struct capture_range captures)
 {
   Lisp_Object node = Qnil;
   for (Lisp_Object tail = captures.start; !EQ (tail, captures.end);
@@ -1978,7 +1982,7 @@ ts_predicate_capture_name_to_text (Lisp_Object name,
    The capture name evaluates to the text its captured node spans in
    the buffer.  */
 static bool
-ts_predicate_equal (Lisp_Object args, struct capture_range captures)
+treesit_predicate_equal (Lisp_Object args, struct capture_range captures)
 {
   if (XFIXNUM (Flength (args)) != 2)
     xsignal2 (Qtreesit_query_error,
@@ -1988,9 +1992,11 @@ ts_predicate_equal (Lisp_Object args, struct capture_range captures)
   Lisp_Object arg1 = XCAR (args);
   Lisp_Object arg2 = XCAR (XCDR (args));
   Lisp_Object text1 =
-    STRINGP (arg1) ? arg1 : ts_predicate_capture_name_to_text (arg1, captures);
+    STRINGP (arg1) ? arg1 : treesit_predicate_capture_name_to_text (arg1,
+								    captures);
   Lisp_Object text2 =
-    STRINGP (arg2) ? arg2 : ts_predicate_capture_name_to_text (arg2, captures);
+    STRINGP (arg2) ? arg2 : treesit_predicate_capture_name_to_text (arg2,
+								    captures);
 
   return !NILP (Fstring_equal (text1, text2));
 }
@@ -1999,8 +2005,7 @@ ts_predicate_equal (Lisp_Object args, struct capture_range captures)
    matches the text spanned by @node; return false otherwise.  Matching
    is case-sensitive.  */
 static bool
-ts_predicate_match
-(Lisp_Object args, struct capture_range captures)
+treesit_predicate_match (Lisp_Object args, struct capture_range captures)
 {
   if (XFIXNUM (Flength (args)) != 2)
     xsignal2 (Qtreesit_query_error,
@@ -2009,7 +2014,8 @@ ts_predicate_equal (Lisp_Object args, struct capture_range captures)
 
   Lisp_Object regexp = XCAR (args);
   Lisp_Object capture_name = XCAR (XCDR (args));
-  Lisp_Object text = ts_predicate_capture_name_to_text (capture_name, captures);
+  Lisp_Object text = treesit_predicate_capture_name_to_text (capture_name,
+							     captures);
 
   /* It's probably common to get the argument order backwards.  Catch
      this mistake early and show helpful explanation, because Emacs
@@ -2039,7 +2045,7 @@ ts_predicate_equal (Lisp_Object args, struct capture_range captures)
 /* If all predicates in PREDICATES passes, return true; otherwise
    return false.  */
 static bool
-ts_eval_predicates (struct capture_range captures, Lisp_Object predicates)
+treesit_eval_predicates (struct capture_range captures, Lisp_Object predicates)
 {
   bool pass = true;
   /* Evaluate each predicates.  */
@@ -2049,10 +2055,10 @@ ts_eval_predicates (struct capture_range captures, Lisp_Object predicates)
       Lisp_Object predicate = XCAR (tail);
       Lisp_Object fn = XCAR (predicate);
       Lisp_Object args = XCDR (predicate);
-      if (!NILP (Fstring_equal (fn, build_pure_c_string("equal"))))
-	pass = ts_predicate_equal (args, captures);
-      else if (!NILP (Fstring_equal (fn, build_pure_c_string("match"))))
-	pass = ts_predicate_match (args, captures);
+      if (!NILP (Fstring_equal (fn, build_pure_c_string ("equal"))))
+	pass = treesit_predicate_equal (args, captures);
+      else if (!NILP (Fstring_equal (fn, build_pure_c_string ("match"))))
+	pass = treesit_predicate_match (args, captures);
       else
 	xsignal3 (Qtreesit_query_error,
 		  build_pure_c_string ("Invalid predicate"),
@@ -2084,9 +2090,9 @@ DEFUN ("treesit-query-compile",
   if (TS_COMPILED_QUERY_P (query))
     return query;
 
-  ts_initialize ();
+  treesit_initialize ();
 
-  Lisp_Object lisp_query = make_ts_query (query, language);
+  Lisp_Object lisp_query = make_treesit_query (query, language);
 
   /* Maybe actually compile. */
   if (NILP (eager))
@@ -2095,10 +2101,11 @@ DEFUN ("treesit-query-compile",
     {
       Lisp_Object signal_symbol = Qnil;
       Lisp_Object signal_data = Qnil;
-      TSQuery *ts_query = ts_ensure_query_compiled (lisp_query, &signal_symbol,
-						    &signal_data);
+      TSQuery *treesit_query = treesit_ensure_query_compiled (lisp_query,
+							 &signal_symbol,
+							 &signal_data);
 
-      if (ts_query == NULL)
+      if (treesit_query == NULL)
 	xsignal (signal_symbol, signal_data);
 
       return lisp_query;
@@ -2162,10 +2169,10 @@ DEFUN ("treesit-query-capture",
 	      list4 (Qor, Qtreesit_node_p, Qtreesit_parser_p, Qsymbolp),
 	      node);
 
-  ts_initialize ();
+  treesit_initialize ();
 
   /* Extract C values from Lisp objects.  */
-  TSNode ts_node = XTS_NODE (lisp_node)->node;
+  TSNode treesit_node = XTS_NODE (lisp_node)->node;
   Lisp_Object lisp_parser = XTS_NODE (lisp_node)->parser;
   ptrdiff_t visible_beg =
     XTS_PARSER (XTS_NODE (lisp_node)->parser)->visible_beg;
@@ -2174,19 +2181,20 @@ DEFUN ("treesit-query-capture",
 
   /* Initialize query objects.  At the end of this block, we should
      have a working TSQuery and a TSQueryCursor.  */
-  TSQuery *ts_query;
+  TSQuery *treesit_query;
   TSQueryCursor *cursor;
   bool needs_to_free_query_and_cursor;
   if (TS_COMPILED_QUERY_P (query))
     {
       Lisp_Object signal_symbol = Qnil;
       Lisp_Object signal_data = Qnil;
-      ts_query = ts_ensure_query_compiled (query, &signal_symbol, &signal_data);
+      treesit_query = treesit_ensure_query_compiled (query, &signal_symbol,
+						     &signal_data);
       cursor = XTS_COMPILED_QUERY (query)->cursor;
       /* We don't need to free ts_query and cursor because they
 	 are stored in a lisp object, which is tracked by gc.  */
       needs_to_free_query_and_cursor = false;
-      if (ts_query == NULL)
+      if (treesit_query == NULL)
 	xsignal (signal_symbol, signal_data);
     }
   else
@@ -2198,16 +2206,16 @@ DEFUN ("treesit-query-capture",
       char *query_string = SSDATA (query);
       uint32_t error_offset;
       TSQueryError error_type;
-      ts_query = ts_query_new (lang, query_string, strlen (query_string),
+      treesit_query = ts_query_new (lang, query_string, strlen (query_string),
 			       &error_offset, &error_type);
-      if (ts_query == NULL)
+      if (treesit_query == NULL)
 	xsignal (Qtreesit_query_error,
-		 ts_compose_query_signal_data (error_offset, error_type));
+		 treesit_compose_query_signal_data (error_offset, error_type));
       cursor = ts_query_cursor_new ();
       needs_to_free_query_and_cursor = true;
     }
 
-  /* WARN: After this point, free ts_query and cursor before every
+  /* WARN: After this point, free treesit_query and cursor before every
      signal and return.  */
 
   /* Set query range. */
@@ -2221,7 +2229,7 @@ DEFUN ("treesit-query-capture",
     }
 
   /* Execute query.  */
-  ts_query_cursor_exec (cursor, ts_query, ts_node);
+  ts_query_cursor_exec (cursor, treesit_query, treesit_node);
   TSQueryMatch match;
 
   /* Go over each match, collect captures and predicates.  Include the
@@ -2245,13 +2253,14 @@ DEFUN ("treesit-query-capture",
 	{
 	  uint32_t capture_name_len;
 	  TSQueryCapture capture = captures[idx];
-	  Lisp_Object captured_node = make_ts_node(lisp_parser, capture.node);
+	  Lisp_Object captured_node = make_treesit_node (lisp_parser,
+							 capture.node);
 
 	  Lisp_Object cap;
 	  if (NILP (node_only))
 	    {
 	      const char *capture_name =
-		ts_query_capture_name_for_id (ts_query, capture.index,
+		ts_query_capture_name_for_id (treesit_query, capture.index,
 					      &capture_name_len);
 	      cap = Fcons (intern_c_string_1 (capture_name, capture_name_len),
 			   captured_node);
@@ -2263,11 +2272,11 @@ DEFUN ("treesit-query-capture",
 	}
       /* Get predicates.  */
       Lisp_Object predicates =
-	ts_predicates_for_pattern (ts_query, match.pattern_index);
+	treesit_predicates_for_pattern (treesit_query, match.pattern_index);
 
       /* captures_lisp = Fnreverse (captures_lisp); */
       struct capture_range captures_range = { result, prev_result };
-      if (!ts_eval_predicates (captures_range, predicates))
+      if (!treesit_eval_predicates (captures_range, predicates))
 	{
 	  /* Predicates didn't pass, roll back.  */
 	  result = prev_result;
@@ -2275,7 +2284,7 @@ DEFUN ("treesit-query-capture",
     }
   if (needs_to_free_query_and_cursor)
     {
-      ts_query_delete (ts_query);
+      ts_query_delete (treesit_query);
       ts_query_cursor_delete (cursor);
     }
   return Fnreverse (result);
@@ -2287,7 +2296,7 @@ DEFUN ("treesit-query-capture",
    controls the direction and NAMED controls the nameness.
  */
 static TSNode
-ts_traverse_sibling_helper (TSNode node, bool forward, bool named)
+treesit_traverse_sibling_helper (TSNode node, bool forward, bool named)
 {
   if (forward)
     {
@@ -2308,7 +2317,8 @@ ts_traverse_sibling_helper (TSNode node, bool forward, bool named)
 /* Return true if NODE matches PRED.  PRED can be a string or a
    function.  This function doesn't check for PRED's type.  */
 static bool
-ts_traverse_match_predicate (TSNode node, Lisp_Object pred, Lisp_Object parser)
+treesit_traverse_match_predicate (TSNode node, Lisp_Object pred,
+				  Lisp_Object parser)
 {
   if (STRINGP (pred))
     {
@@ -2317,7 +2327,7 @@ ts_traverse_match_predicate (TSNode node, Lisp_Object pred, Lisp_Object parser)
     }
   else
     {
-      Lisp_Object lisp_node = make_ts_node (parser, node);
+      Lisp_Object lisp_node = make_treesit_node (parser, node);
       return !NILP (CALLN (Ffuncall, pred, lisp_node));
     }
 
@@ -2337,16 +2347,16 @@ ts_traverse_match_predicate (TSNode node, Lisp_Object pred, Lisp_Object parser)
    is true, only traverse named nodes, if false, all nodes.  If
    SKIP_ROOT is true, don't match ROOT.  */
 static bool
-ts_search_dfs (TSNode *root, Lisp_Object pred, Lisp_Object parser,
-	       bool named, bool forward, ptrdiff_t limit, bool no_limit,
-	       bool skip_root)
+treesit_search_dfs (TSNode *root, Lisp_Object pred, Lisp_Object parser,
+		    bool named, bool forward, ptrdiff_t limit, bool no_limit,
+		    bool skip_root)
 {
   /* TSTreeCursor doesn't allow us to move backward, so we can't use
      it.  We could use limit == -1 to indicate no_limit == true, but
      separating them is safer.  */
   TSNode node = *root;
 
-  if (!skip_root && ts_traverse_match_predicate (node, pred, parser))
+  if (!skip_root && treesit_traverse_match_predicate (node, pred, parser))
     {
       *root = node;
       return true;
@@ -2357,15 +2367,15 @@ ts_search_dfs (TSNode *root, Lisp_Object pred, Lisp_Object parser,
   else
     {
       int count =
-	named ? ts_node_named_child_count(node) : ts_node_child_count (node);
+	named ? ts_node_named_child_count (node) : ts_node_child_count (node);
       for (int offset = 0; offset < count; offset++)
 	{
 	  uint32_t idx = forward ? offset : count - offset - 1;
 	  TSNode child = ts_node_child (node, idx);
 
 	  if (!ts_node_is_null (child)
-	      && ts_search_dfs (&child, pred, parser, named,
-				forward, limit - 1, no_limit, false))
+	      && treesit_search_dfs (&child, pred, parser, named,
+				     forward, limit - 1, no_limit, false))
 	    {
 	      *root = child;
 	      return true;
@@ -2381,31 +2391,32 @@ ts_search_dfs (TSNode *root, Lisp_Object pred, Lisp_Object parser,
    sibling and parents.  If SKIP_START is true, don'tt match
    START.  */
 static bool
-ts_search_forward (TSNode *start, Lisp_Object pred, Lisp_Object parser,
-		   bool named, bool forward, bool up_only, bool skip_start)
+treesit_search_forward (TSNode *start, Lisp_Object pred, Lisp_Object parser,
+			bool named, bool forward, bool up_only, bool skip_start)
 {
   TSNode node = *start;
 
   if (!up_only
-      && ts_search_dfs (start, pred, parser, named, forward, 0, true,
-			skip_start))
+      && treesit_search_dfs (start, pred, parser, named, forward, 0, true,
+			     skip_start))
     return true;
 
-  TSNode next = ts_traverse_sibling_helper (node, forward, named);
+  TSNode next = treesit_traverse_sibling_helper (node, forward, named);
   while (ts_node_is_null (next))
     {
       node = ts_node_parent (node);
       if (ts_node_is_null (node))
 	return false;
 
-      if (ts_traverse_match_predicate (node, pred, parser))
+      if (treesit_traverse_match_predicate (node, pred, parser))
 	{
 	  *start = node;
 	  return true;
 	}
-      next = ts_traverse_sibling_helper (node, forward, named);
+      next = treesit_traverse_sibling_helper (node, forward, named);
     }
-  if (ts_search_forward (&next, pred, parser, named, forward, up_only, false))
+  if (treesit_search_forward (&next, pred, parser, named, forward, up_only,
+			      false))
     {
       *start = next;
       return true;
@@ -2448,13 +2459,13 @@ DEFUN ("treesit-search-subtree",
       the_limit = XFIXNUM (limit);
     }
 
-  ts_initialize ();
+  treesit_initialize ();
 
-  TSNode ts_node = XTS_NODE (node)->node;
+  TSNode treesit_node = XTS_NODE (node)->node;
   Lisp_Object parser = XTS_NODE (node)->parser;
-  if (ts_search_dfs (&ts_node, predicate, parser, NILP (all),
-		     NILP (backward), the_limit, no_limit, false))
-    return make_ts_node (parser, ts_node);
+  if (treesit_search_dfs (&treesit_node, predicate, parser, NILP (all),
+			  NILP (backward), the_limit, no_limit, false))
+    return make_treesit_node (parser, treesit_node);
   else
     return Qnil;
 }
@@ -2498,13 +2509,13 @@ DEFUN ("treesit-search-forward",
   CHECK_SYMBOL (backward);
   CHECK_SYMBOL (up);
 
-  ts_initialize ();
+  treesit_initialize ();
 
-  TSNode ts_start = XTS_NODE (start)->node;
+  TSNode treesit_start = XTS_NODE (start)->node;
   Lisp_Object parser = XTS_NODE (start)->parser;
-  if (ts_search_forward (&ts_start, predicate, parser, NILP (all),
-			 NILP (backward), !NILP (up), true))
-    return make_ts_node (parser, ts_start);
+  if (treesit_search_forward (&treesit_start, predicate, parser, NILP (all),
+			      NILP (backward), !NILP (up), true))
+    return make_treesit_node (parser, treesit_start);
   else
     return Qnil;
 }
@@ -2514,18 +2525,18 @@ DEFUN ("treesit-search-forward",
    Note that the top-level children list is reversed, because
    reasons.  */
 static void
-ts_build_sparse_tree (TSTreeCursor *cursor, Lisp_Object parent,
-		      Lisp_Object pred, Lisp_Object process_fn, ptrdiff_t limit,
-		      bool no_limit, Lisp_Object parser)
+treesit_build_sparse_tree (TSTreeCursor *cursor, Lisp_Object parent,
+			   Lisp_Object pred, Lisp_Object process_fn,
+			   ptrdiff_t limit, bool no_limit, Lisp_Object parser)
 {
 
   TSNode node = ts_tree_cursor_current_node (cursor);
-  bool match = ts_traverse_match_predicate (node, pred, parser);
+  bool match = treesit_traverse_match_predicate (node, pred, parser);
   if (match)
     {
       /* If this node matches pred, add a new node to the parent's
 	 children list.  */
-      Lisp_Object lisp_node = make_ts_node (parser, node);
+      Lisp_Object lisp_node = make_treesit_node (parser, node);
       if (!NILP (process_fn))
 	lisp_node = CALLN (Ffuncall, process_fn, lisp_node);
 
@@ -2543,8 +2554,8 @@ ts_build_sparse_tree (TSTreeCursor *cursor, Lisp_Object parent,
 	  /* Make sure not to use node after the recursive funcall.
 	     Then C compilers should be smart enough not to copy NODE
 	     to stack.  */
-	  ts_build_sparse_tree (cursor, parent, pred, process_fn,
-				limit - 1, no_limit, parser);
+	  treesit_build_sparse_tree (cursor, parent, pred, process_fn,
+				     limit - 1, no_limit, parser);
 	}
       while (ts_tree_cursor_goto_next_sibling (cursor));
       /* Don't forget to come back to this node.  */
@@ -2617,13 +2628,13 @@ DEFUN ("treesit-induce-sparse-tree",
       the_limit = XFIXNUM (limit);
     }
 
-  ts_initialize ();
+  treesit_initialize ();
 
   TSTreeCursor cursor = ts_tree_cursor_new (XTS_NODE (root)->node);
   Lisp_Object parser = XTS_NODE (root)->parser;
   Lisp_Object parent = Fcons (Qnil, Qnil);
-  ts_build_sparse_tree (&cursor, parent, predicate, process_fn,
-			the_limit, no_limit, parser);
+  treesit_build_sparse_tree (&cursor, parent, predicate, process_fn,
+			     the_limit, no_limit, parser);
   Fsetcdr (parent, Fnreverse (Fcdr (parent)));
   if (NILP (Fcdr (parent)))
     return Qnil;
diff --git a/src/treesit.h b/src/treesit.h
index ebde6ccf67..e609ad46b0 100644
--- a/src/treesit.h
+++ b/src/treesit.h
@@ -58,7 +58,7 @@ #define EMACS_TREESIT_H
   ptrdiff_t visible_beg;
   ptrdiff_t visible_end;
   /* This counter is incremented every time a change is made to the
-     buffer in ts_record_change.  The node retrieved from this parser
+     buffer in treesit_record_change.  The node retrieved from this parser
      inherits this timestamp.  This way we can make sure the node is
      not outdated when we access its information.  */
   ptrdiff_t timestamp;
@@ -170,19 +170,19 @@ CHECK_TS_COMPILED_QUERY (Lisp_Object query)
 }
 
 void
-ts_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
-		  ptrdiff_t new_end_byte);
+treesit_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
+		       ptrdiff_t new_end_byte);
 
 Lisp_Object
-make_ts_parser (Lisp_Object buffer, TSParser *parser,
-		TSTree *tree, Lisp_Object language_symbol);
+make_treesit_parser (Lisp_Object buffer, TSParser *parser,
+		     TSTree *tree, Lisp_Object language_symbol);
 
 Lisp_Object
-make_ts_node (Lisp_Object parser, TSNode node);
+make_treesit_node (Lisp_Object parser, TSNode node);
 
-extern void ts_delete_parser (struct Lisp_TS_Parser *);
-extern void ts_delete_query (struct Lisp_TS_Query *);
-extern bool ts_named_node_p (TSNode);
+extern void treesit_delete_parser (struct Lisp_TS_Parser *);
+extern void treesit_delete_query (struct Lisp_TS_Query *);
+extern bool treesit_named_node_p (TSNode);
 
 extern void syms_of_treesit (void);
 

commit 170924e945f4cceda12b5e1681391c3b828a3dec
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Oct 17 01:47:01 2022 -0700

    Fix js/ts tree-sitter template_string font-lock
    
    * lisp/progmodes/js.el (js--treesit-settings): Fontify
    template_strings with js--fontify-template-string.
    (js--fontify-template-string): New function.
    (js--json-treesit-settings): Add missing :feature flag.
    * lisp/progmodes/ts-mode.el (ts-mode--settings): Fontify
    template_strings with js--fontify-template-string.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 18499a466a..667416852e 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3461,10 +3461,7 @@ js--treesit-settings
    :language 'javascript
    :feature 'basic
    :override t
-   `(;; Everything overrides template string.
-     (template_string) @font-lock-string-face
-
-     ((identifier) @font-lock-constant-face
+   `(((identifier) @font-lock-constant-face
       (:match "^[A-Z_][A-Z_\\d]*$" @font-lock-constant-face))
 
      (new_expression
@@ -3561,8 +3558,27 @@ js--treesit-settings
      (comment) @font-lock-comment-face
      [,@js--treesit-keywords] @font-lock-keyword-face
 
+     (template_string) @js--fontify-template-string
      (template_substitution ["${" "}"] @font-lock-constant-face))))
 
+(defun js--fontify-template-string (beg end node)
+  "Fontify template string but not substitution inside it.
+BEG, END, NODE refers to the template_string node."
+  (ignore end)
+  ;; You would have thought that the children of the string node spans
+  ;; the whole string.  No, the children of the template_string only
+  ;; includes the starting "`", any template_substitution, and the
+  ;; closing "`".  That's why we have to track BEG instead of just
+  ;; fontifying each child.
+  (let ((child (treesit-node-child node 0)))
+    (while child
+      (if (equal (treesit-node-type child) "template_substitution")
+          (put-text-property beg (treesit-node-start child)
+                             'face 'font-lock-string-face)
+        (put-text-property beg (treesit-node-end child)
+                           'face 'font-lock-string-face))
+      (setq beg (treesit-node-end child)
+            child (treesit-node-next-sibling child)))))
 
 (defun js-treesit-current-defun ()
   "Return name of surrounding function.
@@ -3748,6 +3764,7 @@ js-json-use-tree-sitter
 (defvar js--json-treesit-settings
   (treesit-font-lock-rules
    :language 'json
+   :feature 'basic
    :override t
    `(
      (pair
diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el
index 10d4b7bd18..6e4aeebde8 100644
--- a/lisp/progmodes/ts-mode.el
+++ b/lisp/progmodes/ts-mode.el
@@ -109,10 +109,7 @@ ts-mode--settings
    :language 'tsx
    :override t
    :feature 'basic
-   '(
-     (template_string) @font-lock-string-face
-
-     ((identifier) @font-lock-constant-face
+   '(((identifier) @font-lock-constant-face
       (:match "^[A-Z_][A-Z_\\d]*$" @font-lock-constant-face))
 
      (nested_type_identifier
@@ -223,8 +220,8 @@ ts-mode--settings
      (number) @font-lock-constant-face
 
      (string) @font-lock-string-face
-     (template_string) @font-lock-string-face
 
+     (template_string) @js--fontify-template-string
      (template_substitution
       ["${" "}"] @font-lock-constant-face)
 

commit 85d0c11119fbd14d508d228f5edf4cf53fb4e4cb
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Oct 16 22:30:16 2022 -0700

    ; * src/treesit.c (ts_search_dfs): Fix tab inline.
    
    Introduced by c6dce90d7e5 which is a format-fix so I think it's fine
    to fix this as a standalone change?

diff --git a/src/treesit.c b/src/treesit.c
index df974f7bf2..7b80ea71d7 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2357,7 +2357,7 @@ ts_search_dfs (TSNode *root, Lisp_Object pred, Lisp_Object parser,
   else
     {
       int count =
-	named ?	ts_node_named_child_count( node) : ts_node_child_count (node);
+	named ? ts_node_named_child_count(node) : ts_node_child_count (node);
       for (int offset = 0; offset < count; offset++)
 	{
 	  uint32_t idx = forward ? offset : count - offset - 1;

commit 2349ecb3216bb9f7808ac58e5ce6abd6bcf90387
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Oct 16 22:29:15 2022 -0700

    ; * src/treesit.c: Change commentary to reflect recent changes.

diff --git a/src/treesit.c b/src/treesit.c
index 10af37981b..df974f7bf2 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -328,8 +328,10 @@ #define ts_tree_root_node fn_ts_tree_root_node
 
    Initializing tree-sitter: there are two entry points to tree-sitter
    functions: 'treesit-parser-create' and
-   'treesit-language-available-p'.  Therefore we only need to call
-   initialization function in those two functions.
+   'treesit-language-available-p'.  Technically we only need to call
+   initialization function in those two functions, but in reality we
+   check at the beginning of every lisp function.  That should be more
+   fool-proof.
 
    Tree-sitter offset (0-based) and buffer position (1-based):
      tree-sitter offset + buffer position = buffer position

commit bd13ce184bfaf43f905faff64c5306ff3518f892
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Oct 15 16:14:02 2022 -0700

    * lisp/treesit.el (treesit-font-lock-rules): Warn about :feature.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 004e79b40e..86da9e1586 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -414,6 +414,9 @@ treesit-font-lock-rules
            (when (null current-language)
              (signal 'treesit-font-lock-error
                      `("Language unspecified, use :language keyword to specify a language for this query" ,token)))
+           (when (null current-feature)
+             (signal 'treesit-font-lock-error
+                     `("Feature unspecified, use :feature keyword to specify the feature name for this query" ,token)))
            (if (treesit-compiled-query-p token)
                (push `(,current-language token) result)
              (push `(,(treesit-query-compile current-language token)

commit 260e47e9a3c9b3baecef81e69c218989dc0cd7a4
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Mon Oct 17 10:54:55 2022 +0300

    ; Fix doc strings in treesit.c
    
    * src/treesit.c (Ftreesit_language_version)
    (Ftreesit_parser_create, Ftreesit_parser_delete)
    (Ftreesit_parser_language, Ftreesit_parser_set_included_ranges)
    (Ftreesit_parser_included_ranges, Ftreesit_node_start)
    (Ftreesit_node_end, Ftreesit_node_parent, Ftreesit_node_child)
    (Ftreesit_node_check, Ftreesit_node_field_name_for_child)
    (Ftreesit_node_child_by_field_name, Ftreesit_node_next_sibling)
    (Ftreesit_node_prev_sibling, Ftreesit_node_first_child_for_pos)
    (Ftreesit_node_descendant_for_range, Ftreesit_pattern_expand)
    (Ftreesit_query_expand, Ftreesit_query_compile)
    (Ftreesit_query_capture, Ftreesit_search_subtree)
    (Ftreesit_search_forward, Ftreesit_induce_sparse_tree)
    (syms_of_treesit): Doc string fixes.

diff --git a/src/treesit.c b/src/treesit.c
index 1170a2fa7b..10af37981b 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -611,8 +611,12 @@ DEFUN ("treesit-language-version",
        Ftreesit_language_version,
        Streesit_language_version,
        0, 1, 0,
-       doc: /* Return the language version of tree-sitter library.
-If MIN-COMPATIBLE is non-nil, return the minimal compatible version.  */)
+       doc: /* Return the language ABI version of the tree-sitter library.
+
+By default, report the latest ABI version supported by the library for
+loading language support modules.  The library is backward-compatible
+with language modules which use older ABI versions; if MIN-COMPATIBLE
+is non-nil, return the oldest compatible ABI version.  */)
   (Lisp_Object min_compatible)
 {
   if (NILP (min_compatible))
@@ -1104,10 +1108,12 @@ DEFUN ("treesit-parser-create",
        1, 3, 0,
        doc: /* Create and return a parser in BUFFER for LANGUAGE.
 
-The parser is automatically added to BUFFER's `treesit-parser-list'.
-LANGUAGE is a language symbol.  If BUFFER is nil, use the current
-buffer.  If BUFFER already has a parser for LANGUAGE, return that
-parser.  If NO-REUSE is non-nil, always create a new parser.  */)
+The parser is automatically added to BUFFER's parser list, as
+returned by `treesit-parser-list'.
+LANGUAGE is a language symbol.  If BUFFER is nil or omitted, it
+defaults to the current buffer.  If BUFFER already has a parser for
+LANGUAGE, return that parser, but if NO-REUSE is non-nil, always
+create a new parser.  */)
   (Lisp_Object language, Lisp_Object buffer, Lisp_Object no_reuse)
 {
   ts_initialize ();
@@ -1158,7 +1164,8 @@ DEFUN ("treesit-parser-create",
 DEFUN ("treesit-parser-delete",
        Ftreesit_parser_delete, Streesit_parser_delete,
        1, 1, 0,
-       doc: /* Delete PARSER from its buffer.  */)
+       doc: /* Delete PARSER from its buffer's parser list.
+See `treesit-parser-list' for the buffer's parser list.  */)
   (Lisp_Object parser)
 {
   ts_check_parser (parser);
@@ -1213,7 +1220,7 @@ DEFUN ("treesit-parser-buffer",
 DEFUN ("treesit-parser-language",
        Ftreesit_parser_language, Streesit_parser_language,
        1, 1, 0,
-       doc: /* Return parser's language symbol.
+       doc: /* Return PARSER's language symbol.
 This symbol is the one used to create the parser.  */)
   (Lisp_Object parser)
 {
@@ -1269,11 +1276,11 @@ DEFUN ("treesit-parser-set-included-ranges",
        2, 2, 0,
        doc: /* Limit PARSER to RANGES.
 
-RANGES is a list of (BEG . END), each (BEG . END) confines a range in
-which the parser should operate in.  Each range must not overlap, and
-each range should come in order.  Signal `treesit-set-range-error'
+RANGES is a list of (BEG . END), each (BEG . END) defines a region in
+which the parser should operate.  Regions must not overlap, and the
+regions should come in order in the list.  Signal `treesit-set-range-error'
 if the argument is invalid, or something else went wrong.  If RANGES
-is nil, set PARSER to parse the whole buffer.  */)
+is nil, the PARSER is to parse the whole buffer.  */)
   (Lisp_Object parser, Lisp_Object ranges)
 {
   ts_check_parser (parser);
@@ -1340,7 +1347,8 @@ DEFUN ("treesit-parser-included-ranges",
        Streesit_parser_included_ranges,
        1, 1, 0,
        doc: /* Return the ranges set for PARSER.
-See `treesit-parser-set-ranges'.  If no range is set, return nil.  */)
+See `treesit-parser-set-ranges'.  If no ranges are set for PARSER,
+return nil.  */)
   (Lisp_Object parser)
 {
   ts_check_parser (parser);
@@ -1413,7 +1421,7 @@ DEFUN ("treesit-node-type",
 
 DEFUN ("treesit-node-start",
        Ftreesit_node_start, Streesit_node_start, 1, 1, 0,
-       doc: /* Return the NODE's start position.
+       doc: /* Return the NODE's start position in its buffer.
 If NODE is nil, return nil.  */)
   (Lisp_Object node)
 {
@@ -1433,7 +1441,7 @@ DEFUN ("treesit-node-start",
 
 DEFUN ("treesit-node-end",
        Ftreesit_node_end, Streesit_node_end, 1, 1, 0,
-       doc: /* Return the NODE's end position.
+       doc: /* Return the NODE's end position in its buffer.
 If NODE is nil, return nil.  */)
   (Lisp_Object node)
 {
@@ -1469,7 +1477,7 @@ DEFUN ("treesit-node-string",
 DEFUN ("treesit-node-parent",
        Ftreesit_node_parent, Streesit_node_parent, 1, 1, 0,
        doc: /* Return the immediate parent of NODE.
-Return nil if there isn't any.  If NODE is nil, return nil.  */)
+Return nil if NODE has no parent.  If NODE is nil, return nil.  */)
   (Lisp_Object node)
 {
   if (NILP (node)) return Qnil;
@@ -1489,7 +1497,7 @@ DEFUN ("treesit-node-child",
        Ftreesit_node_child, Streesit_node_child, 2, 3, 0,
        doc: /* Return the Nth child of NODE.
 
-Return nil if there isn't any.  If NAMED is non-nil, look for named
+Return nil if there is no Nth child.  If NAMED is non-nil, look for named
 child only.  NAMED defaults to nil.  If NODE is nil, return nil.  */)
   (Lisp_Object node, Lisp_Object n, Lisp_Object named)
 {
@@ -1519,6 +1527,7 @@ DEFUN ("treesit-node-check",
        doc: /* Return non-nil if NODE has PROPERTY, nil otherwise.
 
 PROPERTY could be `named', `missing', `extra', `has-changes', or `has-error'.
+
 Named nodes correspond to named rules in the language definition,
 whereas "anonymous" nodes correspond to string literals in the
 language definition.
@@ -1564,7 +1573,7 @@ DEFUN ("treesit-node-field-name-for-child",
        Streesit_node_field_name_for_child, 2, 2, 0,
        doc: /* Return the field name of the Nth child of NODE.
 
-Return nil if not any child or no field is found.
+Return nil if there's no Nth child, or if it has no field.
 If NODE is nil, return nil.  */)
   (Lisp_Object node, Lisp_Object n)
 {
@@ -1614,7 +1623,7 @@ DEFUN ("treesit-node-child-by-field-name",
        Ftreesit_node_child_by_field_name,
        Streesit_node_child_by_field_name, 2, 2, 0,
        doc: /* Return the child of NODE with FIELD-NAME.
-Return nil if there isn't any.  If NODE is nil, return nil.  */)
+Return nil if there is no such child.  If NODE is nil, return nil.  */)
   (Lisp_Object node, Lisp_Object field_name)
 {
   if (NILP (node))
@@ -1639,7 +1648,7 @@ DEFUN ("treesit-node-next-sibling",
        Streesit_node_next_sibling, 1, 2, 0,
        doc: /* Return the next sibling of NODE.
 
-Return nil if there isn't any.  If NAMED is non-nil, look for named
+Return nil if there is no next sibling.  If NAMED is non-nil, look for named
 siblings only.  NAMED defaults to nil.  If NODE is nil, return nil.  */)
   (Lisp_Object node, Lisp_Object named)
 {
@@ -1665,8 +1674,9 @@ DEFUN ("treesit-node-prev-sibling",
        Streesit_node_prev_sibling, 1, 2, 0,
        doc: /* Return the previous sibling of NODE.
 
-Return nil if there isn't any.  If NAMED is non-nil, look for named
-siblings only.  NAMED defaults to nil.  If NODE is nil, return nil.  */)
+Return nil if there is no previous sibling.  If NAMED is non-nil, look
+for named siblings only.  NAMED defaults to nil.  If NODE is nil,
+return nil.  */)
   (Lisp_Object node, Lisp_Object named)
 {
   if (NILP (node)) return Qnil;
@@ -1690,12 +1700,12 @@ DEFUN ("treesit-node-prev-sibling",
 DEFUN ("treesit-node-first-child-for-pos",
        Ftreesit_node_first_child_for_pos,
        Streesit_node_first_child_for_pos, 2, 3, 0,
-       doc: /* Return the first child of NODE on POS.
+       doc: /* Return the first child of NODE for buffer position POS.
 
-Specifically, return the first child that extends beyond POS.  POS is
-a position in the buffer.  Return nil if there isn't any.  If NAMED is
-non-nil, look for named children only.  NAMED defaults to nil.  Note that
-this function returns an immediate child, not the smallest
+Specifically, return the first child that extends beyond POS.
+Return nil if there is no such child.
+If NAMED is non-nil, look for named children only.  NAMED defaults to nil.
+Note that this function returns an immediate child, not the smallest
 (grand)child.  If NODE is nil, return nil.  */)
   (Lisp_Object node, Lisp_Object pos, Lisp_Object named)
 {
@@ -1730,11 +1740,12 @@ DEFUN ("treesit-node-first-child-for-pos",
 DEFUN ("treesit-node-descendant-for-range",
        Ftreesit_node_descendant_for_range,
        Streesit_node_descendant_for_range, 3, 4, 0,
-       doc: /* Return the smallest node that covers BEG to END.
+       doc: /* Return the smallest node that covers buffer positions BEG to END.
 
-The returned node is a descendant of NODE.  POS is a position.  Return
-nil if there isn't any.  If NAMED is non-nil, look for named child
-only.  NAMED defaults to nil.  If NODE is nil, return nil.  */)
+The returned node is a descendant of NODE.
+Return nil if there is no such node.
+If NAMED is non-nil, look for named child only.  NAMED defaults to nil.
+If NODE is nil, return nil.  */)
   (Lisp_Object node, Lisp_Object beg, Lisp_Object end, Lisp_Object named)
 {
   if (NILP (node)) return Qnil;
@@ -1815,8 +1826,7 @@ DEFUN ("treesit-pattern-expand",
     _
     \"TYPE\"
 
-Consult Info node `(elisp)Pattern Matching' form detailed
-explanation.  */)
+See Info node `(elisp)Pattern Matching' for detailed explanation.  */)
   (Lisp_Object pattern)
 {
   if (EQ (pattern, intern_c_string (":anchor")))
@@ -1865,8 +1875,7 @@ DEFUN ("treesit-query-expand",
     _
     \"TYPE\"
 
-Consult Info node `(elisp)Pattern Matching' form detailed
-explanation.  */)
+See Info node `(elisp)Pattern Matching' for detailed explanation.  */)
   (Lisp_Object query)
 {
   return Fmapconcat (intern_c_string ("treesit-pattern-expand"),
@@ -2056,15 +2065,15 @@ DEFUN ("treesit-query-compile",
        Streesit_query_compile, 2, 3, 0,
        doc: /* Compile QUERY to a compiled query.
 
-Querying a compiled query is much faster than an uncompiled one.
+Querying with a compiled query is much faster than an uncompiled one.
 LANGUAGE is the language this query is for.
 
 If EAGER is non-nil, immediately load LANGUAGE and compile the query.
-Otherwise defer until the query is first used.
+Otherwise defer the compilation until the query is first used.
 
 Signals treesit-query-error if QUERY is malformed or something else
-goes wrong.  (This of course would only happen if EAGER is non-nil.)
-You can use `treesit-query-validate' to debug the query.  */)
+goes wrong.  (This only happens if EAGER is non-nil.)
+You can use `treesit-query-validate' to validate and debug a query.  */)
   (Lisp_Object language, Lisp_Object query, Lisp_Object eager)
 {
   if (NILP (Ftreesit_query_p (query)))
@@ -2104,21 +2113,24 @@ DEFUN ("treesit-query-capture",
 
 QUERY is either a string query, a sexp query, or a compiled query.
 See Info node `(elisp)Pattern Matching' for how to write a query in
-either string or s-expression form.  When using repeatedly, a compiled
-query is much faster than a string or sexp one, so it is recommend to
-compile your queries if it will be used over and over.
+either string or sexp form.  When using repeatedly, a compiled query
+is much faster than a string or sexp one, so it is recommend to
+compile your query if it will be used repeatedly.
 
-BEG and END, if both non-nil, specifies the range in which the query
-is executed.  If NODE-ONLY is non-nil, return a list of nodes.
+BEG and END, if both non-nil, specify the region  of buffer positions
+in which the query is executed.
 
-Besides a node, NODE can also be a parser, then the root node of that
-parser is used; NODE can be a language symbol, then the root node of a
+If NODE-ONLY is non-nil, return a list of nodes.
+
+Besides a node, NODE can also be a parser, in which case the root node
+of that parser is used.
+NODE can also be a language symbol, in which case the root node of a
 parser for that language is used.  If such a parser doesn't exist, it
 is created.
 
-Signals treesit-query-error if QUERY is malformed or something else
-goes wrong.  You can use `treesit-query-validate' to debug the
-query.  */)
+Signal `treesit-query-error' if QUERY is malformed or something else
+goes wrong.  You can use `treesit-query-validate' to validate and debug
+the query.  */)
   (Lisp_Object node, Lisp_Object query,
    Lisp_Object beg, Lisp_Object end, Lisp_Object node_only)
 {
@@ -2403,16 +2415,16 @@ ts_search_forward (TSNode *start, Lisp_Object pred, Lisp_Object parser,
 DEFUN ("treesit-search-subtree",
        Ftreesit_search_subtree,
        Streesit_search_subtree, 2, 5, 0,
-       doc: /* Traverse the parse tree depth-first.
+       doc: /* Traverse the parse tree of NODE depth-first using PREDICATE.
 
 Traverse the subtree of NODE, and match PREDICATE with each node along
 the way.  PREDICATE is a regexp string that matches against each
 node's type case-insensitively, or a function that takes a node and
 returns nil/non-nil.
 
-By default, only traverse named nodes, if ALL is non-nil, traverse all
-nodes.  If BACKWARD is non-nil, traverse backwards.  If LIMIT is
-non-nil, we only traverse that number of levels down in the tree.
+By default, only traverse named nodes, but if ALL is non-nil, traverse
+all nodes.  If BACKWARD is non-nil, traverse backwards.  If LIMIT is
+non-nil, only traverse nodes up to that number of levels down in the tree.
 
 Return the first matched node, or nil if none matches.  */)
   (Lisp_Object node, Lisp_Object predicate, Lisp_Object all,
@@ -2448,20 +2460,20 @@ DEFUN ("treesit-search-subtree",
 DEFUN ("treesit-search-forward",
        Ftreesit_search_forward,
        Streesit_search_forward, 2, 5, 0,
-       doc: /* Search for node in the parse tree.
+       doc: /* Search for node matching PREDICATE in the parse tree of START.
 
 Start traversing the tree from node START, and match PREDICATE with
-each node along the way (except START).  PREDICATE is a regexp string
-that matches against each node's type case-insensitively, or a
-function that takes a node and returns nil/non-nil.
+each node (except START itself) along the way.  PREDICATE is a regexp
+string that matches against each node's type case-insensitively, or a
+function that takes a node and returns non-nil if it matches.
 
-By default, only search for named nodes, if ALL is non-nil, search for
-all nodes.  If BACKWARD is non-nil, search backwards.
+By default, only search for named nodes, but if ALL is non-nil, search
+for all nodes.  If BACKWARD is non-nil, search backwards.
 
 Return the first matched node, or nil if none matches.
 
-For a tree like the below where START is marked 1, traverse as
-numbered:
+For a tree like below,  where START is marked by 1, traverse in the
+order of numbers:
                 16
                 |
        3--------4-----------8
@@ -2472,8 +2484,8 @@ DEFUN ("treesit-search-forward",
                       |   |    |  |  |
                       10  11   13 14 15
 
-If UP is non-nil, only traverse to siblings and parents.  In that
-case, only 1 3 4 8 16 would be traversed.  */)
+If UP is non-nil, only traverse siblings and parents of START.  In that
+case, only the nodes 1, 3, 4, 8, and 16 would be traversed.  */)
   (Lisp_Object start, Lisp_Object predicate, Lisp_Object all,
    Lisp_Object backward, Lisp_Object up)
 {
@@ -2550,7 +2562,7 @@ DEFUN ("treesit-induce-sparse-tree",
        Streesit_induce_sparse_tree, 2, 4, 0,
        doc: /* Create a sparse tree of ROOT's subtree.
 
-Basically, take the subtree under ROOT, and comb it so only the nodes
+This takes the subtree under ROOT, and combs it so only the nodes
 that match PREDICATE are left, like picking out grapes on the vine.
 PREDICATE is a regexp string that matches against each node's type
 case-insensitively.
@@ -2570,17 +2582,20 @@ DEFUN ("treesit-induce-sparse-tree",
      |  |              |
      e  5              e
 
-If PROCESS-FN is non-nil, instead of returning the matched nodes, pass
-each node to PROCESS-FN use the return value instead.  If non-nil,
-LIMIT is the number of levels to go down from ROOT.
+If PROCESS-FN is non-nil, it should be a function of one argument. In
+that case, instead of returning the matched nodes, pass each node to
+PROCESS-FN, and use its return value instead.
+
+If non-nil, LIMIT is the number of levels to go down the tree from ROOT.
 
 Each node in the returned tree looks like (NODE . (CHILD ...)).  The
-root of this tree might be nil, if ROOT doesn't match PREDICATE.  If
-no node matches PRED, return nil.
+root of this tree might be nil, if ROOT doesn't match PREDICATE.
+
+If no node matches PREDICATE, return nil.
 
 PREDICATE can also be a function that takes a node and returns
-nil/non-nil, but it is slower and more memory consuming than
-regexp.  */)
+nil/non-nil, but it is slower and more memory consuming than using
+a regexp.  */)
   (Lisp_Object root, Lisp_Object predicate, Lisp_Object process_fn,
    Lisp_Object limit)
 {
@@ -2700,23 +2715,24 @@ syms_of_treesit (void)
 libtree-sitter-LANG.EXT, where EXT is the OS specific extension for
 dynamic libraries.  Emacs also assumes that the name of the C function
 the library provides is tree_sitter_LANG.  If that is not the case,
-add an entry
+you can add an entry
 
     (LANG LIBRARY-BASE-NAME FUNCTION-NAME)
 
 to this list, where LIBRARY-BASE-NAME is the filename of the dynamic
-library without extension, FUNCTION-NAME is the function provided by
-the library.  */);
+library without the file-name extension, and FUNCTION-NAME is the
+function provided by the library.  */);
   Vtreesit_load_name_override_list = Qnil;
 
   DEFVAR_LISP ("treesit-extra-load-path",
 	       Vtreesit_extra_load_path,
 	       doc:
-	       /* Extra load paths of tree-sitter language definitions.
+	       /* Additional directories to look for tree-sitter language definitions.
+The value should be a list of directories.
 When trying to load a tree-sitter language definition,
-Emacs looks at directories in this variable,
-`user-emacs-directory'/tree-sitter, and system default locations for
-dynamic libraries, in that order.  */);
+Emacs first looks in the directories mentioned in in this variable,
+then in the `tree-sitter' subdirectory of `user-emacs-directory', and
+then in the system default locations for dynamic libraries, in that order.  */);
   Vtreesit_extra_load_path = Qnil;
 
   defsubr (&Streesit_language_available_p);

commit c6dce90d7e57486db687606bffd92d580a7d25ca
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sun Oct 16 18:09:01 2022 +0300

    ; * src/treesit.c: Fix some indentation problems and doc strings.

diff --git a/src/treesit.c b/src/treesit.c
index b21019c56e..1170a2fa7b 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -430,7 +430,7 @@ ts_initialize (void)
 static void
 ts_symbol_to_c_name (char *symbol_name)
 {
-  for (int idx=0; idx < strlen (symbol_name); idx++)
+  for (int idx = 0; idx < strlen (symbol_name); idx++)
     {
       if (symbol_name[idx] == '-')
 	symbol_name[idx] = '_';
@@ -438,8 +438,8 @@ ts_symbol_to_c_name (char *symbol_name)
 }
 
 static bool
-ts_find_override_name
-(Lisp_Object language_symbol, Lisp_Object *name, Lisp_Object *c_symbol)
+ts_find_override_name (Lisp_Object language_symbol, Lisp_Object *name,
+		       Lisp_Object *c_symbol)
 {
   for (Lisp_Object list = Vtreesit_load_name_override_list;
        !NILP (list); list = XCDR (list))
@@ -459,18 +459,19 @@ ts_symbol_to_c_name (char *symbol_name)
 }
 
 /* For example, if Vdynamic_library_suffixes is (".so", ".dylib"),
-   thsi function pushes "lib_base_name.so" and "lib_base_name.dylib"
-   into *path_candidates. Obiviously path_candidates should be a Lisp
+   this function pushes "lib_base_name.so" and "lib_base_name.dylib"
+   into *path_candidates.  Obiviously path_candidates should be a Lisp
    list of Lisp strings.  */
 static void
-ts_load_language_push_for_each_suffix
-(Lisp_Object lib_base_name, Lisp_Object *path_candidates)
+ts_load_language_push_for_each_suffix (Lisp_Object lib_base_name,
+				       Lisp_Object *path_candidates)
 {
   for (Lisp_Object suffixes = Vdynamic_library_suffixes;
-       !NILP (suffixes); suffixes = XCDR (suffixes)) {
-    *path_candidates = Fcons (concat2 (lib_base_name, XCAR (suffixes)),
-			      *path_candidates);
-  }
+       !NILP (suffixes); suffixes = XCDR (suffixes))
+    {
+      *path_candidates = Fcons (concat2 (lib_base_name, XCAR (suffixes)),
+				*path_candidates);
+    }
 }
 
 /* Load the dynamic library of LANGUAGE_SYMBOL and return the pointer
@@ -486,17 +487,18 @@ ts_load_language (Lisp_Object language_symbol,
 
   /* Figure out the library name and C name.  */
   Lisp_Object lib_base_name =
-    (concat2 (build_pure_c_string ("libtree-sitter-"), symbol_name));
+    concat2 (build_pure_c_string ("libtree-sitter-"), symbol_name);
   Lisp_Object base_name =
-    (concat2 (build_pure_c_string ("tree-sitter-"), symbol_name));
+    concat2 (build_pure_c_string ("tree-sitter-"), symbol_name);
+  /* FIXME: The result of strdup leaks memory in some cases.  */
   char *c_name = strdup (SSDATA (base_name));
   ts_symbol_to_c_name (c_name);
 
   /* Override the library name and C name, if appropriate.  */
   Lisp_Object override_name;
   Lisp_Object override_c_name;
-  bool found_override = ts_find_override_name
-    (language_symbol, &override_name, &override_c_name);
+  bool found_override = ts_find_override_name (language_symbol, &override_name,
+					       &override_c_name);
   if (found_override)
     {
       lib_base_name = override_name;
@@ -507,21 +509,19 @@ ts_load_language (Lisp_Object language_symbol,
   Lisp_Object path_candidates = Qnil;
   /* First push just the filenames to the candidate list, which will
      make dynlib_open look under standard system load paths.  */
-  ts_load_language_push_for_each_suffix
-    (lib_base_name, &path_candidates);
+  ts_load_language_push_for_each_suffix (lib_base_name, &path_candidates);
   /* Then push ~/.emacs.d/tree-sitter paths.  */
-  ts_load_language_push_for_each_suffix
-    (Fexpand_file_name
-     (concat2 (build_string ("tree-sitter/"), lib_base_name),
-      Fsymbol_value (Quser_emacs_directory)),
-     &path_candidates);
+  Lisp_Object lib_name =
+    Fexpand_file_name (concat2 (build_string ("tree-sitter/"), lib_base_name),
+		       Fsymbol_value (Quser_emacs_directory));
+  ts_load_language_push_for_each_suffix (lib_name, &path_candidates);
   /* Then push paths from treesit-extra-load-path.  */
   for (Lisp_Object tail = Freverse (Vtreesit_extra_load_path);
        !NILP (tail); tail = XCDR (tail))
     {
-      ts_load_language_push_for_each_suffix
-	(Fexpand_file_name (lib_base_name, XCAR (tail)),
-	 &path_candidates);
+      ts_load_language_push_for_each_suffix (Fexpand_file_name (lib_base_name,
+								XCAR (tail)),
+					     &path_candidates);
     }
 
   /* Try loading the dynamic library by each path candidate.  Stop
@@ -591,7 +591,7 @@ DEFUN ("treesit-language-available-p",
   ts_initialize ();
   Lisp_Object signal_symbol = Qnil;
   Lisp_Object signal_data = Qnil;
-  if (ts_load_language(language, &signal_symbol, &signal_data) == NULL)
+  if (ts_load_language (language, &signal_symbol, &signal_data) == NULL)
     {
       if (NILP (detail))
 	return Qnil;
@@ -612,7 +612,7 @@ DEFUN ("treesit-language-version",
        Streesit_language_version,
        0, 1, 0,
        doc: /* Return the language version of tree-sitter library.
-If MIN-COMPATIBLE non-nil, return the minimal compatible version.  */)
+If MIN-COMPATIBLE is non-nil, return the minimal compatible version.  */)
   (Lisp_Object min_compatible)
 {
   if (NILP (min_compatible))
@@ -641,6 +641,8 @@ ts_tree_edit_1 (TSTree *tree, ptrdiff_t start_byte,
   eassert (start_byte <= old_end_byte);
   eassert (start_byte <= new_end_byte);
   TSPoint dummy_point = {0, 0};
+  /* FIXME: We should signal an error below if START_BYTE
+     etc. overflow the 32-bit unsigned data type.  */
   TSInputEdit edit = {(uint32_t) start_byte,
 		      (uint32_t) old_end_byte,
 		      (uint32_t) new_end_byte,
@@ -655,8 +657,7 @@ ts_tree_edit_1 (TSTree *tree, ptrdiff_t start_byte,
 ts_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
 		  ptrdiff_t new_end_byte)
 {
-  for (Lisp_Object parser_list
-	 = BVAR (current_buffer, ts_parser_list);
+  for (Lisp_Object parser_list = BVAR (current_buffer, ts_parser_list);
        !NILP (parser_list);
        parser_list = XCDR (parser_list))
     {
@@ -705,20 +706,19 @@ ts_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
 	  if (old_end_byte > new_end_byte)
 	    {
 	      /* Move backward.  */
-	      visi_beg_delta = min (visible_beg, new_end_byte)
-		- min (visible_beg, old_end_byte);
+	      visi_beg_delta =
+		min (visible_beg, new_end_byte)
+		     - min (visible_beg, old_end_byte);
 	    }
 	  else
 	    {
 	      /* Move forward.  */
-	      visi_beg_delta = old_end_byte < visible_beg
-		? new_end_byte - old_end_byte : 0;
+	      visi_beg_delta =
+		old_end_byte < visible_beg ? new_end_byte - old_end_byte : 0;
 	    }
-	  XTS_PARSER (lisp_parser)->visible_beg
-	    = visible_beg + visi_beg_delta;
+	  XTS_PARSER (lisp_parser)->visible_beg = visible_beg + visi_beg_delta;
 	  XTS_PARSER (lisp_parser)->visible_end
-	    = visible_end + visi_beg_delta
-	    + (new_end_offset - old_end_offset);
+	    = visible_end + visi_beg_delta + (new_end_offset - old_end_offset);
 	  eassert (XTS_PARSER (lisp_parser)->visible_beg >= 0);
 	  eassert (XTS_PARSER (lisp_parser)->visible_beg
 		   <= XTS_PARSER (lisp_parser)->visible_end);
@@ -793,8 +793,7 @@ ts_ensure_position_synced (Lisp_Object parser)
 static void
 ts_check_buffer_size (struct buffer *buffer)
 {
-  ptrdiff_t buffer_size =
-    (BUF_Z (buffer) - BUF_BEG (buffer));
+  ptrdiff_t buffer_size = (BUF_Z (buffer) - BUF_BEG (buffer));
   if (buffer_size > UINT32_MAX)
     xsignal2 (Qtreesit_buffer_too_large,
 	      build_pure_c_string ("Buffer size larger than 4GB, size:"),
@@ -845,8 +844,7 @@ ts_ensure_parsed (Lisp_Object parser)
 ts_read_buffer (void *parser, uint32_t byte_index,
 		TSPoint position, uint32_t *bytes_read)
 {
-  struct buffer *buffer =
-    XBUFFER (((struct Lisp_TS_Parser *) parser)->buffer);
+  struct buffer *buffer = XBUFFER (((struct Lisp_TS_Parser *) parser)->buffer);
   ptrdiff_t visible_beg = ((struct Lisp_TS_Parser *) parser)->visible_beg;
   ptrdiff_t visible_end = ((struct Lisp_TS_Parser *) parser)->visible_end;
   ptrdiff_t byte_pos = byte_index + visible_beg;
@@ -894,9 +892,8 @@ ts_read_buffer (void *parser, uint32_t byte_index,
 make_ts_parser (Lisp_Object buffer, TSParser *parser,
 		TSTree *tree, Lisp_Object language_symbol)
 {
-  struct Lisp_TS_Parser *lisp_parser
-    = ALLOCATE_PSEUDOVECTOR
-    (struct Lisp_TS_Parser, buffer, PVEC_TS_PARSER);
+  struct Lisp_TS_Parser *lisp_parser =
+    ALLOCATE_PSEUDOVECTOR (struct Lisp_TS_Parser, buffer, PVEC_TS_PARSER);
 
   lisp_parser->language_symbol = language_symbol;
   lisp_parser->buffer = buffer;
@@ -917,8 +914,8 @@ make_ts_parser (Lisp_Object buffer, TSParser *parser,
 Lisp_Object
 make_ts_node (Lisp_Object parser, TSNode node)
 {
-  struct Lisp_TS_Node *lisp_node
-    = ALLOCATE_PSEUDOVECTOR (struct Lisp_TS_Node, parser, PVEC_TS_NODE);
+  struct Lisp_TS_Node *lisp_node =
+    ALLOCATE_PSEUDOVECTOR (struct Lisp_TS_Node, parser, PVEC_TS_NODE);
   lisp_node->parser = parser;
   lisp_node->node = node;
   lisp_node->timestamp = XTS_PARSER (parser)->timestamp;
@@ -931,9 +928,9 @@ make_ts_node (Lisp_Object parser, TSNode node)
 make_ts_query (Lisp_Object query, Lisp_Object language)
 {
   TSQueryCursor *ts_cursor = ts_query_cursor_new ();
-  struct Lisp_TS_Query *lisp_query
-    = ALLOCATE_PSEUDOVECTOR (struct Lisp_TS_Query, source,
-			     PVEC_TS_COMPILED_QUERY);
+  struct Lisp_TS_Query *lisp_query =
+    ALLOCATE_PSEUDOVECTOR (struct Lisp_TS_Query, source,
+			   PVEC_TS_COMPILED_QUERY);
 
   lisp_query->language = language;
   lisp_query->source = query;
@@ -946,8 +943,8 @@ make_ts_query (Lisp_Object query, Lisp_Object language)
 void
 ts_delete_parser (struct Lisp_TS_Parser *lisp_parser)
 {
-  ts_tree_delete(lisp_parser->tree);
-  ts_parser_delete(lisp_parser->parser);
+  ts_tree_delete (lisp_parser->tree);
+  ts_parser_delete (lisp_parser->parser);
 }
 
 void
@@ -987,11 +984,9 @@ ts_query_error_to_string (TSQueryError error)
 }
 
 static Lisp_Object
-ts_compose_query_signal_data
-(uint32_t error_offset, TSQueryError error_type)
+ts_compose_query_signal_data (uint32_t error_offset, TSQueryError error_type)
 {
-  return list3 (build_string
-		(ts_query_error_to_string (error_type)),
+  return list3 (build_string (ts_query_error_to_string (error_type)),
 		make_fixnum (error_offset + 1),
 		build_pure_c_string("Debug the query with `treesit-query-validate'"));
 }
@@ -1001,8 +996,8 @@ ts_query_error_to_string (TSQueryError error)
    bound.  If error occures, return NULL, and assign SIGNAL_SYMBOL and
    SIGNAL_DATA accordingly.  */
 static TSQuery *
-ts_ensure_query_compiled
-(Lisp_Object query, Lisp_Object *signal_symbol, Lisp_Object *signal_data)
+ts_ensure_query_compiled (Lisp_Object query, Lisp_Object *signal_symbol,
+			  Lisp_Object *signal_data)
 {
   /* If query is already compiled (not null), return that, otherwise
      compile and return it.  */
@@ -1135,9 +1130,7 @@ DEFUN ("treesit-parser-create",
     {
       struct Lisp_TS_Parser *parser = XTS_PARSER (XCAR (tail));
       if (EQ (parser->language_symbol, language))
-	{
-	  return XCAR (tail);
-	}
+	return XCAR (tail);
     }
 
   /* Load language.  */
@@ -1157,8 +1150,7 @@ DEFUN ("treesit-parser-create",
     = make_ts_parser (Fcurrent_buffer (), parser, NULL, language);
 
   /* Update parser-list.  */
-  BVAR (buf, ts_parser_list)
-    = Fcons (lisp_parser, BVAR (buf, ts_parser_list));
+  BVAR (buf, ts_parser_list) = Fcons (lisp_parser, BVAR (buf, ts_parser_list));
 
   return lisp_parser;
 }
@@ -1173,8 +1165,7 @@ DEFUN ("treesit-parser-delete",
 
   Lisp_Object buffer = XTS_PARSER (parser)->buffer;
   struct buffer *buf = XBUFFER (buffer);
-  BVAR (buf, ts_parser_list)
-    = Fdelete (parser, BVAR (buf, ts_parser_list));
+  BVAR (buf, ts_parser_list) = Fdelete (parser, BVAR (buf, ts_parser_list));
 
   XTS_PARSER (parser)->deleted = true;
   return Qnil;
@@ -1255,8 +1246,7 @@ ts_check_range_argument (Lisp_Object ranges)
   ptrdiff_t point_max = BUF_ZV (buffer);
   EMACS_INT last_point = point_min;
 
-  for (Lisp_Object tail = ranges;
-       !NILP (tail); tail = XCDR (tail))
+  for (Lisp_Object tail = ranges; !NILP (tail); tail = XCDR (tail))
     {
       CHECK_CONS (tail);
       Lisp_Object range = XCAR (tail);
@@ -1267,8 +1257,7 @@ ts_check_range_argument (Lisp_Object ranges)
       EMACS_INT end = XFIXNUM (XCDR (range));
       if (!(last_point <= beg && beg <= end && end <= point_max))
 	xsignal2 (Qtreesit_range_invalid,
-		  build_pure_c_string
-		  ("RANGE is either overlapping or out-of-order or out-of-range"),
+		  build_pure_c_string ("RANGE is either overlapping or out-of-order or out-of-range"),
 		  ranges);
       last_point = end;
     }
@@ -1302,32 +1291,35 @@ DEFUN ("treesit-parser-set-included-ranges",
 	 To do that we give tree-sitter a 0 length, the range is a
 	 dummy.  */
       TSRange ts_range = {{0, 0}, {0, 0}, 0, 0};
-      success = ts_parser_set_included_ranges
-	(XTS_PARSER (parser)->parser, &ts_range , 0);
+      success = ts_parser_set_included_ranges (XTS_PARSER (parser)->parser,
+					       &ts_range , 0);
     }
   else
     {
       /* Set ranges for PARSER.  */
       ptrdiff_t len = list_length (ranges);
+      /* FIXME: We should test the return value of malloc below.  */
       TSRange *ts_ranges = malloc (sizeof(TSRange) * len);
       struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
 
-      for (int idx=0; !NILP (ranges); idx++, ranges = XCDR (ranges))
+      for (int idx = 0; !NILP (ranges); idx++, ranges = XCDR (ranges))
 	{
 	  Lisp_Object range = XCAR (ranges);
-	  EMACS_INT beg_byte = buf_charpos_to_bytepos
-	    (buffer, XFIXNUM (XCAR (range)));
-	  EMACS_INT end_byte = buf_charpos_to_bytepos
-	    (buffer, XFIXNUM (XCDR (range)));
+	  EMACS_INT beg_byte = buf_charpos_to_bytepos (buffer,
+						       XFIXNUM (XCAR (range)));
+	  EMACS_INT end_byte = buf_charpos_to_bytepos (buffer,
+						       XFIXNUM (XCDR (range)));
 	  /* We don't care about start and end points, put in dummy
-	     value.  */
+	     values.  */
 	  TSRange rg = {{0,0}, {0,0},
 			(uint32_t) beg_byte - BUF_BEGV_BYTE (buffer),
 			(uint32_t) end_byte - BUF_BEGV_BYTE (buffer)};
 	  ts_ranges[idx] = rg;
 	}
-      success = ts_parser_set_included_ranges
-	(XTS_PARSER (parser)->parser, ts_ranges, (uint32_t) len);
+      /* FIXME: 'len' below is ptrdiff_t, so can overflow a 32-bit
+	 unsigned data type.  */
+      success = ts_parser_set_included_ranges (XTS_PARSER (parser)->parser,
+					       ts_ranges, (uint32_t) len);
       /* Although XFIXNUM could signal, it should be impossible
 	 because we have checked the input by ts_check_range_argument.
 	 So there is no need for unwind-protect.  */
@@ -1336,8 +1328,7 @@ DEFUN ("treesit-parser-set-included-ranges",
 
   if (!success)
     xsignal2 (Qtreesit_range_invalid,
-	      build_pure_c_string
-	      ("Something went wrong when setting ranges"),
+	      build_pure_c_string ("Something went wrong when setting ranges"),
 	      ranges);
 
   XTS_PARSER (parser)->need_reparse = true;
@@ -1349,15 +1340,14 @@ DEFUN ("treesit-parser-included-ranges",
        Streesit_parser_included_ranges,
        1, 1, 0,
        doc: /* Return the ranges set for PARSER.
-See `treesit-parser-set-ranges'.  If no range is set, return
-nil.  */)
+See `treesit-parser-set-ranges'.  If no range is set, return nil.  */)
   (Lisp_Object parser)
 {
   ts_check_parser (parser);
   ts_initialize ();
   uint32_t len;
-  const TSRange *ranges = ts_parser_included_ranges
-    (XTS_PARSER (parser)->parser, &len);
+  const TSRange *ranges =
+    ts_parser_included_ranges (XTS_PARSER (parser)->parser, &len);
   if (len == 0)
     return Qnil;
 
@@ -1368,7 +1358,7 @@ DEFUN ("treesit-parser-included-ranges",
   struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
 
   Lisp_Object list = Qnil;
-  for (int idx=0; idx < len; idx++)
+  for (int idx = 0; idx < len; idx++)
     {
       TSRange range = ranges[idx];
       uint32_t beg_byte = range.start_byte + BUF_BEGV_BYTE (buffer);
@@ -1402,8 +1392,7 @@ ts_check_node (Lisp_Object obj)
 {
   CHECK_TS_NODE (obj);
   Lisp_Object lisp_parser = XTS_NODE (obj)->parser;
-  if (XTS_NODE (obj)->timestamp !=
-      XTS_PARSER (lisp_parser)->timestamp)
+  if (XTS_NODE (obj)->timestamp != XTS_PARSER (lisp_parser)->timestamp)
     xsignal1 (Qtreesit_node_outdated, obj);
 }
 
@@ -1433,13 +1422,12 @@ DEFUN ("treesit-node-start",
   ts_initialize ();
 
   TSNode ts_node = XTS_NODE (node)->node;
-  ptrdiff_t visible_beg =
-    XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
+  ptrdiff_t visible_beg = XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
   uint32_t start_byte_offset = ts_node_start_byte (ts_node);
   struct buffer *buffer =
     XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer);
-  ptrdiff_t start_pos = buf_bytepos_to_charpos
-    (buffer, start_byte_offset + visible_beg);
+  ptrdiff_t start_pos =
+    buf_bytepos_to_charpos (buffer, start_byte_offset + visible_beg);
   return make_fixnum (start_pos);
 }
 
@@ -1454,13 +1442,12 @@ DEFUN ("treesit-node-end",
   ts_initialize ();
 
   TSNode ts_node = XTS_NODE (node)->node;
-  ptrdiff_t visible_beg =
-    XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
+  ptrdiff_t visible_beg = XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
   uint32_t end_byte_offset = ts_node_end_byte (ts_node);
   struct buffer *buffer =
     XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer);
-  ptrdiff_t end_pos = buf_bytepos_to_charpos
-    (buffer, end_byte_offset + visible_beg);
+  ptrdiff_t end_pos =
+    buf_bytepos_to_charpos (buffer, end_byte_offset + visible_beg);
   return make_fixnum (end_pos);
 }
 
@@ -1510,7 +1497,8 @@ DEFUN ("treesit-node-child",
   ts_check_node (node);
   ts_check_positive_integer (n);
   EMACS_INT idx = XFIXNUM (n);
-  if (idx > UINT32_MAX) xsignal1 (Qargs_out_of_range, n);
+  if (idx > UINT32_MAX)
+    xsignal1 (Qargs_out_of_range, n);
   ts_initialize ();
 
   TSNode ts_node = XTS_NODE (node)->node;
@@ -1530,7 +1518,7 @@ DEFUN ("treesit-node-check",
        Ftreesit_node_check, Streesit_node_check, 2, 2, 0,
        doc: /* Return non-nil if NODE has PROPERTY, nil otherwise.
 
-PROPERTY could be 'named, 'missing, 'extra, 'has-changes, 'has-error.
+PROPERTY could be `named', `missing', `extra', `has-changes', or `has-error'.
 Named nodes correspond to named rules in the language definition,
 whereas "anonymous" nodes correspond to string literals in the
 language definition.
@@ -1542,7 +1530,7 @@ DEFUN ("treesit-node-check",
 language definition, but can appear anywhere.
 
 A node "has changes" if the buffer changed since the node is
-created. (Don't forget the "s" at the end of 'has-changes.)
+created. (Don't forget the "s" at the end of `has-changes'.)
 
 A node "has error" if itself is a syntax error or contains any syntax
 errors.  */)
@@ -1566,7 +1554,7 @@ DEFUN ("treesit-node-check",
   else if (EQ (property, Qhas_changes))
     result = ts_node_has_changes (ts_node);
   else
-    signal_error ("Expecting 'named, 'missing, 'extra, 'has-changes or 'has-error, got",
+    signal_error ("Expecting `named', `missing', `extra', `has-changes' or `has-error', but got",
 		  property);
   return result ? Qt : Qnil;
 }
@@ -1580,11 +1568,13 @@ DEFUN ("treesit-node-field-name-for-child",
 If NODE is nil, return nil.  */)
   (Lisp_Object node, Lisp_Object n)
 {
-  if (NILP (node)) return Qnil;
+  if (NILP (node))
+    return Qnil;
   ts_check_node (node);
   ts_check_positive_integer (n);
   EMACS_INT idx = XFIXNUM (n);
-  if (idx > UINT32_MAX) xsignal1 (Qargs_out_of_range, n);
+  if (idx > UINT32_MAX)
+    xsignal1 (Qargs_out_of_range, n);
   ts_initialize ();
 
   TSNode ts_node = XTS_NODE (node)->node;
@@ -1602,11 +1592,12 @@ DEFUN ("treesit-node-child-count",
        Streesit_node_child_count, 1, 2, 0,
        doc: /* Return the number of children of NODE.
 
-If NAMED is non-nil, count named child only.  NAMED defaults to
+If NAMED is non-nil, count named children only.  NAMED defaults to
 nil.  If NODE is nil, return nil.  */)
   (Lisp_Object node, Lisp_Object named)
 {
-  if (NILP (node)) return Qnil;
+  if (NILP (node))
+    return Qnil;
   ts_check_node (node);
   ts_initialize ();
 
@@ -1626,7 +1617,8 @@ DEFUN ("treesit-node-child-by-field-name",
 Return nil if there isn't any.  If NODE is nil, return nil.  */)
   (Lisp_Object node, Lisp_Object field_name)
 {
-  if (NILP (node)) return Qnil;
+  if (NILP (node))
+    return Qnil;
   ts_check_node (node);
   CHECK_STRING (field_name);
   ts_initialize ();
@@ -1636,7 +1628,7 @@ DEFUN ("treesit-node-child-by-field-name",
   TSNode child
     = ts_node_child_by_field_name (ts_node, name_str, strlen (name_str));
 
-  if (ts_node_is_null(child))
+  if (ts_node_is_null (child))
     return Qnil;
 
   return make_ts_node(XTS_NODE (node)->parser, child);
@@ -1648,7 +1640,7 @@ DEFUN ("treesit-node-next-sibling",
        doc: /* Return the next sibling of NODE.
 
 Return nil if there isn't any.  If NAMED is non-nil, look for named
-child only.  NAMED defaults to nil.  If NODE is nil, return nil.  */)
+siblings only.  NAMED defaults to nil.  If NODE is nil, return nil.  */)
   (Lisp_Object node, Lisp_Object named)
 {
   if (NILP (node)) return Qnil;
@@ -1674,7 +1666,7 @@ DEFUN ("treesit-node-prev-sibling",
        doc: /* Return the previous sibling of NODE.
 
 Return nil if there isn't any.  If NAMED is non-nil, look for named
-child only.  NAMED defaults to nil.  If NODE is nil, return nil.  */)
+siblings only.  NAMED defaults to nil.  If NODE is nil, return nil.  */)
   (Lisp_Object node, Lisp_Object named)
 {
   if (NILP (node)) return Qnil;
@@ -1702,19 +1694,18 @@ DEFUN ("treesit-node-first-child-for-pos",
 
 Specifically, return the first child that extends beyond POS.  POS is
 a position in the buffer.  Return nil if there isn't any.  If NAMED is
-non-nil, look for named child only.  NAMED defaults to nil.  Note that
+non-nil, look for named children only.  NAMED defaults to nil.  Note that
 this function returns an immediate child, not the smallest
 (grand)child.  If NODE is nil, return nil.  */)
   (Lisp_Object node, Lisp_Object pos, Lisp_Object named)
 {
-  if (NILP (node)) return Qnil;
+  if (NILP (node))
+    return Qnil;
   ts_check_node (node);
   ts_check_positive_integer (pos);
 
-  struct buffer *buf =
-    XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer);
-  ptrdiff_t visible_beg =
-    XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
+  struct buffer *buf = XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer);
+  ptrdiff_t visible_beg = XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
   ptrdiff_t byte_pos = buf_charpos_to_bytepos (buf, XFIXNUM (pos));
 
   if (byte_pos < BUF_BEGV_BYTE (buf) || byte_pos > BUF_ZV_BYTE (buf))
@@ -1725,11 +1716,10 @@ DEFUN ("treesit-node-first-child-for-pos",
   TSNode ts_node = XTS_NODE (node)->node;
   TSNode child;
   if (NILP (named))
-    child = ts_node_first_child_for_byte
-      (ts_node, byte_pos - visible_beg);
+    child = ts_node_first_child_for_byte (ts_node, byte_pos - visible_beg);
   else
-    child = ts_node_first_named_child_for_byte
-      (ts_node, byte_pos - visible_beg);
+    child = ts_node_first_named_child_for_byte (ts_node,
+						byte_pos - visible_beg);
 
   if (ts_node_is_null (child))
     return Qnil;
@@ -1752,10 +1742,8 @@ DEFUN ("treesit-node-descendant-for-range",
   CHECK_INTEGER (beg);
   CHECK_INTEGER (end);
 
-  struct buffer *buf =
-    XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer);
-  ptrdiff_t visible_beg =
-    XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
+  struct buffer *buf = XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer);
+  ptrdiff_t visible_beg = XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
   ptrdiff_t byte_beg = buf_charpos_to_bytepos (buf, XFIXNUM (beg));
   ptrdiff_t byte_end = buf_charpos_to_bytepos (buf, XFIXNUM (end));
 
@@ -1770,11 +1758,12 @@ DEFUN ("treesit-node-descendant-for-range",
   TSNode ts_node = XTS_NODE (node)->node;
   TSNode child;
   if (NILP (named))
-    child = ts_node_descendant_for_byte_range
-      (ts_node, byte_beg - visible_beg , byte_end - visible_beg);
+    child = ts_node_descendant_for_byte_range (ts_node, byte_beg - visible_beg,
+					       byte_end - visible_beg);
   else
-    child = ts_node_named_descendant_for_byte_range
-      (ts_node, byte_beg - visible_beg, byte_end - visible_beg);
+    child = ts_node_named_descendant_for_byte_range (ts_node,
+						     byte_beg - visible_beg,
+						     byte_end - visible_beg);
 
   if (ts_node_is_null (child))
     return Qnil;
@@ -1848,8 +1837,7 @@ DEFUN ("treesit-pattern-expand",
     build_pure_c_string (VECTORP (pattern) ? "]" : ")");
   if (VECTORP (pattern) || CONSP (pattern))
     return concat3 (opening_delimeter,
-		    Fmapconcat (intern_c_string
-				("treesit-pattern-expand"),
+		    Fmapconcat (intern_c_string ("treesit-pattern-expand"),
 				pattern,
 				build_pure_c_string (" ")),
 		    closing_delimiter);
@@ -1911,7 +1899,7 @@ DEFUN ("treesit-query-expand",
     ts_query_predicates_for_pattern (query, pattern_index, &len);
   Lisp_Object result = Qnil;
   Lisp_Object predicate = Qnil;
-  for (int idx=0; idx < len; idx++)
+  for (int idx = 0; idx < len; idx++)
     {
       TSQueryPredicateStep step = predicate_list[idx];
       switch (step.type)
@@ -1919,8 +1907,9 @@ DEFUN ("treesit-query-expand",
 	case TSQueryPredicateStepTypeCapture:
 	  {
 	    uint32_t str_len;
-	    const char *str = ts_query_capture_name_for_id
-	      (query, step.value_id, &str_len);
+	    const char *str = ts_query_capture_name_for_id (query,
+							    step.value_id,
+							    &str_len);
 	    predicate = Fcons (intern_c_string_1 (str, str_len),
 			       predicate);
 	    break;
@@ -1928,8 +1917,9 @@ DEFUN ("treesit-query-expand",
 	case TSQueryPredicateStepTypeString:
 	  {
 	    uint32_t str_len;
-	    const char *str = ts_query_string_value_for_id
-	      (query, step.value_id, &str_len);
+	    const char *str = ts_query_string_value_for_id (query,
+							    step.value_id,
+							    &str_len);
 	    predicate = Fcons (make_string (str, str_len), predicate);
 	    break;
 	  }
@@ -1945,12 +1935,12 @@ DEFUN ("treesit-query-expand",
 /* Translate a capture NAME (symbol) to the text of the captured node.
    Signals treesit-query-error if such node is not captured.  */
 static Lisp_Object
-ts_predicate_capture_name_to_text
-(Lisp_Object name, struct capture_range captures)
+ts_predicate_capture_name_to_text (Lisp_Object name,
+				   struct capture_range captures)
 {
   Lisp_Object node = Qnil;
-  for (Lisp_Object tail = captures.start;
-       !EQ (tail, captures.end); tail = XCDR (tail))
+  for (Lisp_Object tail = captures.start; !EQ (tail, captures.end);
+       tail = XCDR (tail))
     {
       if (EQ (XCAR (XCAR (tail)), name))
 	{
@@ -1965,10 +1955,9 @@ DEFUN ("treesit-query-expand",
 	      name, build_pure_c_string ("A predicate can only refer to captured nodes in the same pattern"));
 
   struct buffer *old_buffer = current_buffer;
-  set_buffer_internal
-    (XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer));
-  Lisp_Object text = Fbuffer_substring
-    (Ftreesit_node_start (node), Ftreesit_node_end (node));
+  set_buffer_internal (XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer));
+  Lisp_Object text = Fbuffer_substring (Ftreesit_node_start (node),
+					Ftreesit_node_end (node));
   set_buffer_internal (old_buffer);
   return text;
 }
@@ -1978,23 +1967,21 @@ DEFUN ("treesit-query-expand",
    The capture name evaluates to the text its captured node spans in
    the buffer.  */
 static bool
-ts_predicate_equal
-(Lisp_Object args, struct capture_range captures)
+ts_predicate_equal (Lisp_Object args, struct capture_range captures)
 {
   if (XFIXNUM (Flength (args)) != 2)
-    xsignal2 (Qtreesit_query_error, build_pure_c_string ("Predicate `equal' requires two arguments but only given"), Flength (args));
+    xsignal2 (Qtreesit_query_error,
+	      build_pure_c_string ("Predicate `equal' requires two arguments but only given"),
+	      Flength (args));
 
   Lisp_Object arg1 = XCAR (args);
   Lisp_Object arg2 = XCAR (XCDR (args));
-  Lisp_Object text1 = STRINGP (arg1) ? arg1 :
-    ts_predicate_capture_name_to_text (arg1, captures);
-  Lisp_Object text2 = STRINGP (arg2) ? arg2 :
-    ts_predicate_capture_name_to_text (arg2, captures);
+  Lisp_Object text1 =
+    STRINGP (arg1) ? arg1 : ts_predicate_capture_name_to_text (arg1, captures);
+  Lisp_Object text2 =
+    STRINGP (arg2) ? arg2 : ts_predicate_capture_name_to_text (arg2, captures);
 
-  if (NILP (Fstring_equal (text1, text2)))
-    return false;
-  else
-    return true;
+  return !NILP (Fstring_equal (text1, text2));
 }
 
 /* Handles predicate (#match "regexp" @node).  Return true if "regexp"
@@ -2005,21 +1992,24 @@ DEFUN ("treesit-query-expand",
 (Lisp_Object args, struct capture_range captures)
 {
   if (XFIXNUM (Flength (args)) != 2)
-    xsignal2 (Qtreesit_query_error, build_pure_c_string ("Predicate `equal' requires two arguments but only given"), Flength (args));
+    xsignal2 (Qtreesit_query_error,
+	      build_pure_c_string ("Predicate `equal' requires two arguments but only given"),
+	      Flength (args));
 
   Lisp_Object regexp = XCAR (args);
   Lisp_Object capture_name = XCAR (XCDR (args));
-  Lisp_Object text = ts_predicate_capture_name_to_text
-    (capture_name, captures);
+  Lisp_Object text = ts_predicate_capture_name_to_text (capture_name, captures);
 
   /* It's probably common to get the argument order backwards.  Catch
      this mistake early and show helpful explanation, because Emacs
      loves you.  (We put the regexp first because that's what
      string-match does.)  */
   if (!STRINGP (regexp))
-    xsignal1 (Qtreesit_query_error, build_pure_c_string ("The first argument to `match' should be a regexp string, not a capture name"));
+    xsignal1 (Qtreesit_query_error,
+	      build_pure_c_string ("The first argument to `match' should be a regexp string, not a capture name"));
   if (!SYMBOLP (capture_name))
-    xsignal1 (Qtreesit_query_error, build_pure_c_string ("The second argument to `match' should be a capture name, not a string"));
+    xsignal1 (Qtreesit_query_error,
+	      build_pure_c_string ("The second argument to `match' should be a capture name, not a string"));
 
   if (fast_string_match (regexp, text) >= 0)
     return true;
@@ -2038,8 +2028,7 @@ DEFUN ("treesit-query-expand",
 /* If all predicates in PREDICATES passes, return true; otherwise
    return false.  */
 static bool
-ts_eval_predicates
-(struct capture_range captures, Lisp_Object predicates)
+ts_eval_predicates (struct capture_range captures, Lisp_Object predicates)
 {
   bool pass = true;
   /* Evaluate each predicates.  */
@@ -2051,8 +2040,7 @@ DEFUN ("treesit-query-expand",
       Lisp_Object args = XCDR (predicate);
       if (!NILP (Fstring_equal (fn, build_pure_c_string("equal"))))
 	pass = ts_predicate_equal (args, captures);
-      else if (!NILP (Fstring_equal
-		      (fn, build_pure_c_string("match"))))
+      else if (!NILP (Fstring_equal (fn, build_pure_c_string("match"))))
 	pass = ts_predicate_match (args, captures);
       else
 	xsignal3 (Qtreesit_query_error,
@@ -2091,13 +2079,13 @@ DEFUN ("treesit-query-compile",
 
   /* Maybe actually compile. */
   if (NILP (eager))
-      return lisp_query;
+    return lisp_query;
   else
     {
       Lisp_Object signal_symbol = Qnil;
       Lisp_Object signal_data = Qnil;
-      TSQuery *ts_query = ts_ensure_query_compiled
-	(lisp_query, &signal_symbol, &signal_data);
+      TSQuery *ts_query = ts_ensure_query_compiled (lisp_query, &signal_symbol,
+						    &signal_data);
 
       if (ts_query == NULL)
 	xsignal (signal_symbol, signal_data);
@@ -2157,8 +2145,7 @@ DEFUN ("treesit-query-capture",
     }
   else
     xsignal2 (Qwrong_type_argument,
-	      list4 (Qor, Qtreesit_node_p,
-		     Qtreesit_parser_p, Qsymbolp),
+	      list4 (Qor, Qtreesit_node_p, Qtreesit_parser_p, Qsymbolp),
 	      node);
 
   ts_initialize ();
@@ -2168,8 +2155,8 @@ DEFUN ("treesit-query-capture",
   Lisp_Object lisp_parser = XTS_NODE (lisp_node)->parser;
   ptrdiff_t visible_beg =
     XTS_PARSER (XTS_NODE (lisp_node)->parser)->visible_beg;
-  const TSLanguage *lang = ts_parser_language
-    (XTS_PARSER (lisp_parser)->parser);
+  const TSLanguage *lang =
+    ts_parser_language (XTS_PARSER (lisp_parser)->parser);
 
   /* Initialize query objects.  At the end of this block, we should
      have a working TSQuery and a TSQueryCursor.  */
@@ -2180,16 +2167,13 @@ DEFUN ("treesit-query-capture",
     {
       Lisp_Object signal_symbol = Qnil;
       Lisp_Object signal_data = Qnil;
-      ts_query = ts_ensure_query_compiled
-	(query, &signal_symbol, &signal_data);
+      ts_query = ts_ensure_query_compiled (query, &signal_symbol, &signal_data);
       cursor = XTS_COMPILED_QUERY (query)->cursor;
       /* We don't need to free ts_query and cursor because they
 	 are stored in a lisp object, which is tracked by gc.  */
       needs_to_free_query_and_cursor = false;
       if (ts_query == NULL)
-	{
-	  xsignal (signal_symbol, signal_data);
-	}
+	xsignal (signal_symbol, signal_data);
     }
   else
     {
@@ -2203,10 +2187,8 @@ DEFUN ("treesit-query-capture",
       ts_query = ts_query_new (lang, query_string, strlen (query_string),
 			       &error_offset, &error_type);
       if (ts_query == NULL)
-	{
-	  xsignal (Qtreesit_query_error, ts_compose_query_signal_data
-		   (error_offset, error_type));
-	}
+	xsignal (Qtreesit_query_error,
+		 ts_compose_query_signal_data (error_offset, error_type));
       cursor = ts_query_cursor_new ();
       needs_to_free_query_and_cursor = true;
     }
@@ -2219,9 +2201,9 @@ DEFUN ("treesit-query-capture",
     {
       EMACS_INT beg_byte = XFIXNUM (beg);
       EMACS_INT end_byte = XFIXNUM (end);
-      ts_query_cursor_set_byte_range
-	(cursor, (uint32_t) beg_byte - visible_beg,
-	 (uint32_t) end_byte - visible_beg);
+      /* FIXME: EMACS_INT values could overflow uint32_t.  */
+      ts_query_cursor_set_byte_range (cursor, (uint32_t) beg_byte - visible_beg,
+				      (uint32_t) end_byte - visible_beg);
     }
 
   /* Execute query.  */
@@ -2245,26 +2227,24 @@ DEFUN ("treesit-query-capture",
       prev_result = result;
       /* Get captured nodes.  */
       const TSQueryCapture *captures = match.captures;
-      for (int idx=0; idx < match.capture_count; idx++)
+      for (int idx = 0; idx < match.capture_count; idx++)
 	{
 	  uint32_t capture_name_len;
 	  TSQueryCapture capture = captures[idx];
-	  Lisp_Object captured_node =
-	    make_ts_node(lisp_parser, capture.node);
+	  Lisp_Object captured_node = make_ts_node(lisp_parser, capture.node);
 
 	  Lisp_Object cap;
 	  if (NILP (node_only))
 	    {
-	      const char *capture_name = ts_query_capture_name_for_id
-		(ts_query, capture.index, &capture_name_len);
-	      cap =
-		Fcons (intern_c_string_1 (capture_name, capture_name_len),
-		       captured_node);
+	      const char *capture_name =
+		ts_query_capture_name_for_id (ts_query, capture.index,
+					      &capture_name_len);
+	      cap = Fcons (intern_c_string_1 (capture_name, capture_name_len),
+			   captured_node);
 	    }
 	  else
-	    {
-	      cap = captured_node;
-	    }
+	    cap = captured_node;
+
 	  result = Fcons (cap, result);
 	}
       /* Get predicates.  */
@@ -2314,14 +2294,12 @@ ts_traverse_sibling_helper (TSNode node, bool forward, bool named)
 /* Return true if NODE matches PRED.  PRED can be a string or a
    function.  This function doesn't check for PRED's type.  */
 static bool
-ts_traverse_match_predicate
-(TSNode node, Lisp_Object pred, Lisp_Object parser)
+ts_traverse_match_predicate (TSNode node, Lisp_Object pred, Lisp_Object parser)
 {
   if (STRINGP (pred))
     {
       const char *type = ts_node_type (node);
-      return (fast_c_string_match_ignore_case
-	      (pred, type, strlen (type)) >= 0);
+      return fast_c_string_match_ignore_case (pred, type, strlen (type)) >= 0;
     }
   else
     {
@@ -2345,10 +2323,9 @@ ts_traverse_sibling_helper (TSNode node, bool forward, bool named)
    is true, only traverse named nodes, if false, all nodes.  If
    SKIP_ROOT is true, don't match ROOT.  */
 static bool
-ts_search_dfs
-(TSNode *root, Lisp_Object pred, Lisp_Object parser,
- bool named, bool forward, ptrdiff_t limit, bool no_limit,
- bool skip_root)
+ts_search_dfs (TSNode *root, Lisp_Object pred, Lisp_Object parser,
+	       bool named, bool forward, ptrdiff_t limit, bool no_limit,
+	       bool skip_root)
 {
   /* TSTreeCursor doesn't allow us to move backward, so we can't use
      it.  We could use limit == -1 to indicate no_limit == true, but
@@ -2365,13 +2342,11 @@ ts_traverse_sibling_helper (TSNode node, bool forward, bool named)
     return false;
   else
     {
-      int count = named ?
-	ts_node_named_child_count( node)
-	: ts_node_child_count (node);
-      for (int offset=0; offset < count; offset++)
+      int count =
+	named ?	ts_node_named_child_count( node) : ts_node_child_count (node);
+      for (int offset = 0; offset < count; offset++)
 	{
-	  uint32_t idx = forward ? offset
-	    : count - offset - 1;
+	  uint32_t idx = forward ? offset : count - offset - 1;
 	  TSNode child = ts_node_child (node, idx);
 
 	  if (!ts_node_is_null (child)
@@ -2392,14 +2367,14 @@ ts_traverse_sibling_helper (TSNode node, bool forward, bool named)
    sibling and parents.  If SKIP_START is true, don'tt match
    START.  */
 static bool
-ts_search_forward
-(TSNode *start, Lisp_Object pred, Lisp_Object parser,
- bool named, bool forward, bool up_only, bool skip_start)
+ts_search_forward (TSNode *start, Lisp_Object pred, Lisp_Object parser,
+		   bool named, bool forward, bool up_only, bool skip_start)
 {
   TSNode node = *start;
 
-  if (!up_only && ts_search_dfs
-      (start, pred, parser, named, forward, 0, true, skip_start))
+  if (!up_only
+      && ts_search_dfs (start, pred, parser, named, forward, 0, true,
+			skip_start))
     return true;
 
   TSNode next = ts_traverse_sibling_helper (node, forward, named);
@@ -2416,8 +2391,7 @@ ts_traverse_sibling_helper (TSNode node, bool forward, bool named)
 	}
       next = ts_traverse_sibling_helper (node, forward, named);
     }
-  if (ts_search_forward
-      (&next, pred, parser, named, forward, up_only, false))
+  if (ts_search_forward (&next, pred, parser, named, forward, up_only, false))
     {
       *start = next;
       return true;
@@ -2464,12 +2438,9 @@ DEFUN ("treesit-search-subtree",
 
   TSNode ts_node = XTS_NODE (node)->node;
   Lisp_Object parser = XTS_NODE (node)->parser;
-  if (ts_search_dfs
-      (&ts_node, predicate, parser, NILP (all),
-       NILP (backward), the_limit, no_limit, false))
-    {
-      return make_ts_node (parser, ts_node);
-    }
+  if (ts_search_dfs (&ts_node, predicate, parser, NILP (all),
+		     NILP (backward), the_limit, no_limit, false))
+    return make_ts_node (parser, ts_node);
   else
     return Qnil;
 }
@@ -2517,12 +2488,9 @@ DEFUN ("treesit-search-forward",
 
   TSNode ts_start = XTS_NODE (start)->node;
   Lisp_Object parser = XTS_NODE (start)->parser;
-  if (ts_search_forward
-      (&ts_start, predicate, parser, NILP (all),
-       NILP (backward), !NILP (up), true))
-    {
-      return make_ts_node (parser, ts_start);
-    }
+  if (ts_search_forward (&ts_start, predicate, parser, NILP (all),
+			 NILP (backward), !NILP (up), true))
+    return make_ts_node (parser, ts_start);
   else
     return Qnil;
 }
@@ -2532,10 +2500,9 @@ DEFUN ("treesit-search-forward",
    Note that the top-level children list is reversed, because
    reasons.  */
 static void
-ts_build_sparse_tree
-(TSTreeCursor *cursor, Lisp_Object parent, Lisp_Object pred,
- Lisp_Object process_fn, ptrdiff_t limit,
- bool no_limit, Lisp_Object parser)
+ts_build_sparse_tree (TSTreeCursor *cursor, Lisp_Object parent,
+		      Lisp_Object pred, Lisp_Object process_fn, ptrdiff_t limit,
+		      bool no_limit, Lisp_Object parser)
 {
 
   TSNode node = ts_tree_cursor_current_node (cursor);
@@ -2546,9 +2513,8 @@ DEFUN ("treesit-search-forward",
 	 children list.  */
       Lisp_Object lisp_node = make_ts_node (parser, node);
       if (!NILP (process_fn))
-	{
-	  lisp_node = CALLN (Ffuncall, process_fn, lisp_node);
-	}
+	lisp_node = CALLN (Ffuncall, process_fn, lisp_node);
+
       Lisp_Object this = Fcons (lisp_node, Qnil);
       Fsetcdr (parent, Fcons (this, Fcdr (parent)));
       /* Now for children nodes, this is the new parent.  */
@@ -2563,9 +2529,8 @@ DEFUN ("treesit-search-forward",
 	  /* Make sure not to use node after the recursive funcall.
 	     Then C compilers should be smart enough not to copy NODE
 	     to stack.  */
-	  ts_build_sparse_tree
-	    (cursor, parent, pred, process_fn,
-	     limit - 1, no_limit, parser);
+	  ts_build_sparse_tree (cursor, parent, pred, process_fn,
+				limit - 1, no_limit, parser);
 	}
       while (ts_tree_cursor_goto_next_sibling (cursor));
       /* Don't forget to come back to this node.  */
@@ -2640,9 +2605,8 @@ DEFUN ("treesit-induce-sparse-tree",
   TSTreeCursor cursor = ts_tree_cursor_new (XTS_NODE (root)->node);
   Lisp_Object parser = XTS_NODE (root)->parser;
   Lisp_Object parent = Fcons (Qnil, Qnil);
-  ts_build_sparse_tree
-    (&cursor, parent, predicate, process_fn,
-     the_limit, no_limit, parser);
+  ts_build_sparse_tree (&cursor, parent, predicate, process_fn,
+			the_limit, no_limit, parser);
   Fsetcdr (parent, Fnreverse (Fcdr (parent)));
   if (NILP (Fcdr (parent)))
     return Qnil;

commit 9d3f8912b431ed5540d9d06d85b7e338732268c9
Author: Eli Zaretskii <eliz@gnu.org>
Date:   Sun Oct 16 16:22:09 2022 +0300

    Support MinGW build on MS-Windows
    
    * src/treesit.c [WINDOWSNT]: Add MS-Windows boilerplate for
    dynamically-loaded optional libraries.
    (init_treesit_functions) [WINDOWSNT]: New function.
    (load_tree_sitter_if_necessary): New function.
    (ts_initialize): Call 'load_tree_sitter_if_necessary'.
    (ts_delete_parser, ts_delete_query, ts_named_node_p): Wrapper
    functions for TS calls from outside treesit.c.
    (Ftreesit_parser_root_node, Ftreesit_parser_set_included_ranges)
    (Ftreesit_parser_included_ranges, Ftreesit_node_type)
    (Ftreesit_node_start, Ftreesit_node_end, Ftreesit_node_string)
    (Ftreesit_node_parent, Ftreesit_node_child, Ftreesit_node_check)
    (Ftreesit_node_field_name_for_child, Ftreesit_node_child_count)
    (Ftreesit_node_next_sibling, Ftreesit_node_prev_sibling)
    (Ftreesit_node_first_child_for_pos)
    (Ftreesit_node_descendant_for_range, Ftreesit_node_eq)
    (Ftreesit_query_compile, Ftreesit_query_capture)
    (Ftreesit_search_subtree, Ftreesit_search_forward)
    (Ftreesit_induce_sparse_tree): Call 'ts_initialize' before any
    other TS functions.
    (Ftreesit_available_p): 'treesit-available-p' implemented in C, so
    that on WINDOWSNT the library could be loaded dynamically.
    * src/treesit.h (ts_delete_parser, ts_delete_query)
    (ts_named_node_p): Add prototypes.
    * src/print.c (print_vectorlike):
    * src/alloc.c (cleanup_vector): Call tree-sitter function via
    wrappers defined in treesit.c, not directly, because WINDOWSNT
    redefines the TS functions to be called via function pointers.
    * src/Makefile.in (base_obj): Add treesit.o
    (TREE_SITTER_OBJ): Remove.
    
    * lisp/treesit.el (treesit-available-p): Remove: now implemented
    in C.
    * lisp/term/w32-win.el (dynamic-library-alist): Add libtree-sitter
    DLLs.
    
    * configure.ac (TREE_SITTER): Support the MinGW build.
    (TREE_SITTER_OBJ): Remove.

diff --git a/configure.ac b/configure.ac
index 7d751fd6a8..4ce7e8b8ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3223,13 +3223,16 @@ AC_DEFUN
     [HAVE_TREE_SITTER=yes], [HAVE_TREE_SITTER=no])
   if test "${HAVE_TREE_SITTER}" = yes; then
     AC_DEFINE(HAVE_TREE_SITTER, 1, [Define if using tree-sitter.])
-    TREE_SITTER_OBJ="treesit.o"
+  fi
+
+  # Windows loads tree-sitter dynamically
+  if test "${opsys}" = "mingw32"; then
+    TREE_SITTER_LIBS=
   fi
 fi
 
 AC_SUBST(TREE_SITTER_LIBS)
 AC_SUBST(TREE_SITTER_CFLAGS)
-AC_SUBST(TREE_SITTER_OBJ)
 
 NOTIFY_OBJ=
 NOTIFY_SUMMARY=no
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 993f1d4320..34f899ecaa 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -287,7 +287,10 @@ libgnutls-version
        '(zlib "zlib1.dll" "libz-1.dll")
        '(lcms2 "liblcms2-2.dll")
        '(json "libjansson-4.dll")
-       '(gccjit "libgccjit-0.dll")))
+       '(gccjit "libgccjit-0.dll")
+       ;; MSYS2 distributes libtree-sitter.dll, without API version
+       ;; number...
+       '(tree-sitter "libtree-sitter.dll" "libtree-sitter-0.dll")))
 
 ;;; multi-tty support
 (defvar w32-initialized nil
diff --git a/lisp/treesit.el b/lisp/treesit.el
index c8ba3e84e6..004e79b40e 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -45,9 +45,7 @@ treesit-max-buffer-size
   :type 'integer
   :version "29.1")
 
-(defun treesit-available-p ()
-  "Return non-nil if tree-sitter features are available."
-  (fboundp 'treesit-parser-create))
+(declare-function treesit-available-p "treesit.c")
 
 (defun treesit-can-enable-p ()
   "Return non-nil if current buffer can activate tree-sitter.
diff --git a/src/Makefile.in b/src/Makefile.in
index 0d27f3e6db..4ee2843287 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -345,7 +345,6 @@ JSON_OBJ =
 
 TREE_SITTER_LIBS = @TREE_SITTER_LIBS@
 TREE_SITTER_CFLAGS = @TREE_SITTER_CFLAGS@
-TREE_SITTER_OBJ = @TREE_SITTER_OBJ@
 
 INTERVALS_H = dispextern.h intervals.h composite.h
 
@@ -445,11 +444,11 @@ base_obj =
 	doprnt.o intervals.o textprop.o composite.o xml.o lcms.o $(NOTIFY_OBJ) \
 	$(XWIDGETS_OBJ) \
 	profiler.o decompress.o \
-	thread.o systhread.o sqlite.o \
+	thread.o systhread.o sqlite.o treesit.o \
 	$(if $(HYBRID_MALLOC),sheap.o) \
 	$(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \
 	$(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ) $(JSON_OBJ) \
-	$(TREE_SITTER_OBJ) $(HAIKU_OBJ) $(PGTK_OBJ)
+	$(HAIKU_OBJ) $(PGTK_OBJ)
 doc_obj = $(base_obj) $(NS_OBJC_OBJ)
 obj = $(doc_obj) $(HAIKU_CXX_OBJ)
 
diff --git a/src/alloc.c b/src/alloc.c
index a8b57add60..7197c183be 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3171,19 +3171,9 @@ cleanup_vector (struct Lisp_Vector *vector)
     }
 #ifdef HAVE_TREE_SITTER
   else if (PSEUDOVECTOR_TYPEP (&vector->header, PVEC_TS_PARSER))
-    {
-      struct Lisp_TS_Parser *lisp_parser
-	= PSEUDOVEC_STRUCT (vector, Lisp_TS_Parser);
-      ts_tree_delete(lisp_parser->tree);
-      ts_parser_delete(lisp_parser->parser);
-    }
+    ts_delete_parser (PSEUDOVEC_STRUCT (vector, Lisp_TS_Parser));
   else if (PSEUDOVECTOR_TYPEP (&vector->header, PVEC_TS_COMPILED_QUERY))
-    {
-      struct Lisp_TS_Query *lisp_query
-	= PSEUDOVEC_STRUCT (vector, Lisp_TS_Query);
-      ts_query_delete (lisp_query->query);
-      ts_query_cursor_delete (lisp_query->cursor);
-    }
+    ts_delete_query (PSEUDOVEC_STRUCT (vector, Lisp_TS_Query));
 #endif
 #ifdef HAVE_MODULES
   else if (PSEUDOVECTOR_TYPEP (&vector->header, PVEC_MODULE_FUNCTION))
diff --git a/src/print.c b/src/print.c
index 4f41448d86..a9afe1dd2b 100644
--- a/src/print.c
+++ b/src/print.c
@@ -2027,7 +2027,7 @@ print_vectorlike (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag,
       /* Prints #<treesit-node (identifier) in #<buffer xxx>> or
          #<treesit-node "keyword" in #<buffer xxx>>. */
       print_c_string ("#<treesit-node ", printcharfun);
-      bool named = ts_node_is_named (XTS_NODE (obj)->node);
+      bool named = ts_named_node_p (XTS_NODE (obj)->node);
       const char *delim1 = named ? "(" : "\"";
       const char *delim2 = named ? ")" : "\"";
       print_c_string (delim1, printcharfun);
diff --git a/src/treesit.c b/src/treesit.c
index 7cfcc715f9..b21019c56e 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -20,8 +20,261 @@ Copyright (C) 2021-2022 Free Software Foundation, Inc.
 #include <config.h>
 #include "lisp.h"
 #include "buffer.h"
+
+#if HAVE_TREE_SITTER
+
 #include "treesit.h"
 
+
+/* Dynamic loading of libtree-sitter.  */
+
+#ifdef WINDOWSNT
+# include "w32common.h"
+
+/* In alphabetical order.  */
+#undef ts_language_version
+#undef ts_node_child
+#undef ts_node_child_by_field_name
+#undef ts_node_child_count
+#undef ts_node_descendant_for_byte_range
+#undef ts_node_end_byte
+#undef ts_node_eq
+#undef ts_node_field_name_for_child
+#undef ts_node_first_child_for_byte
+#undef ts_node_first_named_child_for_byte
+#undef ts_node_has_changes
+#undef ts_node_has_error
+#undef ts_node_is_extra
+#undef ts_node_is_missing
+#undef ts_node_is_named
+#undef ts_node_is_null
+#undef ts_node_named_child
+#undef ts_node_named_child_count
+#undef ts_node_named_descendant_for_byte_range
+#undef ts_node_next_named_sibling
+#undef ts_node_next_sibling
+#undef ts_node_parent
+#undef ts_node_prev_named_sibling
+#undef ts_node_prev_sibling
+#undef ts_node_start_byte
+#undef ts_node_string
+#undef ts_node_type
+#undef ts_parser_delete
+#undef ts_parser_included_ranges
+#undef ts_parser_language
+#undef ts_parser_new
+#undef ts_parser_parse
+#undef ts_parser_set_included_ranges
+#undef ts_parser_set_language
+#undef ts_query_capture_name_for_id
+#undef ts_query_cursor_delete
+#undef ts_query_cursor_exec
+#undef ts_query_cursor_new
+#undef ts_query_cursor_next_match
+#undef ts_query_cursor_set_byte_range
+#undef ts_query_delete
+#undef ts_query_new
+#undef ts_query_predicates_for_pattern
+#undef ts_query_string_value_for_id
+#undef ts_set_allocator
+#undef ts_tree_cursor_current_node
+#undef ts_tree_cursor_goto_first_child
+#undef ts_tree_cursor_goto_next_sibling
+#undef ts_tree_cursor_goto_parent
+#undef ts_tree_cursor_new
+#undef ts_tree_delete
+#undef ts_tree_edit
+#undef ts_tree_root_node
+
+DEF_DLL_FN (uint32_t, ts_language_version, (const TSLanguage *));
+DEF_DLL_FN (TSNode, ts_node_child, (TSNode, uint32_t));
+DEF_DLL_FN (TSNode, ts_node_child_by_field_name,
+	    (TSNode, const char *, uint32_t));
+DEF_DLL_FN (uint32_t, ts_node_child_count, (TSNode));
+DEF_DLL_FN (TSNode, ts_node_descendant_for_byte_range,
+	    (TSNode, uint32_t, uint32_t));
+DEF_DLL_FN (uint32_t, ts_node_end_byte, (TSNode));
+DEF_DLL_FN (bool, ts_node_eq, (TSNode, TSNode));
+DEF_DLL_FN (const char *, ts_node_field_name_for_child, (TSNode, uint32_t));
+DEF_DLL_FN (TSNode, ts_node_first_child_for_byte, (TSNode, uint32_t));
+DEF_DLL_FN (TSNode, ts_node_first_named_child_for_byte, (TSNode, uint32_t));
+DEF_DLL_FN (bool, ts_node_has_changes, (TSNode));
+DEF_DLL_FN (bool, ts_node_has_error, (TSNode));
+DEF_DLL_FN (bool, ts_node_is_extra, (TSNode));
+DEF_DLL_FN (bool, ts_node_is_missing, (TSNode));
+DEF_DLL_FN (bool, ts_node_is_named, (TSNode));
+DEF_DLL_FN (bool, ts_node_is_null, (TSNode));
+DEF_DLL_FN (TSNode, ts_node_named_child, (TSNode, uint32_t));
+DEF_DLL_FN (uint32_t, ts_node_named_child_count, (TSNode));
+DEF_DLL_FN (TSNode, ts_node_named_descendant_for_byte_range,
+	    (TSNode, uint32_t, uint32_t));
+DEF_DLL_FN (TSNode, ts_node_next_named_sibling, (TSNode));
+DEF_DLL_FN (TSNode, ts_node_next_sibling, (TSNode));
+DEF_DLL_FN (TSNode, ts_node_parent, (TSNode));
+DEF_DLL_FN (TSNode, ts_node_prev_named_sibling, (TSNode));
+DEF_DLL_FN (TSNode, ts_node_prev_sibling, (TSNode));
+DEF_DLL_FN (uint32_t, ts_node_start_byte, (TSNode));
+DEF_DLL_FN (char *, ts_node_string, (TSNode));
+DEF_DLL_FN (const char *, ts_node_type, (TSNode));
+DEF_DLL_FN (void, ts_parser_delete, (TSParser *));
+DEF_DLL_FN (const TSRange *, ts_parser_included_ranges,
+	    (const TSParser *, uint32_t *));
+DEF_DLL_FN (const TSLanguage *, ts_parser_language, (const TSParser *));
+DEF_DLL_FN (TSParser *, ts_parser_new, (void));
+DEF_DLL_FN (TSTree *, ts_parser_parse, (TSParser *, const TSTree *, TSInput));
+DEF_DLL_FN (bool, ts_parser_set_included_ranges,
+	    (TSParser *, const TSRange *, uint32_t));
+DEF_DLL_FN (bool, ts_parser_set_language, (TSParser *, const TSLanguage *));
+DEF_DLL_FN (const char *, ts_query_capture_name_for_id,
+	    (const TSQuery *, uint32_t, uint32_t *));
+DEF_DLL_FN (void, ts_query_cursor_delete, (TSQueryCursor *));
+DEF_DLL_FN (void, ts_query_cursor_exec,
+	    (TSQueryCursor *, const TSQuery *, TSNode));
+DEF_DLL_FN (TSQueryCursor *, ts_query_cursor_new, (void));
+DEF_DLL_FN (bool, ts_query_cursor_next_match,
+	    (TSQueryCursor *, TSQueryMatch *));
+DEF_DLL_FN (void, ts_query_cursor_set_byte_range,
+	    (TSQueryCursor *, uint32_t, uint32_t));
+DEF_DLL_FN (void, ts_query_delete, (TSQuery *));
+DEF_DLL_FN (TSQuery *, ts_query_new,
+	    (const TSLanguage *, const char *, uint32_t, uint32_t *, TSQueryError *));
+DEF_DLL_FN (const TSQueryPredicateStep *, ts_query_predicates_for_pattern,
+	    ( const TSQuery *, uint32_t, uint32_t *));
+DEF_DLL_FN (const char *, ts_query_string_value_for_id,
+	    (const TSQuery *, uint32_t, uint32_t *));
+DEF_DLL_FN (void, ts_set_allocator,
+	    (void *(*)(size_t), void *(*)(size_t, size_t), void *(*)(void *, size_t), void (*)(void *)));
+DEF_DLL_FN (TSNode, ts_tree_cursor_current_node, (const TSTreeCursor *));
+DEF_DLL_FN (bool, ts_tree_cursor_goto_first_child, (TSTreeCursor *));
+DEF_DLL_FN (bool, ts_tree_cursor_goto_next_sibling, (TSTreeCursor *));
+DEF_DLL_FN (bool, ts_tree_cursor_goto_parent, (TSTreeCursor *));
+DEF_DLL_FN (TSTreeCursor, ts_tree_cursor_new, (TSNode));
+DEF_DLL_FN (void, ts_tree_delete, (TSTree *));
+DEF_DLL_FN (void, ts_tree_edit, (TSTree *, const TSInputEdit *));
+DEF_DLL_FN (TSNode, ts_tree_root_node, (const TSTree *));
+
+static bool
+init_treesit_functions (void)
+{
+  HMODULE library = w32_delayed_load (Qtree_sitter);
+
+  if (!library)
+    return false;
+
+  LOAD_DLL_FN (library, ts_language_version);
+  LOAD_DLL_FN (library, ts_node_child);
+  LOAD_DLL_FN (library, ts_node_child_by_field_name);
+  LOAD_DLL_FN (library, ts_node_child_count);
+  LOAD_DLL_FN (library, ts_node_descendant_for_byte_range);
+  LOAD_DLL_FN (library, ts_node_end_byte);
+  LOAD_DLL_FN (library, ts_node_eq);
+  LOAD_DLL_FN (library, ts_node_field_name_for_child);
+  LOAD_DLL_FN (library, ts_node_first_child_for_byte);
+  LOAD_DLL_FN (library, ts_node_first_named_child_for_byte);
+  LOAD_DLL_FN (library, ts_node_has_changes);
+  LOAD_DLL_FN (library, ts_node_has_error);
+  LOAD_DLL_FN (library, ts_node_is_extra);
+  LOAD_DLL_FN (library, ts_node_is_missing);
+  LOAD_DLL_FN (library, ts_node_is_named);
+  LOAD_DLL_FN (library, ts_node_is_null);
+  LOAD_DLL_FN (library, ts_node_named_child);
+  LOAD_DLL_FN (library, ts_node_named_child_count);
+  LOAD_DLL_FN (library, ts_node_named_descendant_for_byte_range);
+  LOAD_DLL_FN (library, ts_node_next_named_sibling);
+  LOAD_DLL_FN (library, ts_node_next_sibling);
+  LOAD_DLL_FN (library, ts_node_parent);
+  LOAD_DLL_FN (library, ts_node_prev_named_sibling);
+  LOAD_DLL_FN (library, ts_node_prev_sibling);
+  LOAD_DLL_FN (library, ts_node_start_byte);
+  LOAD_DLL_FN (library, ts_node_string);
+  LOAD_DLL_FN (library, ts_node_type);
+  LOAD_DLL_FN (library, ts_parser_delete);
+  LOAD_DLL_FN (library, ts_parser_included_ranges);
+  LOAD_DLL_FN (library, ts_parser_language);
+  LOAD_DLL_FN (library, ts_parser_new);
+  LOAD_DLL_FN (library, ts_parser_parse);
+  LOAD_DLL_FN (library, ts_parser_set_included_ranges);
+  LOAD_DLL_FN (library, ts_parser_set_language);
+  LOAD_DLL_FN (library, ts_query_capture_name_for_id);
+  LOAD_DLL_FN (library, ts_query_cursor_delete);
+  LOAD_DLL_FN (library, ts_query_cursor_exec);
+  LOAD_DLL_FN (library, ts_query_cursor_new);
+  LOAD_DLL_FN (library, ts_query_cursor_next_match);
+  LOAD_DLL_FN (library, ts_query_cursor_set_byte_range);
+  LOAD_DLL_FN (library, ts_query_delete);
+  LOAD_DLL_FN (library, ts_query_new);
+  LOAD_DLL_FN (library, ts_query_predicates_for_pattern);
+  LOAD_DLL_FN (library, ts_query_string_value_for_id);
+  LOAD_DLL_FN (library, ts_set_allocator);
+  LOAD_DLL_FN (library, ts_tree_cursor_current_node);
+  LOAD_DLL_FN (library, ts_tree_cursor_goto_first_child);
+  LOAD_DLL_FN (library, ts_tree_cursor_goto_next_sibling);
+  LOAD_DLL_FN (library, ts_tree_cursor_goto_parent);
+  LOAD_DLL_FN (library, ts_tree_cursor_new);
+  LOAD_DLL_FN (library, ts_tree_delete);
+  LOAD_DLL_FN (library, ts_tree_edit);
+  LOAD_DLL_FN (library, ts_tree_root_node);
+
+  return true;
+}
+
+#define ts_language_version fn_ts_language_version
+#define ts_node_child fn_ts_node_child
+#define ts_node_child_by_field_name fn_ts_node_child_by_field_name
+#define ts_node_child_count fn_ts_node_child_count
+#define ts_node_descendant_for_byte_range fn_ts_node_descendant_for_byte_range
+#define ts_node_end_byte fn_ts_node_end_byte
+#define ts_node_eq fn_ts_node_eq
+#define ts_node_field_name_for_child fn_ts_node_field_name_for_child
+#define ts_node_first_child_for_byte fn_ts_node_first_child_for_byte
+#define ts_node_first_named_child_for_byte fn_ts_node_first_named_child_for_byte
+#define ts_node_has_changes fn_ts_node_has_changes
+#define ts_node_has_error fn_ts_node_has_error
+#define ts_node_is_extra fn_ts_node_is_extra
+#define ts_node_is_missing fn_ts_node_is_missing
+#define ts_node_is_named fn_ts_node_is_named
+#define ts_node_is_null fn_ts_node_is_null
+#define ts_node_named_child fn_ts_node_named_child
+#define ts_node_named_child_count fn_ts_node_named_child_count
+#define ts_node_named_descendant_for_byte_range fn_ts_node_named_descendant_for_byte_range
+#define ts_node_next_named_sibling fn_ts_node_next_named_sibling
+#define ts_node_next_sibling fn_ts_node_next_sibling
+#define ts_node_parent fn_ts_node_parent
+#define ts_node_prev_named_sibling fn_ts_node_prev_named_sibling
+#define ts_node_prev_sibling fn_ts_node_prev_sibling
+#define ts_node_start_byte fn_ts_node_start_byte
+#define ts_node_string fn_ts_node_string
+#define ts_node_type fn_ts_node_type
+#define ts_parser_delete fn_ts_parser_delete
+#define ts_parser_included_ranges fn_ts_parser_included_ranges
+#define ts_parser_language fn_ts_parser_language
+#define ts_parser_new fn_ts_parser_new
+#define ts_parser_parse fn_ts_parser_parse
+#define ts_parser_set_included_ranges fn_ts_parser_set_included_ranges
+#define ts_parser_set_language fn_ts_parser_set_language
+#define ts_query_capture_name_for_id fn_ts_query_capture_name_for_id
+#define ts_query_cursor_delete fn_ts_query_cursor_delete
+#define ts_query_cursor_exec fn_ts_query_cursor_exec
+#define ts_query_cursor_new fn_ts_query_cursor_new
+#define ts_query_cursor_next_match fn_ts_query_cursor_next_match
+#define ts_query_cursor_set_byte_range fn_ts_query_cursor_set_byte_range
+#define ts_query_delete fn_ts_query_delete
+#define ts_query_new fn_ts_query_new
+#define ts_query_predicates_for_pattern fn_ts_query_predicates_for_pattern
+#define ts_query_string_value_for_id fn_ts_query_string_value_for_id
+#define ts_set_allocator fn_ts_set_allocator
+#define ts_tree_cursor_current_node fn_ts_tree_cursor_current_node
+#define ts_tree_cursor_goto_first_child fn_ts_tree_cursor_goto_first_child
+#define ts_tree_cursor_goto_next_sibling fn_ts_tree_cursor_goto_next_sibling
+#define ts_tree_cursor_goto_parent fn_ts_tree_cursor_goto_parent
+#define ts_tree_cursor_new fn_ts_tree_cursor_new
+#define ts_tree_delete fn_ts_tree_delete
+#define ts_tree_edit fn_ts_tree_edit
+#define ts_tree_root_node fn_ts_tree_root_node
+
+#endif	/* WINDOWSNT */
+
+
 /* Commentary
 
    The Emacs wrapper of tree-sitter does not expose everything the C
@@ -126,6 +379,33 @@ Copyright (C) 2021-2022 Free Software Foundation, Inc.
 
 bool ts_initialized = false;
 
+static bool
+load_tree_sitter_if_necessary (bool required)
+{
+#ifdef WINDOWSNT
+  static bool tried_to_initialize_once;
+  static bool tree_sitter_initialized;
+
+  if (!tried_to_initialize_once)
+    {
+      Lisp_Object status;
+
+      tried_to_initialize_once = true;
+      tree_sitter_initialized = init_treesit_functions ();
+      status = tree_sitter_initialized ? Qt : Qnil;
+      Vlibrary_cache = Fcons (Fcons (Qtree_sitter, status), Vlibrary_cache);
+    }
+
+  if (required && !tree_sitter_initialized)
+    xsignal1 (Qtreesit_error,
+	      build_string ("tree-sitter library not found or failed to load"));
+
+  return tree_sitter_initialized;
+#else
+  return true;
+#endif
+}
+
 static void *
 ts_calloc_wrapper (size_t n, size_t size)
 {
@@ -137,6 +417,7 @@ ts_initialize (void)
 {
   if (!ts_initialized)
     {
+      load_tree_sitter_if_necessary (true);
       ts_set_allocator (xmalloc, ts_calloc_wrapper, xrealloc, xfree);
       ts_initialized = true;
     }
@@ -536,7 +817,7 @@ ts_ensure_parsed (Lisp_Object parser)
   /* Before we parse, catch up with the narrowing situation.  */
   ts_ensure_position_synced (parser);
 
-  TSTree *new_tree = ts_parser_parse(ts_parser, tree, input);
+  TSTree *new_tree = ts_parser_parse (ts_parser, tree, input);
   /* This should be very rare (impossible, really): it only happens
      when 1) language is not set (impossible in Emacs because the user
      has to supply a language to create a parser), 2) parse canceled
@@ -661,6 +942,28 @@ make_ts_query (Lisp_Object query, Lisp_Object language)
   return make_lisp_ptr (lisp_query, Lisp_Vectorlike);
 }
 
+/* The following two functions are called from alloc.c:cleanup_vector.  */
+void
+ts_delete_parser (struct Lisp_TS_Parser *lisp_parser)
+{
+  ts_tree_delete(lisp_parser->tree);
+  ts_parser_delete(lisp_parser->parser);
+}
+
+void
+ts_delete_query (struct Lisp_TS_Query *lisp_query)
+{
+  ts_query_delete (lisp_query->query);
+  ts_query_cursor_delete (lisp_query->cursor);
+}
+
+/* The following function is called from print.c:print_vectorlike.  */
+bool
+ts_named_node_p (TSNode node)
+{
+  return ts_node_is_named (node);
+}
+
 static const char*
 ts_query_error_to_string (TSQueryError error)
 {
@@ -936,6 +1239,7 @@ DEFUN ("treesit-parser-root-node",
   (Lisp_Object parser)
 {
   ts_check_parser (parser);
+  ts_initialize ();
   ts_ensure_parsed (parser);
   TSNode root_node = ts_tree_root_node (XTS_PARSER (parser)->tree);
   return make_ts_node (parser, root_node);
@@ -987,6 +1291,7 @@ DEFUN ("treesit-parser-set-included-ranges",
   CHECK_CONS (ranges);
   ts_check_range_argument (ranges);
 
+  ts_initialize ();
   /* Before we parse, catch up with narrowing/widening.  */
   ts_ensure_position_synced (parser);
 
@@ -1049,6 +1354,7 @@ DEFUN ("treesit-parser-included-ranges",
   (Lisp_Object parser)
 {
   ts_check_parser (parser);
+  ts_initialize ();
   uint32_t len;
   const TSRange *ranges = ts_parser_included_ranges
     (XTS_PARSER (parser)->parser, &len);
@@ -1109,6 +1415,8 @@ DEFUN ("treesit-node-type",
 {
   if (NILP (node)) return Qnil;
   ts_check_node (node);
+  ts_initialize ();
+
   TSNode ts_node = XTS_NODE (node)->node;
   const char *type = ts_node_type (ts_node);
   return build_string (type);
@@ -1122,6 +1430,8 @@ DEFUN ("treesit-node-start",
 {
   if (NILP (node)) return Qnil;
   ts_check_node (node);
+  ts_initialize ();
+
   TSNode ts_node = XTS_NODE (node)->node;
   ptrdiff_t visible_beg =
     XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
@@ -1141,6 +1451,8 @@ DEFUN ("treesit-node-end",
 {
   if (NILP (node)) return Qnil;
   ts_check_node (node);
+  ts_initialize ();
+
   TSNode ts_node = XTS_NODE (node)->node;
   ptrdiff_t visible_beg =
     XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
@@ -1160,6 +1472,8 @@ DEFUN ("treesit-node-string",
 {
   if (NILP (node)) return Qnil;
   ts_check_node (node);
+  ts_initialize ();
+
   TSNode ts_node = XTS_NODE (node)->node;
   char *string = ts_node_string (ts_node);
   return build_string (string);
@@ -1173,6 +1487,8 @@ DEFUN ("treesit-node-parent",
 {
   if (NILP (node)) return Qnil;
   ts_check_node (node);
+  ts_initialize ();
+
   TSNode ts_node = XTS_NODE (node)->node;
   TSNode parent = ts_node_parent (ts_node);
 
@@ -1195,6 +1511,8 @@ DEFUN ("treesit-node-child",
   ts_check_positive_integer (n);
   EMACS_INT idx = XFIXNUM (n);
   if (idx > UINT32_MAX) xsignal1 (Qargs_out_of_range, n);
+  ts_initialize ();
+
   TSNode ts_node = XTS_NODE (node)->node;
   TSNode child;
   if (NILP (named))
@@ -1233,6 +1551,8 @@ DEFUN ("treesit-node-check",
   if (NILP (node)) return Qnil;
   ts_check_node (node);
   CHECK_SYMBOL (property);
+  ts_initialize ();
+
   TSNode ts_node = XTS_NODE (node)->node;
   bool result;
   if (EQ (property, Qnamed))
@@ -1265,6 +1585,8 @@ DEFUN ("treesit-node-field-name-for-child",
   ts_check_positive_integer (n);
   EMACS_INT idx = XFIXNUM (n);
   if (idx > UINT32_MAX) xsignal1 (Qargs_out_of_range, n);
+  ts_initialize ();
+
   TSNode ts_node = XTS_NODE (node)->node;
   const char *name
     = ts_node_field_name_for_child (ts_node, (uint32_t) idx);
@@ -1286,6 +1608,8 @@ DEFUN ("treesit-node-child-count",
 {
   if (NILP (node)) return Qnil;
   ts_check_node (node);
+  ts_initialize ();
+
   TSNode ts_node = XTS_NODE (node)->node;
   uint32_t count;
   if (NILP (named))
@@ -1305,6 +1629,8 @@ DEFUN ("treesit-node-child-by-field-name",
   if (NILP (node)) return Qnil;
   ts_check_node (node);
   CHECK_STRING (field_name);
+  ts_initialize ();
+
   char *name_str = SSDATA (field_name);
   TSNode ts_node = XTS_NODE (node)->node;
   TSNode child
@@ -1327,6 +1653,8 @@ DEFUN ("treesit-node-next-sibling",
 {
   if (NILP (node)) return Qnil;
   ts_check_node (node);
+  ts_initialize ();
+
   TSNode ts_node = XTS_NODE (node)->node;
   TSNode sibling;
   if (NILP (named))
@@ -1351,6 +1679,8 @@ DEFUN ("treesit-node-prev-sibling",
 {
   if (NILP (node)) return Qnil;
   ts_check_node (node);
+  ts_initialize ();
+
   TSNode ts_node = XTS_NODE (node)->node;
   TSNode sibling;
 
@@ -1390,6 +1720,8 @@ DEFUN ("treesit-node-first-child-for-pos",
   if (byte_pos < BUF_BEGV_BYTE (buf) || byte_pos > BUF_ZV_BYTE (buf))
     xsignal1 (Qargs_out_of_range, pos);
 
+  ts_initialize ();
+
   TSNode ts_node = XTS_NODE (node)->node;
   TSNode child;
   if (NILP (named))
@@ -1433,6 +1765,8 @@ DEFUN ("treesit-node-descendant-for-range",
 	&& byte_end <= BUF_ZV_BYTE (buf)))
     xsignal2 (Qargs_out_of_range, beg, end);
 
+  ts_initialize ();
+
   TSNode ts_node = XTS_NODE (node)->node;
   TSNode child;
   if (NILP (named))
@@ -1460,6 +1794,8 @@ DEFUN ("treesit-node-eq",
   CHECK_TS_NODE (node1);
   CHECK_TS_NODE (node2);
 
+  ts_initialize ();
+
   TSNode ts_node_1 = XTS_NODE (node1)->node;
   TSNode ts_node_2 = XTS_NODE (node2)->node;
 
@@ -1749,6 +2085,8 @@ DEFUN ("treesit-query-compile",
   if (TS_COMPILED_QUERY_P (query))
     return query;
 
+  ts_initialize ();
+
   Lisp_Object lisp_query = make_ts_query (query, language);
 
   /* Maybe actually compile. */
@@ -1823,6 +2161,8 @@ DEFUN ("treesit-query-capture",
 		     Qtreesit_parser_p, Qsymbolp),
 	      node);
 
+  ts_initialize ();
+
   /* Extract C values from Lisp objects.  */
   TSNode ts_node = XTS_NODE (lisp_node)->node;
   Lisp_Object lisp_parser = XTS_NODE (lisp_node)->parser;
@@ -2113,13 +2453,15 @@ DEFUN ("treesit-search-subtree",
   ptrdiff_t the_limit = 0;
   bool no_limit = false;
   if (NILP (limit))
-      no_limit = true;
+    no_limit = true;
   else
     {
       CHECK_FIXNUM (limit);
       the_limit = XFIXNUM (limit);
     }
 
+  ts_initialize ();
+
   TSNode ts_node = XTS_NODE (node)->node;
   Lisp_Object parser = XTS_NODE (node)->parser;
   if (ts_search_dfs
@@ -2171,6 +2513,8 @@ DEFUN ("treesit-search-forward",
   CHECK_SYMBOL (backward);
   CHECK_SYMBOL (up);
 
+  ts_initialize ();
+
   TSNode ts_start = XTS_NODE (start)->node;
   Lisp_Object parser = XTS_NODE (start)->parser;
   if (ts_search_forward
@@ -2284,13 +2628,15 @@ DEFUN ("treesit-induce-sparse-tree",
   ptrdiff_t the_limit = 0;
   bool no_limit = false;
   if (NILP (limit))
-      no_limit = true;
+    no_limit = true;
   else
     {
       CHECK_FIXNUM (limit);
       the_limit = XFIXNUM (limit);
     }
 
+  ts_initialize ();
+
   TSTreeCursor cursor = ts_tree_cursor_new (XTS_NODE (root)->node);
   Lisp_Object parser = XTS_NODE (root)->parser;
   Lisp_Object parent = Fcons (Qnil, Qnil);
@@ -2304,12 +2650,28 @@ DEFUN ("treesit-induce-sparse-tree",
     return parent;
 }
 
+#endif	/* HAVE_TREE_SITTER */
+
+DEFUN ("treesit-available-p", Ftreesit_available_p,
+       Streesit_available_p, 0, 0, 0,
+       doc: /* Return non-nil if tree-sitter support is built-in and available.  */)
+  (void)
+{
+#if HAVE_TREE_SITTER
+  return load_tree_sitter_if_necessary (false) ? Qt : Qnil;
+#else
+  return Qnil;
+#endif
+}
+
+
 /*** Initialization */
 
 /* Initialize the tree-sitter routines.  */
 void
 syms_of_treesit (void)
 {
+#if HAVE_TREE_SITTER
   DEFSYM (Qtreesit_parser_p, "treesit-parser-p");
   DEFSYM (Qtreesit_node_p, "treesit-node-p");
   DEFSYM (Qtreesit_compiled_query_p, "treesit-compiled-query-p");
@@ -2340,6 +2702,10 @@ syms_of_treesit (void)
 
   DEFSYM (Qor, "or");
 
+#ifdef WINDOWSNT
+  DEFSYM (Qtree_sitter, "tree-sitter");
+#endif
+
   define_error (Qtreesit_error, "Generic tree-sitter error", Qerror);
   define_error (Qtreesit_query_error, "Query pattern is malformed",
 		Qtreesit_error);
@@ -2436,4 +2802,6 @@ syms_of_treesit (void)
   defsubr (&Streesit_search_subtree);
   defsubr (&Streesit_search_forward);
   defsubr (&Streesit_induce_sparse_tree);
+#endif	/* HAVE_TREE_SITTER */
+  defsubr (&Streesit_available_p);
 }
diff --git a/src/treesit.h b/src/treesit.h
index 20e7cd4107..ebde6ccf67 100644
--- a/src/treesit.h
+++ b/src/treesit.h
@@ -180,6 +180,10 @@ make_ts_parser (Lisp_Object buffer, TSParser *parser,
 Lisp_Object
 make_ts_node (Lisp_Object parser, TSNode node);
 
+extern void ts_delete_parser (struct Lisp_TS_Parser *);
+extern void ts_delete_query (struct Lisp_TS_Query *);
+extern bool ts_named_node_p (TSNode);
+
 extern void syms_of_treesit (void);
 
 INLINE_HEADER_END

commit f1e058d46b5a83ddd0423a3616aa50ac3ec7f551
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Oct 15 16:09:35 2022 -0700

    Update ts-mode font-lock to work with tree-sitter's :feature
    
    * lisp/progmodes/ts-mode.el (ts-mode--settings): Add :feature flag.
    (ts-mode): Set treesit-font-lock-feature-list.

diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el
index 638dfa5013..10d4b7bd18 100644
--- a/lisp/progmodes/ts-mode.el
+++ b/lisp/progmodes/ts-mode.el
@@ -108,6 +108,7 @@ ts-mode--settings
   (treesit-font-lock-rules
    :language 'tsx
    :override t
+   :feature 'basic
    '(
      (template_string) @font-lock-string-face
 
@@ -358,6 +359,7 @@ ts-mode
 
     (setq-local treesit-font-lock-settings ts-mode--settings)
 
+    (setq treesit-font-lock-feature-list '((basic)))
     (treesit-font-lock-enable))
    (t
     (message "Tree sitter for TypeScript isn't available, defaulting to js-mode")

commit bb8a46e559ec39437a1524b3e9746746768effcc
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Oct 13 15:08:20 2022 -0700

    Update tree-sitter manual to reflect the previous commit
    
    * doc/lispref/modes.texi: Update manual to reflect previous change:
    remove :toggle and :level, add :feature.  Document new variables and
    functions.
    * doc/lispref/parsing.texi: Add the missing closing bracket in
    @code{(t . nil)}.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index b1287c6ad0..ed232556b2 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3911,10 +3911,12 @@ Parser-based Font Lock
 @group
 (treesit-font-lock-rules
  :language 'javascript
+ :feature 'constant
  :override t
  '((true) @@font-lock-constant-face
    (false) @@font-lock-constant-face)
  :language 'html
+ :feature 'script
  "(script_element) @@font-lock-builtin-face")
 @end group
 @end example
@@ -3922,7 +3924,12 @@ Parser-based Font Lock
 This function takes a list of text or s-exp queries.  Before each
 query, there are @var{:keyword} and @var{value} pairs that configure
 that query.  The @code{:lang} keyword sets the query’s language and
-every query must specify the language.  Other keywords are optional:
+every query must specify the language.  The @code{:feature} keyword
+sets the feature name of the query.  Users can control which features
+are enabled with @code{font-lock-maximum-decoration} and
+@code{treesit-font-lock-feature-list} (see below).
+
+Other keywords are optional:
 
 @multitable @columnfractions .15 .15 .6
 @headitem Keyword @tab Value @tab Description
@@ -3932,21 +3939,8 @@ Parser-based Font Lock
 @item @tab @code{append} @tab Append the new face to existing ones
 @item @tab @code{prepend} @tab Prepend the new face to existing ones
 @item @tab @code{keep} @tab Fill-in regions without an existing face
-@item @code{:toggle} @tab @var{symbol} @tab
-If non-nil, its value should be a variable name.  The variable's value
-(nil/non-nil) disables/enables the query during fontification.
-@item @tab nil @tab Always enable this query.
-@item @code{:level} @tab @var{integer} @tab
-If non-nil, its value should be the decoration level for this query.
-Decoration level is controlled by @code{font-lock-maximum-decoration}.
-@item @tab nil @tab Always enable this query.
 @end multitable
 
-Note that a query is applied only when both @code{:toggle} and
-@code{:level} permit it.  @code{:level} is used for global,
-coarse-grained control, whereas @code{:toggle} is for local,
-fine-grained control.
-
 Capture names in @var{query} should be face names like
 @code{font-lock-keyword-face}.  The captured node will be fontified
 with that face.  Capture names can also be function names, in which
@@ -3957,6 +3951,42 @@ Parser-based Font Lock
 name is not a face name nor a function name, it is ignored.
 @end defun
 
+@defvar treesit-font-lock-feature-list
+This is a list of lists of feature symbols.
+
+Each sublist represents a decoration level.
+@code{font-lock-maximum-decoration} controls which levels are
+activated.
+
+Inside each sublist are feature symbols, which corresponds to the
+@code{:feature} value of a query defined in
+@code{treesit-font-lock-rules}.  Removing a feature symbol from this
+list disables the corresponding query during font-lock.
+
+Common feature names (for general programming language) include
+function-name, type, variable-name (LHS of assignments), builtin,
+constant, keyword, string-interpolation, comment, doc, string,
+operator, preprocessor, escape-sequence, key (in key-value
+pairs).  Major modes are free to subdivide or extend on these
+common features.
+
+For example, the value of this variable could be:
+@example
+@group
+((comment string doc) ; level 1
+ (function-name keyword type builtin constant) ; level 2
+ (variable-name string-interpolation key)) ; level 3
+@end group
+@end example
+
+Major modes should set this variable before calling
+@code{treesit-font-lock-enable}.
+
+@findex treesit-font-lock-recompute-features
+In addition, for further changes to this variable to take effect, run
+@code{treesit-font-lock-recompute-features}.
+@end defvar
+
 @defvar treesit-font-lock-settings
 A list of @var{setting}s for tree-sitter font lock.  The exact format
 of this variable is considered internal.  One should always use
@@ -3965,12 +3995,21 @@ Parser-based Font Lock
 Each @var{setting} is of form
 
 @example
-(@var{language} @var{query})
+(@var{query} @var{enable} @var{feature} @var{override})
 @end example
 
-Each @var{setting} controls one parser (often of different language).
-And @var{language} is the language symbol (@pxref{Language
-Definitions}); @var{query} is the query (@pxref{Pattern Matching}).
+@var{query} must be a compiled query (@pxref{Pattern Matching}).
+
+For @var{setting} to be activated for font-lock, @var{enable} must be
+t.  To disable this @var{setting}, set @var{enable} to nil.
+
+@var{feature} is the ``feature name'' of the query, users can control
+which features are enabled with @code{font-lock-maximum-decoration}
+and @code{treesit-font-lock-feature-list}.
+
+@var{override} is the override flag for this query.  Its value can be
+t, nil, append, prepend, keep.  See more in
+@code{treesit-font-lock-rules}.
 @end defvar
 
 Multi-language major modes should provide range functions in
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 8b684d11fc..d2a333027b 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -87,9 +87,9 @@ Language Definitions
 This function returns non-nil if @var{language} exists and is
 loadable.
 
-If @var{detail} is non-nil, return @code{(t . nil) when @var{language}
-is available, @code{(nil . DATA)} when unavailable.  @var{data} is the
-signal data of @code{treesit-load-language-error}.
+If @var{detail} is non-nil, return @code{(t . nil)} when
+@var{language} is available, @code{(nil . DATA)} when unavailable.
+@var{data} is the signal data of @code{treesit-load-language-error}.
 @end defun
 
 @vindex treesit-load-name-override-list

commit af288d813b3c31a528ddcbdce08f497855a56e94
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Oct 13 14:44:42 2022 -0700

    Rework tree-sitter font-lock
    
    Remove :toggle and :level, add :feature.
    
    * lisp/progmodes/js.el (js--treesit-settings): Add :feature.
    (js--treesit-enable): Set treesit-font-lock-feature-list.
    * lisp/progmodes/python.el: Replace :level with :feature.
    (python-mode): Set treesit-font-lock-feature-list.
    * lisp/treesit.el (treesit-font-lock-feature-list): New variable.
    (treesit-font-lock-settings): Change format.
    (treesit-font-lock-rules): Remove :toggle and :level, add :feature.
    (treesit-font-lock-recompute-features): New function.
    (treesit-font-lock-fontify-region): Change to work with the new
    format.
    (treesit-font-lock-enable): Add call to
    treesit-font-lock-recompute-features.  And improve the font-lock-mode
    workaround.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 1b82e204b9..18499a466a 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3459,6 +3459,7 @@ js--treesit-keywords
 (defvar js--treesit-settings
   (treesit-font-lock-rules
    :language 'javascript
+   :feature 'basic
    :override t
    `(;; Everything overrides template string.
      (template_string) @font-lock-string-face
@@ -3637,8 +3638,9 @@ js--treesit-enable
   (setq-local beginning-of-defun-function #'js--treesit-beginning-of-defun)
   (setq-local end-of-defun-function #'js--treesit-end-of-defun)
 
-  (setq-local font-lock-defaults '(nil t))
+  (setq-local font-lock-keywords-only t)
   (setq-local treesit-font-lock-settings js--treesit-settings)
+  (setq-local treesit-font-lock-feature-list '((basic)))
 
   (add-hook 'which-func-functions #'js-treesit-current-defun nil t)
 
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index a0466707e6..c48f9e95e9 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1032,7 +1032,7 @@ python--treesit-fontify-string
 (defvar python--treesit-settings
   (treesit-font-lock-rules
    :language 'python
-   :level 1
+   :feature 'basic
    '(;; Queries for def and class.
      (function_definition
       name: (identifier) @font-lock-function-name-face)
@@ -1048,7 +1048,7 @@ python--treesit-settings
       (:match "^\"\"\"" @font-lock-doc-face))
      (interpolation (identifier) @font-lock-variable-name-face))
    :language 'python
-   :level 2
+   :feature 'moderate
    :override t
    `(;; Keywords, builtins, and constants.
      [,@python--treesit-keywords] @font-lock-keyword-face
@@ -1066,7 +1066,7 @@ python--treesit-settings
 
      [(true) (false) (none)] @font-lock-constant-face)
    :language 'python
-   :level 3
+   :feature 'elaborate
    :override t
    `(;; Variable names.
      (assignment left: (identifier)
@@ -6401,7 +6401,9 @@ python-mode
   (if (and python-use-tree-sitter
            (treesit-can-enable-p))
       (progn
-        (setq-local font-lock-defaults '(nil t))
+        (setq-local font-lock-keywords-only t)
+        (setq-local treesit-font-lock-feature-list
+                    '((basic) (moderate) (elaborate)))
         (setq-local treesit-font-lock-settings
                     python--treesit-settings)
         (treesit-font-lock-enable))
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 1e911df1d9..c8ba3e84e6 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -284,6 +284,28 @@ 'treesit-font-lock-error
               "Generic tree-sitter font-lock error"
               'treesit-error)
 
+(defvar-local treesit-font-lock-feature-list nil
+  "A list of lists of feature symbols.
+
+Each sublist represents a decoration level.
+`font-lock-maximum-decoration' controls which levels are
+activated.
+
+Inside each sublist are feature symbols, which corresponds to the
+:feature value of a query defined in `treesit-font-lock-rules'.
+Removing a feature symbol from this list disables the
+corresponding query during font-lock.
+
+Common feature names (for general programming language) include
+function-name, type, variable-name (LHS of assignments), builtin,
+constant, keyword, string-interpolation, comment, doc, string,
+operator, preprocessor, escape-sequence, key (in key-value
+pairs).  Major modes are free to subdivide or extend on these
+common features.
+
+For changes to this variable to take effect, run
+`treesit-font-lock-recompute-features'.")
+
 (defvar-local treesit-font-lock-settings nil
   "A list of SETTINGs for treesit-based fontification.
 
@@ -292,30 +314,21 @@ treesit-font-lock-settings
 
 Each SETTING is of form
 
-    (LANGUAGE QUERY OVERRIDE TOGGLE LEVEL)
+    (QUERY ENABLE FEATURE OVERRIDE)
 
-Each SETTING controls one parser (often of different language).
-LANGUAGE is the language symbol.  See Info node `(elisp)Language
-Definitions'.
+QUERY must be a compiled query.  See Info node `(elisp)Pattern
+Matching' for how to write a query and compile it.
 
-QUERY is either a string query, a sexp query, or a compiled
-query.  See Info node `(elisp)Pattern Matching' for how to write
-a query in either string or s-expression form.  When using
-repeatedly, a compiled query is much faster than a string or sexp
-one, so it is recommend to compile your queries if it will be
-used over and over.
+For SETTING to be activated for font-lock, ENABLE must be t.  To
+disable this SETTING, set ENABLE to nil.
+
+FEATURE is the \"feature name\" of the query, users can control
+which features are enabled with `font-lock-maximum-decoration'
+and `treesit-font-lock-feature-list'.
 
 OVERRIDE is the override flag for this query.  Its value can be
 t, nil, append, prepend, keep.  See more in
-`treesit-font-lock-rules'.
-
-TOGGLE should be a variable (symbol) or nil.  The variable's
-value (nil/non-nil) controls whether to activate the query during
-fontification.  If TOGGLE is nil, the query is always activated.
-
-LEVEL is the decoration level of this query or nil.  Decoration
-level is controlled by `font-lock-maximum-decoration'.  If LEVEL
-is nil, the query is always activated.")
+`treesit-font-lock-rules'.")
 
 (defun treesit-font-lock-rules (&rest args)
   "Return a value suitable for `treesit-font-lock-settings'.
@@ -331,14 +344,18 @@ treesit-font-lock-rules
     (treesit-font-lock-rules
      :language \\='javascript
      :override t
-     :enable 'html-fontify-script
+     :feature\\='constant
      \\='((true) @font-lock-constant-face
        (false) @font-lock-constant-face)
      :language \\='html
+     :feature \\='script
      \"(script_element) @font-lock-builtin-face\")
 
-For each QUERY, a :language keyword is required.  Other keywords
-include:
+For each QUERY, a :language keyword and a :feature keyword is
+required. Each query's :feature is a symbol summarizing what does
+the query fontify.  It is used to allow users to enable/disable
+certain features.  See `treesit-font-lock-kind-list' for more.
+Other keywords include:
 
   KEYWORD    VALUE    DESCRIPTION
   :override  nil      If the region already has a face,
@@ -347,19 +364,6 @@ treesit-font-lock-rules
              append   Append the new face to existing ones
              prepend  Prepend the new face to existing ones
              keep     Fill-in regions without an existing face
-  :toggle    <symbol> If non-nil, the value should be a variable.
-                      The value of that variable (non-nil/nil)
-                      activates/deactivates the query during
-                      fontification.
-             nil      Always activate this query.
-  :level     <integer>If non-nil, the value is the decoration
-                      level of this query.
-                      (See `font-lock-maximum-decoration'.)
-             nil      Always activate this query.
-
-Note that a query is applied only when both :toggle and :level
-permit it.  :level is used for global, coarse-grained control,
-whereas :toggle is for local, fine-grained control.
 
 Capture names in QUERY should be face names like
 `font-lock-keyword-face'.  The captured node will be fontified
@@ -375,7 +379,7 @@ treesit-font-lock-rules
   (let (;; Tracks the current :language/:override/:toggle/:level value
         ;; that following queries will apply to.
         current-language current-override
-        current-toggle current-level
+        current-feature
         ;; The list this function returns.
         (result nil))
     (while args
@@ -399,21 +403,14 @@ treesit-font-lock-rules
                        `((or t nil append prepend keep)
                          ,flag)))
              (setq current-override flag)))
-          (:toggle
+          (:feature
            (let ((var (pop args)))
              (when (or (not (symbolp var))
                        (memq var '(t nil)))
                (signal 'treesit-font-lock-error
-                       `("Value of :toggle should be a variable name"
+                       `("Value of :feature should be a symbol"
                          ,var)))
-             (setq current-toggle var)))
-          (:level
-           (let ((level (pop args)))
-             (when (not (and (integerp level) (> level 0)))
-               (signal 'treesit-font-lock-error
-                       `("Value of :level should be a positive integer"
-                         ,level)))
-             (setq current-level level)))
+             (setq current-feature var)))
           ;; (2) Process query.
           ((pred treesit-query-p)
            (when (null current-language)
@@ -421,21 +418,40 @@ treesit-font-lock-rules
                      `("Language unspecified, use :language keyword to specify a language for this query" ,token)))
            (if (treesit-compiled-query-p token)
                (push `(,current-language token) result)
-             (push `(,current-language
-                     ,(treesit-query-compile current-language token)
-                     ,current-override
-                     ,current-toggle
-                     ,current-level)
+             (push `(,(treesit-query-compile current-language token)
+                     t
+                     ,current-feature
+                     ,current-override)
                    result))
            ;; Clears any configurations set for this query.
            (setq current-language nil
                  current-override nil
-                 current-toggle nil
-                 current-level nil))
+                 current-feature nil))
           (_ (signal 'treesit-font-lock-error
-                     `("Unexpected value" token))))))
+                     `("Unexpected value" ,token))))))
     (nreverse result)))
 
+(defun treesit-font-lock-recompute-features ()
+  "Enable/disable font-lock settings according to decoration level.
+Sets the ENABLE flag for each setting in
+`treesit-font-lock-settings', according to
+`treesit-font-lock-feature-list' and
+`font-lock-maximum-decoration'."
+  (let* ((level (font-lock-value-in-major-mode
+                 font-lock-maximum-decoration))
+         (features (cl-loop
+                    for idx = 0 then (1+ idx)
+                    for features in treesit-font-lock-feature-list
+                    if (or (eq level t)
+                           (>= level (1+ idx)))
+                    append features)))
+    (cl-loop for idx = 0 then (1+ idx)
+             for setting in treesit-font-lock-settings
+             for feature = (nth 2 setting)
+             ;; Set the ENABLE flag for the setting.
+             do (setf (nth 1 (nth idx treesit-font-lock-settings))
+                      (if (memq feature features) t nil)))))
+
 (defun treesit-font-lock-fontify-region
     (start end &optional loudly)
   "Fontify the region between START and END.
@@ -443,27 +459,16 @@ treesit-font-lock-fontify-region
   (treesit-update-ranges start end)
   (font-lock-unfontify-region start end)
   (dolist (setting treesit-font-lock-settings)
-    (let* ((language (nth 0 setting))
-           (match-pattern (nth 1 setting))
-           (override (nth 2 setting))
-           (toggle (nth 3 setting))
-           (level (nth 4 setting))
-           (parser (treesit-parser-create language)))
-      (when-let ((node (treesit-node-on start end parser))
-                 ;; Only activate this query if both :toggle and
-                 ;; :level permit it.
-                 (activate
-                  (and (or (null toggle)
-                           (symbol-value toggle))
-                       (or (null level)
-                           (pcase (font-lock-value-in-major-mode
-                                   font-lock-maximum-decoration)
-                             ('t t)
-                             ('nil (eq level 1))
-                             (lvl (<= level lvl)))))))
+    (let* ((query (nth 0 setting))
+           (enable (nth 1 setting))
+           (override (nth 3 setting))
+           (language (treesit-query-language query)))
+      (when-let ((node (treesit-node-on start end language))
+                 ;; Only activate if ENABLE flag is t.
+                 (activate (eq t enable)))
         (ignore activate)
         (let ((captures (treesit-query-capture
-                         node match-pattern
+                         node query
                          ;; Specifying the range is important. More
                          ;; often than not, NODE will be the root
                          ;; node, and if we don't specify the range,
@@ -508,17 +513,15 @@ treesit-font-lock-fontify-region
 
 (defun treesit-font-lock-enable ()
   "Enable tree-sitter font-locking for the current buffer."
+  (treesit-font-lock-recompute-features)
   (setq-local font-lock-fontify-region-function
               #'treesit-font-lock-fontify-region)
   ;; If we don't set `font-lock-defaults' to some non-nil value,
-  ;; font-lock doesn't enable properly (the font-lock-mode-internal
-  ;; doesn't run).  See `font-lock-add-keywords'.
-  (when (and font-lock-mode
-             (null font-lock-keywords)
-             (null font-lock-defaults))
-    (font-lock-mode -1)
-    (setq-local font-lock-defaults '(nil t))
-    (font-lock-mode 1)))
+  ;; font-lock doesn't enable properly (`font-lock-mode-internal'
+  ;; doesn't run).  See `font-lock-specified-p'.
+  (when (null font-lock-defaults)
+    (setq font-lock-defaults '(nil)))
+  (font-lock-mode 1))
 
 ;;; Indent
 

commit f0e9085a17be8866c123b120e3252c52845ec38e
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Oct 13 14:40:38 2022 -0700

    * doc/lispref/parsing.texi: Add manual for treesit-query-language.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index c73175e3c3..8b684d11fc 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -1188,6 +1188,10 @@ Pattern Matching
 error.  You can use @code{treesit-query-validate} to debug the query.
 @end defun
 
+@defun treesit-query-language query
+This function return the language of @var{query}.
+@end defun
+
 @defun treesit-query-expand query
 This function expands the s-expression @var{query} into a string
 query.

commit bc66ff98756fa28bbc733ef81103cac6730438fa
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Oct 13 14:39:51 2022 -0700

    * src/treesit.c (Ftreesit_query_language): New function.

diff --git a/src/treesit.c b/src/treesit.c
index 2b2e9c6d79..7cfcc715f9 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -781,6 +781,16 @@ DEFUN ("treesit-query-p",
     return Qnil;
 }
 
+DEFUN ("treesit-query-language",
+       Ftreesit_query_language, Streesit_query_language, 1, 1, 0,
+       doc: /* Return the language of QUERY.
+QUERY has to be a compiled query.  */)
+  (Lisp_Object query)
+{
+  CHECK_TS_COMPILED_QUERY (query);
+  return XTS_COMPILED_QUERY(query)->language;
+}
+
 DEFUN ("treesit-node-parser",
        Ftreesit_node_parser, Streesit_node_parser,
        1, 1, 0,
@@ -2386,6 +2396,7 @@ syms_of_treesit (void)
   defsubr (&Streesit_node_p);
   defsubr (&Streesit_compiled_query_p);
   defsubr (&Streesit_query_p);
+  defsubr (&Streesit_query_language);
 
   defsubr (&Streesit_node_parser);
 

commit 0b3f785c4a272b909108108cf7931779ae48cfba
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Oct 12 10:38:35 2022 -0700

    Better signal data for treesit-load-language-error
    
    * src/treesit.c (ts_load_language): Better formatted signal data,
    (Ftreesit_langauge_available_p): Optionally return the signal data if
    language not available.
    * doc/lispref/parsing.texi: Document the signal data in detail.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index d0bb642a3e..c73175e3c3 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -70,16 +70,26 @@ Language Definitions
 In order to use a language definition in Emacs, you need to make sure
 that the dynamic library is installed on the system.  Emacs looks for
 language definitions under load paths in
-@code{treesit-extra-load-path}, @code{user-emacs-directory}/tree-sitter,
-and system default locations for dynamic libraries, in that order.
-Emacs tries each extensions in @code{treesit-load-suffixes}.  If Emacs
-cannot find the library or has problem loading it, Emacs signals
-@code{treesit-load-language-error}.  The signal data is a list of
-specific error messages.
+@code{treesit-extra-load-path},
+@code{user-emacs-directory}/tree-sitter, and system default locations
+for dynamic libraries, in that order.  Emacs tries each extensions in
+@code{treesit-load-suffixes}.  If Emacs cannot find the library or has
+problem loading it, Emacs signals @code{treesit-load-language-error}.
+
+The signal data could be @code{(not-found @var{error-msg} ...)} if
+Emacs cannot find the language definition, or @code{(symbol-error
+@var{error-msg})} if the Emacs cannot find the correct symbol in the
+language definition, or @code{(version_mismatch @var{error-msg})} if
+the language definition's version does match that of the tree-sitter
+library.
 
 @defun treesit-language-available-p language
-This function checks whether the dynamic library for @var{language} is
-present on the system, and return non-nil if it is.
+This function returns non-nil if @var{language} exists and is
+loadable.
+
+If @var{detail} is non-nil, return @code{(t . nil) when @var{language}
+is available, @code{(nil . DATA)} when unavailable.  @var{data} is the
+signal data of @code{treesit-load-language-error}.
 @end defun
 
 @vindex treesit-load-name-override-list
diff --git a/src/treesit.c b/src/treesit.c
index 2565464dea..2b2e9c6d79 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -193,10 +193,7 @@ ts_symbol_to_c_name (char *symbol_name)
 }
 
 /* Load the dynamic library of LANGUAGE_SYMBOL and return the pointer
-   to the language definition.  Signals
-   Qtreesit_load_language_error if something goes wrong.
-   Qtreesit_load_language_error carries the error message from
-   trying to load the library with each extension.
+   to the language definition.
 
    If error occurs, return NULL and fill SIGNAL_SYMBOL and SIGNAL_DATA
    with values suitable for xsignal. */
@@ -267,7 +264,7 @@ ts_load_language (Lisp_Object language_symbol,
   if (error != NULL)
     {
       *signal_symbol = Qtreesit_load_language_error;
-      *signal_data = list2 (symbol_name, Fnreverse (error_list));
+      *signal_data = Fcons (Qnot_found, Fnreverse (error_list));
       return NULL;
     }
 
@@ -279,7 +276,7 @@ ts_load_language (Lisp_Object language_symbol,
   if (error != NULL)
     {
       *signal_symbol = Qtreesit_load_language_error;
-      *signal_data = build_string (error);
+      *signal_data = list2 (Qsymbol_error, build_string (error));
       return NULL;
     }
   TSLanguage *lang = (*langfn) ();
@@ -291,7 +288,7 @@ ts_load_language (Lisp_Object language_symbol,
   if (!success)
     {
       *signal_symbol = Qtreesit_load_language_error;
-      *signal_data = list2 (build_pure_c_string ("Language version doesn't match tree-sitter version, language version:"),
+      *signal_data = list2 (Qversion_mismatch,
 			    make_fixnum (ts_language_version (lang)));
       return NULL;
     }
@@ -301,18 +298,32 @@ ts_load_language (Lisp_Object language_symbol,
 DEFUN ("treesit-language-available-p",
        Ftreesit_langauge_available_p,
        Streesit_language_available_p,
-       1, 1, 0,
-       doc: /* Return non-nil if LANGUAGE exists and is loadable.  */)
-  (Lisp_Object language)
+       1, 2, 0,
+       doc: /* Return non-nil if LANGUAGE exists and is loadable.
+
+If DETAIL is non-nil, return (t . nil) when LANGUAGE is available,
+(nil . DATA) when unavailable.  DATA is the signal data of
+`treesit-load-language-error'.  */)
+  (Lisp_Object language, Lisp_Object detail)
 {
   CHECK_SYMBOL (language);
   ts_initialize ();
   Lisp_Object signal_symbol = Qnil;
   Lisp_Object signal_data = Qnil;
   if (ts_load_language(language, &signal_symbol, &signal_data) == NULL)
-    return Qnil;
+    {
+      if (NILP (detail))
+	return Qnil;
+      else
+	return Fcons (Qnil, signal_data);
+    }
   else
-    return Qt;
+    {
+      if (NILP (detail))
+	return Qt;
+      else
+	return Fcons (Qt, Qnil);
+    }
 }
 
 DEFUN ("treesit-language-version",
@@ -2299,6 +2310,10 @@ syms_of_treesit (void)
   DEFSYM (Qhas_changes, "has-changes");
   DEFSYM (Qhas_error, "has-error");
 
+  DEFSYM (Qnot_found, "not-found");
+  DEFSYM (Qsymbol_error, "symbol-error");
+  DEFSYM (Qversion_mismatch, "version-mismatch");
+
   DEFSYM (Qtreesit_error, "treesit-error");
   DEFSYM (Qtreesit_query_error, "treesit-query-error");
   DEFSYM (Qtreesit_parse_error, "treesit-parse-error");

commit 77f1533ccbba1a5dc0824770046696181a2b7b6c
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Oct 11 23:49:04 2022 -0700

    ; Comment and docstring fixup in ts-mode.el
    
    * lisp/progmodes/ts-mode.el: Add comment section and docstrings.

diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el
index 99ffe0c0f6..638dfa5013 100644
--- a/lisp/progmodes/ts-mode.el
+++ b/lisp/progmodes/ts-mode.el
@@ -22,6 +22,8 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+;;; Code:
+
 (require 'treesit)
 (require 'rx)
 (require 'js)
@@ -99,7 +101,8 @@ ts-mode--indent-rules
      ((node-is "/") parent 0)
      ((parent-is "jsx_self_closing_element")
       parent ,ts-mode-indent-offset)
-     (no-node parent-bol 0))))
+     (no-node parent-bol 0)))
+  "Tree-sitter indent rules.")
 
 (defvar ts-mode--settings
   (treesit-font-lock-rules
@@ -281,7 +284,8 @@ ts-mode--settings
       ] @font-lock-keyword-face
 
      (comment) @font-lock-comment-face
-     )))
+     ))
+  "Tree-sitter font-lock settings.")
 
 (defvar ts-mode--defun-type-regexp
   (rx (or "class_declaration"

commit 45b8204e09b7d399b792bb26c799efe48835c4a7
Author: Theodor Thornhill <theo@thornhill.no>
Date:   Tue Oct 11 10:27:55 2022 +0200

    Add TypeScript support with tree-sitter
    
    * lisp/progmodes/ts-mode.el (ts-mode): New major mode for TypeScript
    with support for tree-sitter.  It uses the TSX parser, so that we get
    support for TSX as well as TypeScript.  If we cannot find tree-sitter,
    we default to using js-mode.

diff --git a/etc/NEWS b/etc/NEWS
index 88b1431d6a..c5a142b500 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2774,6 +2774,13 @@ Emacs buffers, like indentation and the like.  The new ert function
 This is a lightweight variant of 'js-mode' that is used by default
 when visiting JSON files.
 
+
+** New mode ts-mode'.
+Support is added for TypeScript, based on the new integration with
+Tree-Sitter. There's support for font-locking, indentation and
+navigation.  Tree-Sitter is required for this mode to function, but if
+it is not available, we will default to use 'js-mode'.
+
 
 * Incompatible Lisp Changes in Emacs 29.1
 
diff --git a/lisp/progmodes/ts-mode.el b/lisp/progmodes/ts-mode.el
new file mode 100644
index 0000000000..99ffe0c0f6
--- /dev/null
+++ b/lisp/progmodes/ts-mode.el
@@ -0,0 +1,364 @@
+;;; ts-mode.el --- tree sitter support for TypeScript  -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2022 Free Software Foundation, Inc.
+
+;; Author     : Theodor Thornhill <theo@thornhill.no>
+;; Maintainer : Theodor Thornhill <theo@thornhill.no>
+;; Created    : October 2022
+;; Keywords   : typescript tsx languages tree-sitter
+
+;; This file is part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+(require 'treesit)
+(require 'rx)
+(require 'js)
+
+(defcustom ts-mode-indent-offset 2
+  "Number of spaces for each indentation step in `ts-mode'."
+  :type 'integer
+  :safe 'integerp
+  :group 'typescript)
+
+(defvar ts-mode--syntax-table
+  (let ((table (make-syntax-table)))
+    ;; Taken from the cc-langs version
+    (modify-syntax-entry ?_  "_"     table)
+    (modify-syntax-entry ?$ "_"      table)
+    (modify-syntax-entry ?\\ "\\"    table)
+    (modify-syntax-entry ?+  "."     table)
+    (modify-syntax-entry ?-  "."     table)
+    (modify-syntax-entry ?=  "."     table)
+    (modify-syntax-entry ?%  "."     table)
+    (modify-syntax-entry ?<  "."     table)
+    (modify-syntax-entry ?>  "."     table)
+    (modify-syntax-entry ?&  "."     table)
+    (modify-syntax-entry ?|  "."     table)
+    (modify-syntax-entry ?` "\""     table)
+    (modify-syntax-entry ?\240 "."   table)
+    table)
+  "Syntax table for `ts-mode'.")
+
+(defvar ts-mode--indent-rules
+  `((tsx
+     ((node-is "}") parent-bol 0)
+     ((node-is ")") parent-bol 0)
+     ((node-is "]") parent-bol 0)
+     ((node-is ">") parent-bol 0)
+     ((node-is ".")
+      parent-bol ,ts-mode-indent-offset)
+     ((parent-is "ternary_expression")
+      parent-bol ,ts-mode-indent-offset)
+     ((parent-is "named_imports")
+      parent-bol ,ts-mode-indent-offset)
+     ((parent-is "statement_block")
+      parent-bol ,ts-mode-indent-offset)
+     ((parent-is "type_arguments")
+      parent-bol ,ts-mode-indent-offset)
+     ((parent-is "variable_declarator")
+      parent-bol ,ts-mode-indent-offset)
+     ((parent-is "arguments")
+      parent-bol ,ts-mode-indent-offset)
+     ((parent-is "array")
+      parent-bol ,ts-mode-indent-offset)
+     ((parent-is "formal_parameters")
+      parent-bol ,ts-mode-indent-offset)
+     ((parent-is "template_substitution")
+      parent-bol ,ts-mode-indent-offset)
+     ((parent-is "object_pattern")
+      parent-bol ,ts-mode-indent-offset)
+     ((parent-is "object")
+      parent-bol ,ts-mode-indent-offset)
+     ((parent-is "object_type")
+      parent-bol ,ts-mode-indent-offset)
+     ((parent-is "enum_body")
+      parent-bol ,ts-mode-indent-offset)
+     ((parent-is "arrow_function")
+      parent-bol ,ts-mode-indent-offset)
+     ((parent-is "parenthesized_expression")
+      parent-bol ,ts-mode-indent-offset)
+
+     ;; TSX
+     ((parent-is "jsx_opening_element")
+      parent ,ts-mode-indent-offset)
+     ((node-is "jsx_closing_element") parent 0)
+     ((parent-is "jsx_element")
+      parent ,ts-mode-indent-offset)
+     ((node-is "/") parent 0)
+     ((parent-is "jsx_self_closing_element")
+      parent ,ts-mode-indent-offset)
+     (no-node parent-bol 0))))
+
+(defvar ts-mode--settings
+  (treesit-font-lock-rules
+   :language 'tsx
+   :override t
+   '(
+     (template_string) @font-lock-string-face
+
+     ((identifier) @font-lock-constant-face
+      (:match "^[A-Z_][A-Z_\\d]*$" @font-lock-constant-face))
+
+     (nested_type_identifier
+      module: (identifier) @font-lock-type-face)
+     (type_identifier) @font-lock-type-face
+     (predefined_type) @font-lock-type-face
+
+     (new_expression
+      constructor: (identifier) @font-lock-type-face)
+
+     (function
+      name: (identifier) @font-lock-function-name-face)
+
+     (function_declaration
+      name: (identifier) @font-lock-function-name-face)
+
+     (method_definition
+      name: (property_identifier) @font-lock-function-name-face)
+
+     (variable_declarator
+      name: (identifier) @font-lock-function-name-face
+      value: [(function) (arrow_function)])
+
+     (variable_declarator
+      name: (array_pattern
+             (identifier)
+             (identifier) @font-lock-function-name-face)
+      value: (array (number) (function)))
+
+     (assignment_expression
+      left: [(identifier) @font-lock-function-name-face
+             (member_expression
+              property: (property_identifier) @font-lock-function-name-face)]
+      right: [(function) (arrow_function)])
+
+     (call_expression
+      function:
+      [(identifier) @font-lock-function-name-face
+       (member_expression
+        property: (property_identifier) @font-lock-function-name-face)])
+
+     (variable_declarator
+      name: (identifier) @font-lock-variable-name-face)
+
+     (enum_declaration (identifier) @font-lock-type-face)
+
+     (enum_body (property_identifier) @font-lock-type-face)
+
+     (enum_assignment name: (property_identifier) @font-lock-type-face)
+
+     (assignment_expression
+      left: [(identifier) @font-lock-variable-name-face
+             (member_expression
+              property: (property_identifier) @font-lock-variable-name-face)])
+
+     (for_in_statement
+      left: (identifier) @font-lock-variable-name-face)
+
+     (arrow_function
+      parameter: (identifier) @font-lock-variable-name-face)
+
+     (arrow_function
+      parameters:
+      [(_ (identifier) @font-lock-variable-name-face)
+       (_ (_ (identifier) @font-lock-variable-name-face))
+       (_ (_ (_ (identifier) @font-lock-variable-name-face)))])
+
+
+     (pair key: (property_identifier) @font-lock-variable-name-face)
+
+     (pair value: (identifier) @font-lock-variable-name-face)
+
+     (pair
+      key: (property_identifier) @font-lock-function-name-face
+      value: [(function) (arrow_function)])
+
+     (property_signature
+      name: (property_identifier) @font-lock-variable-name-face)
+
+     ((shorthand_property_identifier) @font-lock-variable-name-face)
+
+     (pair_pattern
+      key: (property_identifier) @font-lock-variable-name-face)
+
+     ((shorthand_property_identifier_pattern)
+      @font-lock-variable-name-face)
+
+     (array_pattern (identifier) @font-lock-variable-name-face)
+
+     (jsx_opening_element
+      [(nested_identifier (identifier)) (identifier)]
+      @font-lock-function-name-face)
+
+     (jsx_closing_element
+      [(nested_identifier (identifier)) (identifier)]
+      @font-lock-function-name-face)
+
+     (jsx_self_closing_element
+      [(nested_identifier (identifier)) (identifier)]
+      @font-lock-function-name-face)
+
+     (jsx_attribute (property_identifier) @font-lock-constant-face)
+
+     [(this) (super)] @font-lock-keyword-face
+
+     [(true) (false) (null)] @font-lock-constant-face
+     (regex pattern: (regex_pattern)) @font-lock-string-face
+     (number) @font-lock-constant-face
+
+     (string) @font-lock-string-face
+     (template_string) @font-lock-string-face
+
+     (template_substitution
+      ["${" "}"] @font-lock-constant-face)
+
+     ["!"
+      "abstract"
+      "as"
+      "async"
+      "await"
+      "break"
+      "case"
+      "catch"
+      "class"
+      "const"
+      "continue"
+      "debugger"
+      "declare"
+      "default"
+      "delete"
+      "do"
+      "else"
+      "enum"
+      "export"
+      "extends"
+      "finally"
+      "for"
+      "from"
+      "function"
+      "get"
+      "if"
+      "implements"
+      "import"
+      "in"
+      "instanceof"
+      "interface"
+      "keyof"
+      "let"
+      "namespace"
+      "new"
+      "of"
+      "private"
+      "protected"
+      "public"
+      "readonly"
+      "return"
+      "set"
+      "static"
+      "switch"
+      "target"
+      "throw"
+      "try"
+      "type"
+      "typeof"
+      "var"
+      "void"
+      "while"
+      "with"
+      "yield"
+      ] @font-lock-keyword-face
+
+     (comment) @font-lock-comment-face
+     )))
+
+(defvar ts-mode--defun-type-regexp
+  (rx (or "class_declaration"
+          "method_definition"
+          "function_declaration"
+          "lexical_declaration"))
+  "Regular expression that matches type of defun nodes.
+Used in `ts-mode--beginning-of-defun' and friends.")
+
+(defun ts-mode--beginning-of-defun (&optional arg)
+  "Tree-sitter `beginning-of-defun' function.
+ARG is the same as in `beginning-of-defun."
+  (let ((arg (or arg 1)))
+    (if (> arg 0)
+        ;; Go backward.
+        (while (and (> arg 0)
+                    (treesit-search-forward-goto
+                     ts-mode--defun-type-regexp 'start nil t))
+          (setq arg (1- arg)))
+      ;; Go forward.
+      (while (and (< arg 0)
+                  (treesit-search-forward-goto
+                   ts-mode--defun-type-regexp 'start))
+        (setq arg (1+ arg))))))
+
+(defun ts-mode--end-of-defun (&optional arg)
+  "Tree-sitter `end-of-defun' function.
+ARG is the same as in `end-of-defun."
+  (let ((arg (or arg 1)))
+    (if (< arg 0)
+        ;; Go backward.
+        (while (and (< arg 0)
+                    (treesit-search-forward-goto
+                     ts-mode--defun-type-regexp 'end nil t))
+          (setq arg (1+ arg)))
+      ;; Go forward.
+      (while (and (> arg 0)
+                  (treesit-search-forward-goto
+                   ts-mode--defun-type-regexp 'end))
+        (setq arg (1- arg))))))
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.ts\\'" . ts-mode))
+
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.tsx\\'" . ts-mode))
+
+;;;###autoload
+(define-derived-mode ts-mode prog-mode "TypeScript"
+  "Major mode for editing TypeScript."
+  :group 'typescript
+  :syntax-table ts-mode--syntax-table
+
+  (cond
+   ((and (treesit-can-enable-p)
+         (treesit-language-available-p 'tsx))
+    ;; Comments
+    (setq-local comment-start "// ")
+    (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
+    (setq-local comment-end "")
+
+    (setq-local treesit-simple-indent-rules ts-mode--indent-rules)
+    (setq-local indent-line-function #'treesit-indent)
+
+    (setq-local beginning-of-defun-function #'ts-mode--beginning-of-defun)
+    (setq-local end-of-defun-function #'ts-mode--end-of-defun)
+
+    (unless font-lock-defaults
+      (setq font-lock-defaults '(nil t)))
+
+    (setq-local treesit-font-lock-settings ts-mode--settings)
+
+    (treesit-font-lock-enable))
+   (t
+    (message "Tree sitter for TypeScript isn't available, defaulting to js-mode")
+    (js-mode))))
+
+(provide 'ts-mode)
+
+;;; ts-mode.el ends here

commit c4179117afd37a03a7ba322e66b5bd6bae5637bd
Author: Theodor Thornhill <theo@thornhill.no>
Date:   Tue Oct 11 10:03:33 2022 +0200

    Fix byte-compile warning for js--treesit-defun-type-regexp
    
    * lisp/progmodes/js.el (js--treesit-defun-type-regexp): Move before
    js--treesit-beginning-of-defun.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index d831a6cf7a..1b82e204b9 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -3582,6 +3582,14 @@ js-treesit-current-defun
              do (setq node (treesit-node-parent node))
              finally return  (string-join name-list "."))))
 
+(defvar js--treesit-defun-type-regexp
+  (rx (or "class_declaration"
+          "method_definition"
+          "function_declaration"
+          "lexical_declaration"))
+  "Regular expression that matches type of defun nodes.
+Used in `js--treesit-beginning-of-defun' and friends.")
+
 (defun js--treesit-beginning-of-defun (&optional arg)
   "Tree-sitter `beginning-of-defun' function.
 ARG is the same as in `beginning-of-defun."
@@ -3614,14 +3622,6 @@ js--treesit-end-of-defun
                    js--treesit-defun-type-regexp 'end))
         (setq arg (1- arg))))))
 
-(defvar js--treesit-defun-type-regexp
-  (rx (or "class_declaration"
-          "method_definition"
-          "function_declaration"
-          "lexical_declaration"))
-  "Regular expression that matches type of defun nodes.
-Used in `js--treesit-beginning-of-defun' and friends.")
-
 (defun js--treesit-can-enable-p ()
   (if (and js-use-tree-sitter
            (treesit-can-enable-p)

commit c2ecb08775dc24618de507d2d1ce0f9b0debe17e
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Oct 11 09:30:42 2022 -0700

    Lazily compile tree-sitter query
    
    See comment on struct Lisp_TS_Query for why.  Previous commits adding
    python and js support for tree-sitter breaks Emacs build if language
    definitions aren't available at build time.  This commit fixes that.
    
    Now query object don't compile the query upon creation, but stores the
    query source and language symbol, and compiles upon first use (in
    treesit-query-capture).
    
    I want ts_ensure_query_compiled to return signal symbol and data
    rather than signaling itself, because it's a helper function not lisp
    function.  But because it calls ts_load_language, I had to update
    ts_load_language to also use the signal symbol/data interface.
    
    * src/treesit.h (struct Lisp_TS_Query): Add two new field.
    * src/treesit.c (ts_load_language): Return signal symbol and data
    rather than signaling itself.
    (Ftreesit_langauge_available_p)
    (Ftreesit_parser_create): Update usage of ts_load_language
    
    (make_ts_query): Now returns a lisp object.
    (ts_query_error_to_string): Moved because it's used by
    ts_compose_query_signal_data.
    (ts_compose_query_signal_data)
    (ts_ensure_query_compiled): New functions.
    (Ftreesit_query_compile): Delay compiling the query.
    (Ftreesit_query_capture): Instead of creating a query object which
    compiles the query, now goes two routes: if QUERY is a query object,
    make sure it is compiled and use the TSQuery; if QUERY is a cons or
    string, compile directly to TSQuery, and free it after use.  Creating
    a lisp query requires the language symbol, but in this function we
    only have TSLanguage.

diff --git a/src/treesit.c b/src/treesit.c
index fc7e6c5593..2565464dea 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -89,6 +89,8 @@ Copyright (C) 2021-2022 Free Software Foundation, Inc.
    - lisp/emacs-lisp/cl-preloaded.el & data.c & lisp.h for parser and
      node type.
 
+   Regarding signals: only raise signals in lisp functions.
+
    We don't parse at every keystroke.  Instead we only record the
    changes at each keystroke, and only parse when requested.  It is
    possible that lazy parsing is worse: instead of dispersed little
@@ -196,10 +198,11 @@ ts_symbol_to_c_name (char *symbol_name)
    Qtreesit_load_language_error carries the error message from
    trying to load the library with each extension.
 
-   If SIGNAL is true, signal an error when failed to load LANGUAGE; if
-   false, return NULL when failed.  */
+   If error occurs, return NULL and fill SIGNAL_SYMBOL and SIGNAL_DATA
+   with values suitable for xsignal. */
 static TSLanguage *
-ts_load_language (Lisp_Object language_symbol, bool signal)
+ts_load_language (Lisp_Object language_symbol,
+		  Lisp_Object *signal_symbol, Lisp_Object *signal_data)
 {
   Lisp_Object symbol_name = Fsymbol_name (language_symbol);
 
@@ -263,11 +266,9 @@ ts_load_language (Lisp_Object language_symbol, bool signal)
     }
   if (error != NULL)
     {
-      if (signal)
-	xsignal2 (Qtreesit_load_language_error,
-		  symbol_name, Fnreverse (error_list));
-      else
-	return NULL;
+      *signal_symbol = Qtreesit_load_language_error;
+      *signal_data = list2 (symbol_name, Fnreverse (error_list));
+      return NULL;
     }
 
   /* Load TSLanguage.  */
@@ -277,11 +278,9 @@ ts_load_language (Lisp_Object language_symbol, bool signal)
   error = dynlib_error ();
   if (error != NULL)
     {
-      if (signal)
-	xsignal1 (Qtreesit_load_language_error,
-		  build_string (error));
-      else
-	return NULL;
+      *signal_symbol = Qtreesit_load_language_error;
+      *signal_data = build_string (error);
+      return NULL;
     }
   TSLanguage *lang = (*langfn) ();
 
@@ -291,12 +290,10 @@ ts_load_language (Lisp_Object language_symbol, bool signal)
   ts_parser_delete (parser);
   if (!success)
     {
-      if (signal)
-	xsignal2 (Qtreesit_load_language_error,
-		  build_pure_c_string ("Language version doesn't match tree-sitter version, language version:"),
-		  make_fixnum (ts_language_version (lang)));
-      else
-	return NULL;
+      *signal_symbol = Qtreesit_load_language_error;
+      *signal_data = list2 (build_pure_c_string ("Language version doesn't match tree-sitter version, language version:"),
+			    make_fixnum (ts_language_version (lang)));
+      return NULL;
     }
   return lang;
 }
@@ -310,7 +307,9 @@ DEFUN ("treesit-language-available-p",
 {
   CHECK_SYMBOL (language);
   ts_initialize ();
-  if (ts_load_language(language, false) == NULL)
+  Lisp_Object signal_symbol = Qnil;
+  Lisp_Object signal_data = Qnil;
+  if (ts_load_language(language, &signal_symbol, &signal_data) == NULL)
     return Qnil;
   else
     return Qt;
@@ -634,29 +633,96 @@ make_ts_node (Lisp_Object parser, TSNode node)
   return make_lisp_ptr (lisp_node, Lisp_Vectorlike);
 }
 
-/* Make a compiled query struct.  Return NULL if error occurs.  QUERY
-   has to be either a cons or a string.  */
-static struct Lisp_TS_Query *
-make_ts_query (Lisp_Object query, const TSLanguage *language,
-	       uint32_t *error_offset, TSQueryError *error_type)
+/* Make a compiled query.  QUERY has to be either a cons or a
+   string.  */
+static Lisp_Object
+make_ts_query (Lisp_Object query, Lisp_Object language)
 {
-  if (CONSP (query))
-    query = Ftreesit_query_expand (query);
-  char *source = SSDATA (query);
-
-  TSQuery *ts_query = ts_query_new (language, source, strlen (source),
-				    error_offset, error_type);
   TSQueryCursor *ts_cursor = ts_query_cursor_new ();
+  struct Lisp_TS_Query *lisp_query
+    = ALLOCATE_PSEUDOVECTOR (struct Lisp_TS_Query, source,
+			     PVEC_TS_COMPILED_QUERY);
 
-  if (ts_query == NULL)
+  lisp_query->language = language;
+  lisp_query->source = query;
+  lisp_query->query = NULL;
+  lisp_query->cursor = ts_cursor;
+  return make_lisp_ptr (lisp_query, Lisp_Vectorlike);
+}
+
+static const char*
+ts_query_error_to_string (TSQueryError error)
+{
+  switch (error)
+    {
+    case TSQueryErrorNone:
+      return "None";
+    case TSQueryErrorSyntax:
+      return "Syntax error at";
+    case TSQueryErrorNodeType:
+      return "Node type error at";
+    case TSQueryErrorField:
+      return "Field error at";
+    case TSQueryErrorCapture:
+      return "Capture error at";
+    case TSQueryErrorStructure:
+      return "Structure error at";
+    default:
+      return "Unknown error";
+    }
+}
+
+static Lisp_Object
+ts_compose_query_signal_data
+(uint32_t error_offset, TSQueryError error_type)
+{
+  return list3 (build_string
+		(ts_query_error_to_string (error_type)),
+		make_fixnum (error_offset + 1),
+		build_pure_c_string("Debug the query with `treesit-query-validate'"));
+}
+
+/* Ensure the QUERY is compiled.  Return the TSQuery.  It could be
+   NULL if error occurs, in which case ERROR_OFFSET and ERROR_TYPE are
+   bound.  If error occures, return NULL, and assign SIGNAL_SYMBOL and
+   SIGNAL_DATA accordingly.  */
+static TSQuery *
+ts_ensure_query_compiled
+(Lisp_Object query, Lisp_Object *signal_symbol, Lisp_Object *signal_data)
+{
+  /* If query is already compiled (not null), return that, otherwise
+     compile and return it.  */
+  TSQuery *ts_query = XTS_COMPILED_QUERY (query)->query;
+  if (ts_query != NULL)
+    return ts_query;
+
+  /* Get query source and TSLanguage ready.  */
+  Lisp_Object source = XTS_COMPILED_QUERY (query)->source;
+  Lisp_Object language = XTS_COMPILED_QUERY (query)->language;
+  /* This is the main reason why we compile query lazily: to avoid
+     loading languages early.  */
+  TSLanguage *ts_lang = ts_load_language (language, signal_symbol,
+					  signal_data);
+  if (ts_lang == NULL)
     return NULL;
 
-  struct Lisp_TS_Query *lisp_query
-    = ALLOCATE_PLAIN_PSEUDOVECTOR (struct Lisp_TS_Query,
-				   PVEC_TS_COMPILED_QUERY);
-  lisp_query->query = ts_query;
-  lisp_query->cursor = ts_cursor;
-  return lisp_query;
+  if (CONSP (source))
+    source = Ftreesit_query_expand (source);
+
+  /* Create TSQuery.  */
+  uint32_t error_offset;
+  TSQueryError error_type;
+  char *ts_source = SSDATA (source);
+  ts_query = ts_query_new (ts_lang, ts_source, strlen (ts_source),
+			   &error_offset, &error_type);
+  if (ts_query == NULL)
+    {
+      *signal_symbol = Qtreesit_query_error;
+      *signal_data = ts_compose_query_signal_data
+	(error_offset, error_type);
+    }
+  XTS_COMPILED_QUERY (query)->query = ts_query;
+  return ts_query;
 }
 
 DEFUN ("treesit-parser-p",
@@ -750,15 +816,23 @@ DEFUN ("treesit-parser-create",
 	}
     }
 
+  /* Load language.  */
+  Lisp_Object signal_symbol = Qnil;
+  Lisp_Object signal_data = Qnil;
   TSParser *parser = ts_parser_new ();
-  TSLanguage *lang = ts_load_language (language, true);
+  TSLanguage *lang = ts_load_language (language, &signal_symbol,
+				       &signal_data);
+  if (lang == NULL)
+    xsignal (signal_symbol, signal_data);
   /* We check language version when loading a language, so this should
      always succeed.  */
   ts_parser_set_language (parser, lang);
 
+  /* Create parser.  */
   Lisp_Object lisp_parser
     = make_ts_parser (Fcurrent_buffer (), parser, NULL, language);
 
+  /* Update parser-list.  */
   BVAR (buf, ts_parser_list)
     = Fcons (lisp_parser, BVAR (buf, ts_parser_list));
 
@@ -1454,28 +1528,6 @@ DEFUN ("treesit-query-expand",
 		     query, build_pure_c_string (" "));
 }
 
-static const char*
-ts_query_error_to_string (TSQueryError error)
-{
-  switch (error)
-    {
-    case TSQueryErrorNone:
-      return "None";
-    case TSQueryErrorSyntax:
-      return "Syntax error at";
-    case TSQueryErrorNodeType:
-      return "Node type error at";
-    case TSQueryErrorField:
-      return "Field error at";
-    case TSQueryErrorCapture:
-      return "Capture error at";
-    case TSQueryErrorStructure:
-      return "Structure error at";
-    default:
-      return "Unknown error";
-    }
-}
-
 /* This struct is used for passing captures to be check against
    predicates.  Captures we check for are the ones in START before
    END.  For example, if START and END are
@@ -1656,16 +1708,19 @@ ts_query_error_to_string (TSQueryError error)
 
 DEFUN ("treesit-query-compile",
        Ftreesit_query_compile,
-       Streesit_query_compile, 2, 2, 0,
+       Streesit_query_compile, 2, 3, 0,
        doc: /* Compile QUERY to a compiled query.
 
 Querying a compiled query is much faster than an uncompiled one.
 LANGUAGE is the language this query is for.
 
+If EAGER is non-nil, immediately load LANGUAGE and compile the query.
+Otherwise defer until the query is first used.
+
 Signals treesit-query-error if QUERY is malformed or something else
-goes wrong.  You can use `treesit-query-validate' to debug the
-query.  */)
-  (Lisp_Object language, Lisp_Object query)
+goes wrong.  (This of course would only happen if EAGER is non-nil.)
+You can use `treesit-query-validate' to debug the query.  */)
+  (Lisp_Object language, Lisp_Object query, Lisp_Object eager)
 {
   if (NILP (Ftreesit_query_p (query)))
     wrong_type_argument (Qtreesit_query_p, query);
@@ -1673,19 +1728,23 @@ DEFUN ("treesit-query-compile",
   if (TS_COMPILED_QUERY_P (query))
     return query;
 
-  TSLanguage *ts_lang = ts_load_language (language, true);
-  uint32_t error_offset;
-  TSQueryError error_type;
+  Lisp_Object lisp_query = make_ts_query (query, language);
 
-  struct Lisp_TS_Query *lisp_query
-    = make_ts_query (query, ts_lang, &error_offset, &error_type);
+  /* Maybe actually compile. */
+  if (NILP (eager))
+      return lisp_query;
+  else
+    {
+      Lisp_Object signal_symbol = Qnil;
+      Lisp_Object signal_data = Qnil;
+      TSQuery *ts_query = ts_ensure_query_compiled
+	(lisp_query, &signal_symbol, &signal_data);
 
-  if (lisp_query == NULL)
-    xsignal2 (Qtreesit_query_error,
-	      build_string (ts_query_error_to_string (error_type)),
-	      make_fixnum (error_offset + 1));
+      if (ts_query == NULL)
+	xsignal (signal_symbol, signal_data);
 
-  return make_lisp_ptr (lisp_query, Lisp_Vectorlike);
+      return lisp_query;
+    }
 }
 
 DEFUN ("treesit-query-capture",
@@ -1725,7 +1784,7 @@ DEFUN ("treesit-query-capture",
 	|| CONSP (query) || STRINGP (query)))
     wrong_type_argument (Qtreesit_query_p, query);
 
-
+  /* Resolve NODE into an actual node. */
   Lisp_Object lisp_node;
   if (TS_NODEP (node))
     lisp_node = node;
@@ -1751,30 +1810,50 @@ DEFUN ("treesit-query-capture",
   const TSLanguage *lang = ts_parser_language
     (XTS_PARSER (lisp_parser)->parser);
 
-  /* Initialize query objects, and execute query.  */
-  struct Lisp_TS_Query *lisp_query;
+  /* Initialize query objects.  At the end of this block, we should
+     have a working TSQuery and a TSQueryCursor.  */
+  TSQuery *ts_query;
+  TSQueryCursor *cursor;
+  bool needs_to_free_query_and_cursor;
   if (TS_COMPILED_QUERY_P (query))
-      lisp_query = XTS_COMPILED_QUERY (query);
+    {
+      Lisp_Object signal_symbol = Qnil;
+      Lisp_Object signal_data = Qnil;
+      ts_query = ts_ensure_query_compiled
+	(query, &signal_symbol, &signal_data);
+      cursor = XTS_COMPILED_QUERY (query)->cursor;
+      /* We don't need to free ts_query and cursor because they
+	 are stored in a lisp object, which is tracked by gc.  */
+      needs_to_free_query_and_cursor = false;
+      if (ts_query == NULL)
+	{
+	  xsignal (signal_symbol, signal_data);
+	}
+    }
   else
     {
+      /* Since query is not TS_COMPILED_QUERY, it can only be a string
+	 or a cons.  */
+      if (CONSP (query))
+	query = Ftreesit_query_expand (query);
+      char *query_string = SSDATA (query);
       uint32_t error_offset;
       TSQueryError error_type;
-      lisp_query = make_ts_query (query, lang,
-				  &error_offset, &error_type);
-      if (lisp_query == NULL)
+      ts_query = ts_query_new (lang, query_string, strlen (query_string),
+			       &error_offset, &error_type);
+      if (ts_query == NULL)
 	{
-	  xsignal3 (Qtreesit_query_error,
-		    build_string
-		    (ts_query_error_to_string (error_type)),
-		    make_fixnum (error_offset + 1),
-		    build_pure_c_string("Debug the query with `treesit-query-validate'"));
+	  xsignal (Qtreesit_query_error, ts_compose_query_signal_data
+		   (error_offset, error_type));
 	}
-      /* We don't need need to free TS_QUERY and CURSOR, they are stored
-	 in a lisp object, which is tracked by gc.  */
+      cursor = ts_query_cursor_new ();
+      needs_to_free_query_and_cursor = true;
     }
-  TSQuery *ts_query = lisp_query->query;
-  TSQueryCursor *cursor = lisp_query->cursor;
 
+  /* WARN: After this point, free ts_query and cursor before every
+     signal and return.  */
+
+  /* Set query range. */
   if (!NILP (beg) && !NILP (end))
     {
       EMACS_INT beg_byte = XFIXNUM (beg);
@@ -1784,6 +1863,7 @@ DEFUN ("treesit-query-capture",
 	 (uint32_t) end_byte - visible_beg);
     }
 
+  /* Execute query.  */
   ts_query_cursor_exec (cursor, ts_query, ts_node);
   TSQueryMatch match;
 
@@ -1838,6 +1918,11 @@ DEFUN ("treesit-query-capture",
 	  result = prev_result;
 	}
     }
+  if (needs_to_free_query_and_cursor)
+    {
+      ts_query_delete (ts_query);
+      ts_query_cursor_delete (cursor);
+    }
   return Fnreverse (result);
 }
 
diff --git a/src/treesit.h b/src/treesit.h
index 0c043f7d25..20e7cd4107 100644
--- a/src/treesit.h
+++ b/src/treesit.h
@@ -84,11 +84,27 @@ #define EMACS_TREESIT_H
   ptrdiff_t timestamp;
 };
 
-/* A compiled tree-sitter query.  */
+/* A compiled tree-sitter query.
+
+   When we create a query object by treesit-compile-query, it is not
+   immediately compiled, because that would require the language
+   definition to be loaded.  For example, python.el contains
+
+   (defvar xxx (treesit-compile-query ...))
+
+   and (require 'python.el) requires python's language definition to
+   be available.  In the case of python.el, Emacs requires it when
+   building, so that breaks the build.  */
 struct Lisp_TS_Query
 {
   union vectorlike_header header;
-  /* Pointer to the query object.  */
+  /* Language symbol for the query.  */
+  Lisp_Object language;
+  /* Source lisp (sexp or string) query.  */
+  Lisp_Object source;
+  /* Pointer to the query object.  This can be NULL, meaning this
+     query is not initialized/compiled.  We compile the query when
+     it is used the first time (in treesit-query-capture).  */
   TSQuery *query;
   /* Pointer to a cursor.  If we are storing the query object, we
      might as well store a cursor, too.  */

commit 57e37e9128b4f6f9a2aae0bc25de6c208d58e5d0
Author: Daniel Martín <mardani29@yahoo.es>
Date:   Mon Oct 10 13:03:30 2022 +0200

    Fix typo in Makefile.in
    
    * src/Makefile.in (TREE_SITTER_CFLAGS): Set the correct C flags.

diff --git a/src/Makefile.in b/src/Makefile.in
index eb537e2127..0d27f3e6db 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -344,7 +344,7 @@ JSON_CFLAGS =
 JSON_OBJ = @JSON_OBJ@
 
 TREE_SITTER_LIBS = @TREE_SITTER_LIBS@
-TREE_SITTER_FLAGS = @TREE_SITTER_FLAGS@
+TREE_SITTER_CFLAGS = @TREE_SITTER_CFLAGS@
 TREE_SITTER_OBJ = @TREE_SITTER_OBJ@
 
 INTERVALS_H = dispextern.h intervals.h composite.h

commit 1bb7b43e1cfb911737bc4807671910238277470f
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Oct 10 11:56:12 2022 -0700

    Make treesit-node-at faster
    
    * lisp/treesit.el (treesit-node-at): We only need to use
    treesit-node-first-child-for-pos.  This is both faster for large
    buffers and simpler.  Also remove the TODO comment.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index b51236b95e..1e911df1d9 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -115,19 +115,17 @@ treesit-node-at
 non-nil, only look for named node.
 
 If PARSER-OR-LANG is nil, use the first parser in
-(`treesit-parser-list'); if PARSER-OR-LANG is a parser, use
+\(`treesit-parser-list'); if PARSER-OR-LANG is a parser, use
 that parser; if PARSER-OR-LANG is a language, find a parser using
 that language in the current buffer, and use that."
   (let ((node (if (treesit-parser-p parser-or-lang)
                   (treesit-parser-root-node parser-or-lang)
-                (treesit-buffer-root-node parser-or-lang))))
-    ;; TODO: We might want a `treesit-node-descendant-for-pos' in C.
-    (while (cond ((and node (< (treesit-node-end node) point))
-                  (setq node (treesit-node-next-sibling node))
-                  t)
-                 ((treesit-node-child node 0 named)
-                  (setq node (treesit-node-child node 0 named))
-                  t)))
+                (treesit-buffer-root-node parser-or-lang)))
+        next)
+    ;; This is very fast so no need for C implementation.
+    (while (setq next (treesit-node-first-child-for-pos
+                       node point named))
+      (setq node next))
     node))
 
 (defun treesit-node-on (beg end &optional parser-or-lang named)

commit c8909fa3688aca164e4fd38f6293c4a201e148eb
Author: Theodor Thornhill <theo@thornhill.no>
Date:   Mon Oct 10 20:20:19 2022 +0200

    Fix typo in treesit--check-manual-covarage
    
    * lisp/treesit.el (treesit--check-manual-coverage): Fix typo in
    function name and also lookup the correct library in
    `find-library-name'

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 2bcfddb56b..b51236b95e 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -964,13 +964,13 @@ treesit-query-validate
 ;;; Etc
 
 (declare-function find-library-name "find-func.el")
-(defun treesit--check-manual-covarage ()
+(defun treesit--check-manual-coverage ()
   "Print tree-sitter functions missing from the manual in message buffer."
   (interactive)
   (require 'find-func)
   (let ((functions-in-source
          (with-temp-buffer
-           (insert-file-contents (find-library-name "tree-sitter"))
+           (insert-file-contents (find-library-name "treesit"))
            (cl-remove-if
             (lambda (name) (string-match "treesit--" name))
             (cl-sort

commit b341864d9002fd081a8a6dfeb5a5a00373738a2f
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Oct 10 11:14:35 2022 -0700

    Improve treesit-search-forward-goto so it doens't stuck at EOF
    
    * lisp/treesit.el (treesit-search-forward-goto): Handle the edge case.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 34b501cfba..2bcfddb56b 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -826,6 +826,12 @@ treesit-search-forward-goto
 ALL, BACKWARD, and UP are the same as in `treesit-search-forward'."
   (let ((node (treesit-node-at (point)))
         (start (point)))
+    ;; Often the EOF (point-max) is a newline, and `treesit-node-at'
+    ;; will return nil at that point (which is fair).  But we need a
+    ;; node as the starting point to traverse the tree.  So we try to
+    ;; use the node before point.
+    (when (and (not node) (eq (point) (point-max)))
+      (setq node (treesit-node-at (max (1- (point)) (point-min)))))
     ;; When searching forward, it is possible for (point) < start,
     ;; because `treesit-search-forward' goes to parents.
     (while (and node (if backward

commit 2f6b017e3dc646d317b56fb453c90aaa44c27089
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Oct 10 11:00:51 2022 -0700

    * admin/notes/tree-sitter/starter-guide (Navigation): Improve demo.

diff --git a/admin/notes/tree-sitter/starter-guide b/admin/notes/tree-sitter/starter-guide
index 378ff581af..e573603862 100644
--- a/admin/notes/tree-sitter/starter-guide
+++ b/admin/notes/tree-sitter/starter-guide
@@ -350,24 +350,38 @@ node.
 Something like this should suffice:
 
 #+begin_src elisp
-(defun xxx-beginning-of-defun (&optional arg)
-  (if (> arg 0)
-      ;; Go backward.
+(defun js--treesit-beginning-of-defun (&optional arg)
+  (let ((arg (or arg 1)))
+    (if (> arg 0)
+        ;; Go backward.
+        (while (and (> arg 0)
+                    (treesit-search-forward-goto
+                     "function_definition" 'start nil t))
+          (setq arg (1- arg)))
+      ;; Go forward.
+      (while (and (< arg 0)
+                  (treesit-search-forward-goto
+                   "function_definition" 'start))
+        (setq arg (1+ arg))))))
+
+(defun xxx-end-of-defun (&optional arg)
+  (let ((arg (or arg 1)))
+    (if (< arg 0)
+        ;; Go backward.
+        (while (and (< arg 0)
+                    (treesit-search-forward-goto
+                     "function_definition" 'end nil t))
+          (setq arg (1+ arg)))
+      ;; Go forward.
       (while (and (> arg 0)
                   (treesit-search-forward-goto
-                   "function_definition" 'start nil t))
-        (setq arg (1- arg)))
-    ;; Go forward.
-    (while (and (< arg 0)
-                (treesit-search-forward-goto
-                 "function_definition" 'start))
-      (setq arg (1+ arg)))))
+                   "function_definition" 'end))
+        (setq arg (1- arg))))))
 
 (setq-local beginning-of-defun-function #'xxx-beginning-of-defun)
+(setq-local end-of-defun-function #'xxx-end-of-defun)
 #+end_src
 
-And the same for end-of-defun.
-
 * Which-func
 
 You can find the current function by going up the tree and looking for

commit 2a762336da4d886a4f1b3ee463fd66393d739309
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Oct 10 10:46:47 2022 -0700

    Fix js--treesit-beginning/end-of-defun
    
    * lisp/progmodes/js.el (require): Add rx.
    (js--treesit-move-to-node): Remove function.
    (js--treesit-beginning-of-defun)
    (js--treesit-end-of-defun): Change to use treesit-search-forward-goto.
    (js-treesit--defun-query): Remove variable.
    (js--treesit-defun-type-regexp): Add variable.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 61ab0bb401..d831a6cf7a 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -57,7 +57,8 @@
 
 (eval-when-compile
   (require 'cl-lib)
-  (require 'ido))
+  (require 'ido)
+  (require 'rx))
 
 (defvar ido-cur-list)
 (defvar electric-layout-rules)
@@ -3581,29 +3582,45 @@ js-treesit-current-defun
              do (setq node (treesit-node-parent node))
              finally return  (string-join name-list "."))))
 
-(defun js--treesit-move-to-node (fn)
-  (when-let ((found-node
-              (treesit-parent-until
-               (treesit-node-at (point))
-               (lambda (parent)
-                 (treesit-query-capture
-                  parent
-                  js-treesit--defun-query)))))
-    (goto-char (funcall fn found-node))))
-
-(defun js--treesit-beginning-of-defun (&optional _arg)
-  (js--treesit-move-to-node #'treesit-node-start))
-
-(defun js--treesit--end-of-defun (&optional _arg)
-  (js--tressit-move-to-node #'treesit-node-end))
-
-(defvar js-treesit--defun-query
-  (treesit-query-compile
-   'javascript
-   "[(class_declaration)
-    (method_definition)
-    (function_declaration)
-    (variable_declarator)] @defun"))
+(defun js--treesit-beginning-of-defun (&optional arg)
+  "Tree-sitter `beginning-of-defun' function.
+ARG is the same as in `beginning-of-defun."
+  (let ((arg (or arg 1)))
+    (if (> arg 0)
+        ;; Go backward.
+        (while (and (> arg 0)
+                    (treesit-search-forward-goto
+                     js--treesit-defun-type-regexp 'start nil t))
+          (setq arg (1- arg)))
+      ;; Go forward.
+      (while (and (< arg 0)
+                  (treesit-search-forward-goto
+                   js--treesit-defun-type-regexp 'start))
+        (setq arg (1+ arg))))))
+
+(defun js--treesit-end-of-defun (&optional arg)
+  "Tree-sitter `end-of-defun' function.
+ARG is the same as in `end-of-defun."
+  (let ((arg (or arg 1)))
+    (if (< arg 0)
+        ;; Go backward.
+        (while (and (< arg 0)
+                    (treesit-search-forward-goto
+                     js--treesit-defun-type-regexp 'end nil t))
+          (setq arg (1+ arg)))
+      ;; Go forward.
+      (while (and (> arg 0)
+                  (treesit-search-forward-goto
+                   js--treesit-defun-type-regexp 'end))
+        (setq arg (1- arg))))))
+
+(defvar js--treesit-defun-type-regexp
+  (rx (or "class_declaration"
+          "method_definition"
+          "function_declaration"
+          "lexical_declaration"))
+  "Regular expression that matches type of defun nodes.
+Used in `js--treesit-beginning-of-defun' and friends.")
 
 (defun js--treesit-can-enable-p ()
   (if (and js-use-tree-sitter

commit ceb9591e5dcb5264573371a573433fd76320954e
Author: Theodor Thornhill <theo@thornhill.no>
Date:   Sun Oct 9 21:22:55 2022 +0200

    Add tree-sitter functionality to js-mode
    
    The diff for js-mode, js-json-mode, js-jsx-mode are a bit strange, but
    all we did is to wrap some the old code in
    
    (if tree-sitter
      (tree-sitter-enable)
     ...some old-code)
    
    ...other old-code (that’s tree-sitter-agnostic)
    
    * lisp/progmodes/js.el (treesit): Add tree-sitter dependency
    (js-use-treesitter)
    (js-json-use-treesitter): New custom options.
    
    (js--treesit-keywords)
    (js--treesit-settings)
    (js--treesit-indent-rules)
    (js--json-treesit-settings)
    (js--json-treesit-indent-rules): New variables.
    
    (js--treesit-backward-up-list)
    (js-treesit-current-defun)
    (js--treesit-move-to-node)
    (js--treesit-beginning-of-defun, js--treesit-end-of-defun)
    (js--treesit-enable)
    (js--json-treesit-enable): New functions.
    
    (js-mode, js-json-mode, js-jsx-mode): Add support for tree-sitter
    functionalities.

diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index b920ef6c2c..61ab0bb401 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -53,6 +53,7 @@
 (require 'imenu)
 (require 'json)
 (require 'prog-mode)
+(require 'treesit)
 
 (eval-when-compile
   (require 'cl-lib)
@@ -3400,100 +3401,391 @@ js-jsx--detect-after-change
 (c-lang-defconst c-paragraph-start
   js-mode "\\(@[[:alpha:]]+\\>\\|$\\)")
 
+;;; Tree sitter integration
+(defcustom js-use-tree-sitter nil
+  "If non-nil, `js-mode' tries to use tree-sitter.
+Currently `js-mode' uses tree-sitter for font-locking,
+indentation, which-function and movement functions."
+  :version "29.1"
+  :type 'boolean
+  :safe 'booleanp)
+
+(defun js--treesit-backward-up-list ()
+  (lambda (_node _parent _bol &rest _)
+    (save-excursion
+      (backward-up-list 1 nil t)
+      (goto-char
+       (treesit-node-start
+        (treesit-node-at (point))))
+      (back-to-indentation)
+      (point))))
+
+(defvar js--treesit-indent-rules
+  `((javascript
+     (no-node (js--treesit-backward-up-list) ,js-indent-level)
+     ((node-is "}") parent-bol 0)
+     ((node-is ")") parent-bol 0)
+     ((node-is "]") parent-bol 0)
+     ((node-is ">") parent-bol 0)
+     ((node-is ".") parent-bol ,js-indent-level)
+     ((parent-is "named_imports") parent-bol ,js-indent-level)
+     ((parent-is "statement_block") parent-bol ,js-indent-level)
+     ((parent-is "variable_declarator") parent-bol ,js-indent-level)
+     ((parent-is "arguments") parent-bol ,js-indent-level)
+     ((parent-is "array") parent-bol ,js-indent-level)
+     ((parent-is "formal_parameters") parent-bol ,js-indent-level)
+     ((parent-is "template_substitution") parent-bol ,js-indent-level)
+     ((parent-is "object_pattern") parent-bol ,js-indent-level)
+     ((parent-is "object") parent-bol ,js-indent-level)
+     ((parent-is "arrow_function") parent-bol ,js-indent-level)
+     ((parent-is "parenthesized_expression") parent-bol ,js-indent-level)
+
+     ;; JSX
+     ((parent-is "jsx_opening_element") parent ,js-indent-level)
+     ((node-is "jsx_closing_element") parent 0)
+     ((node-is "jsx_text") parent ,js-indent-level)
+     ((parent-is "jsx_element") parent ,js-indent-level)
+     ((node-is "/") parent 0)
+     ((parent-is "jsx_self_closing_element") parent ,js-indent-level))))
+
+(defvar js--treesit-keywords
+  '("as" "async" "await" "break" "case" "catch" "class" "const" "continue"
+    "debugger" "default" "delete" "do" "else" "export" "extends" "finally"
+    "for" "from" "function" "get" "if" "import" "in" "instanceof" "let" "new"
+    "of" "return" "set" "static" "switch" "switch" "target" "throw" "try"
+    "typeof" "var" "void" "while" "with" "yield"))
+
+(defvar js--treesit-settings
+  (treesit-font-lock-rules
+   :language 'javascript
+   :override t
+   `(;; Everything overrides template string.
+     (template_string) @font-lock-string-face
+
+     ((identifier) @font-lock-constant-face
+      (:match "^[A-Z_][A-Z_\\d]*$" @font-lock-constant-face))
+
+     (new_expression
+      constructor: (identifier) @font-lock-type-face)
+
+     (function
+      name: (identifier) @font-lock-function-name-face)
+
+     (class_declaration
+      name: (identifier) @font-lock-type-face)
+
+     (function_declaration
+      name: (identifier) @font-lock-function-name-face)
+
+     (method_definition
+      name: (property_identifier) @font-lock-function-name-face)
+
+     (variable_declarator
+      name: (identifier) @font-lock-function-name-face
+      value: [(function) (arrow_function)])
+
+     (variable_declarator
+      name: (array_pattern
+             (identifier)
+             (identifier)
+             @font-lock-function-name-face)
+      value: (array (number) (function)))
+
+     (assignment_expression
+      left: [(identifier) @font-lock-function-name-face
+             (member_expression property: (property_identifier)
+                                @font-lock-function-name-face)]
+      right: [(function) (arrow_function)])
+
+     (call_expression
+      function: [(identifier) @font-lock-function-name-face
+                 (member_expression
+                  property:
+                  (property_identifier) @font-lock-function-name-face)])
+
+     (variable_declarator
+      name: (identifier) @font-lock-variable-name-face)
+
+     (assignment_expression
+      left: [(identifier) @font-lock-variable-name-face
+             (member_expression
+              property: (property_identifier) @font-lock-variable-name-face)])
+
+     (for_in_statement
+      left: (identifier) @font-lock-variable-name-face)
+
+     (arrow_function
+      parameter: (identifier) @font-lock-variable-name-face)
+
+     (pair key: (property_identifier) @font-lock-variable-name-face)
+
+     (pair value: (identifier) @font-lock-variable-name-face)
+
+     (pair
+      key: (property_identifier) @font-lock-function-name-face
+      value: [(function) (arrow_function)])
+
+     ((shorthand_property_identifier) @font-lock-variable-name-face)
+
+     (pair_pattern key: (property_identifier) @font-lock-variable-name-face)
+
+     ((shorthand_property_identifier_pattern) @font-lock-variable-name-face)
+
+     (array_pattern (identifier) @font-lock-variable-name-face)
+
+     (jsx_opening_element
+      [(nested_identifier (identifier)) (identifier)]
+      @font-lock-function-name-face)
+
+     (jsx_closing_element
+      [(nested_identifier (identifier)) (identifier)]
+      @font-lock-function-name-face)
+
+     (jsx_self_closing_element
+      [(nested_identifier (identifier)) (identifier)]
+      @font-lock-function-name-face)
+
+     (jsx_attribute
+      (property_identifier)
+      @font-lock-constant-face)
+
+     [(this) (super)] @font-lock-keyword-face
+
+     [(true) (false) (null)] @font-lock-constant-face
+     (regex pattern: (regex_pattern)) @font-lock-string-face
+     (number) @font-lock-constant-face
+
+     (string) @font-lock-string-face
+     (comment) @font-lock-comment-face
+     [,@js--treesit-keywords] @font-lock-keyword-face
+
+     (template_substitution ["${" "}"] @font-lock-constant-face))))
+
+
+(defun js-treesit-current-defun ()
+  "Return name of surrounding function.
+This function can be used as a value in `which-func-functions'"
+  (let ((node (treesit-node-at (point)))
+        (name-list ()))
+    (cl-loop while node
+             if (pcase (treesit-node-type node)
+                  ("function_declaration" t)
+                  ("method_definition" t)
+                  ("class_declaration" t)
+                  ("variable_declarator" t)
+                  (_ nil))
+             do (push (treesit-node-text
+                       (treesit-node-child-by-field-name node "name")
+                       t)
+                      name-list)
+             do (setq node (treesit-node-parent node))
+             finally return  (string-join name-list "."))))
+
+(defun js--treesit-move-to-node (fn)
+  (when-let ((found-node
+              (treesit-parent-until
+               (treesit-node-at (point))
+               (lambda (parent)
+                 (treesit-query-capture
+                  parent
+                  js-treesit--defun-query)))))
+    (goto-char (funcall fn found-node))))
+
+(defun js--treesit-beginning-of-defun (&optional _arg)
+  (js--treesit-move-to-node #'treesit-node-start))
+
+(defun js--treesit--end-of-defun (&optional _arg)
+  (js--tressit-move-to-node #'treesit-node-end))
+
+(defvar js-treesit--defun-query
+  (treesit-query-compile
+   'javascript
+   "[(class_declaration)
+    (method_definition)
+    (function_declaration)
+    (variable_declarator)] @defun"))
+
+(defun js--treesit-can-enable-p ()
+  (if (and js-use-tree-sitter
+           (treesit-can-enable-p)
+           (treesit-language-available-p 'javascript))
+      t
+    (message "Cannot enable Tree Sitter for JavaScript.")
+    nil))
+
+(defun js--treesit-enable ()
+  (setq-local treesit-simple-indent-rules js--treesit-indent-rules)
+  (setq-local indent-line-function #'treesit-indent)
+
+  (setq-local beginning-of-defun-function #'js--treesit-beginning-of-defun)
+  (setq-local end-of-defun-function #'js--treesit-end-of-defun)
+
+  (setq-local font-lock-defaults '(nil t))
+  (setq-local treesit-font-lock-settings js--treesit-settings)
+
+  (add-hook 'which-func-functions #'js-treesit-current-defun nil t)
+
+  (treesit-font-lock-enable))
+
 ;;; Main Function
 
 ;;;###autoload
 (define-derived-mode js-mode prog-mode "JavaScript"
   "Major mode for editing JavaScript."
   :group 'js
-  ;; Ensure all CC Mode "lang variables" are set to valid values.
-  (c-init-language-vars js-mode)
-  (setq-local indent-line-function #'js-indent-line)
-  (setq-local beginning-of-defun-function #'js-beginning-of-defun)
-  (setq-local end-of-defun-function #'js-end-of-defun)
-  (setq-local open-paren-in-column-0-is-defun-start nil)
-  (setq-local font-lock-defaults
-              (list js--font-lock-keywords nil nil nil nil
-                    '(font-lock-syntactic-face-function
-                      . js-font-lock-syntactic-face-function)))
-  (setq-local syntax-propertize-function #'js-syntax-propertize)
-  (add-hook 'syntax-propertize-extend-region-functions
-            #'syntax-propertize-multiline 'append 'local)
-  (add-hook 'syntax-propertize-extend-region-functions
-            #'js--syntax-propertize-extend-region 'append 'local)
-  (setq-local prettify-symbols-alist js--prettify-symbols-alist)
-
-  (setq-local parse-sexp-ignore-comments t)
-  (setq-local which-func-imenu-joiner-function #'js--which-func-joiner)
-
   ;; Comments
   (setq-local comment-start "// ")
   (setq-local comment-start-skip "\\(?://+\\|/\\*+\\)\\s *")
   (setq-local comment-end "")
-  (setq-local fill-paragraph-function #'js-fill-paragraph)
-  (setq-local normal-auto-fill-function #'js-do-auto-fill)
-
-  ;; Parse cache
-  (add-hook 'before-change-functions #'js--flush-caches t t)
-
-  ;; Frameworks
-  (js--update-quick-match-re)
-
-  ;; Syntax extensions
-  (unless (js-jsx--detect-and-enable)
-    (add-hook 'after-change-functions #'js-jsx--detect-after-change nil t))
-  (js-use-syntactic-mode-name)
-
-  ;; Imenu
-  (setq imenu-case-fold-search nil)
-  (setq imenu-create-index-function #'js--imenu-create-index)
-
-  ;; for filling, pretend we're cc-mode
-  (c-foreign-init-lit-pos-cache)
-  (add-hook 'before-change-functions #'c-foreign-truncate-lit-pos-cache nil t)
-  (setq-local comment-line-break-function #'c-indent-new-comment-line)
-  (setq-local comment-multi-line t)
-  (setq-local electric-indent-chars
-	      (append "{}():;," electric-indent-chars)) ;FIXME: js2-mode adds "[]*".
-  (setq-local electric-layout-rules
-	      '((?\; . after) (?\{ . after) (?\} . before)))
-
-  (let ((c-buffer-is-cc-mode t))
-    ;; FIXME: These are normally set by `c-basic-common-init'.  Should
-    ;; we call it instead?  (Bug#6071)
-    (make-local-variable 'paragraph-start)
-    (make-local-variable 'paragraph-separate)
-    (make-local-variable 'paragraph-ignore-fill-prefix)
-    (make-local-variable 'adaptive-fill-mode)
-    (make-local-variable 'adaptive-fill-regexp)
-    ;; While the full CC Mode style system is not yet in use, set the
-    ;; pertinent style variables manually.
-    (c-initialize-builtin-style)
-    (let ((style (cc-choose-style-for-mode 'js-mode c-default-style)))
-      (c-set-style style))
-    (setq c-block-comment-prefix "* "
-          c-comment-prefix-regexp "//+\\|\\**")
-    (c-setup-paragraph-variables))
-
-  ;; Important to fontify the whole buffer syntactically! If we don't,
-  ;; then we might have regular expression literals that aren't marked
-  ;; as strings, which will screw up parse-partial-sexp, scan-lists,
-  ;; etc. and produce maddening "unbalanced parenthesis" errors.
-  ;; When we attempt to find the error and scroll to the portion of
-  ;; the buffer containing the problem, JIT-lock will apply the
-  ;; correct syntax to the regular expression literal and the problem
-  ;; will mysteriously disappear.
-  ;; FIXME: We should instead do this fontification lazily by adding
-  ;; calls to syntax-propertize wherever it's really needed.
-  ;;(syntax-propertize (point-max))
-  )
+
+  (if (js--treesit-can-enable-p)
+      (js--treesit-enable)
+    ;; Ensure all CC Mode "lang variables" are set to valid values.
+    (c-init-language-vars js-mode)
+    (setq-local indent-line-function #'js-indent-line)
+    (setq-local beginning-of-defun-function #'js-beginning-of-defun)
+    (setq-local end-of-defun-function #'js-end-of-defun)
+    (setq-local open-paren-in-column-0-is-defun-start nil)
+    (setq-local font-lock-defaults
+                (list js--font-lock-keywords nil nil nil nil
+                      '(font-lock-syntactic-face-function
+                        . js-font-lock-syntactic-face-function)))
+    (setq-local syntax-propertize-function #'js-syntax-propertize)
+    (add-hook 'syntax-propertize-extend-region-functions
+              #'syntax-propertize-multiline 'append 'local)
+    (add-hook 'syntax-propertize-extend-region-functions
+              #'js--syntax-propertize-extend-region 'append 'local)
+    (setq-local prettify-symbols-alist js--prettify-symbols-alist)
+
+    (setq-local parse-sexp-ignore-comments t)
+    (setq-local which-func-imenu-joiner-function #'js--which-func-joiner)
+
+    (setq-local fill-paragraph-function #'js-fill-paragraph)
+    (setq-local normal-auto-fill-function #'js-do-auto-fill)
+
+    ;; Parse cache
+    (add-hook 'before-change-functions #'js--flush-caches t t)
+
+    ;; Frameworks
+    (js--update-quick-match-re)
+
+    ;; Syntax extensions
+    (unless (js-jsx--detect-and-enable)
+      (add-hook 'after-change-functions #'js-jsx--detect-after-change nil t))
+    (js-use-syntactic-mode-name)
+
+    ;; Imenu
+    (setq imenu-case-fold-search nil)
+    (setq imenu-create-index-function #'js--imenu-create-index)
+
+    ;; for filling, pretend we're cc-mode
+    (c-foreign-init-lit-pos-cache)
+    (add-hook 'before-change-functions #'c-foreign-truncate-lit-pos-cache nil t)
+    (setq-local comment-line-break-function #'c-indent-new-comment-line)
+    (setq-local comment-multi-line t)
+    (setq-local electric-indent-chars
+	        (append "{}():;," electric-indent-chars)) ;FIXME: js2-mode adds "[]*".
+    (setq-local electric-layout-rules
+	        '((?\; . after) (?\{ . after) (?\} . before)))
+
+    (let ((c-buffer-is-cc-mode t))
+      ;; FIXME: These are normally set by `c-basic-common-init'.  Should
+      ;; we call it instead?  (Bug#6071)
+      (make-local-variable 'paragraph-start)
+      (make-local-variable 'paragraph-separate)
+      (make-local-variable 'paragraph-ignore-fill-prefix)
+      (make-local-variable 'adaptive-fill-mode)
+      (make-local-variable 'adaptive-fill-regexp)
+      ;; While the full CC Mode style system is not yet in use, set the
+      ;; pertinent style variables manually.
+      (c-initialize-builtin-style)
+      (let ((style (cc-choose-style-for-mode 'js-mode c-default-style)))
+        (c-set-style style))
+      (setq c-block-comment-prefix "* "
+            c-comment-prefix-regexp "//+\\|\\**")
+      (c-setup-paragraph-variables))
+
+    ;; Important to fontify the whole buffer syntactically! If we don't,
+    ;; then we might have regular expression literals that aren't marked
+    ;; as strings, which will screw up parse-partial-sexp, scan-lists,
+    ;; etc. and produce maddening "unbalanced parenthesis" errors.
+    ;; When we attempt to find the error and scroll to the portion of
+    ;; the buffer containing the problem, JIT-lock will apply the
+    ;; correct syntax to the regular expression literal and the problem
+    ;; will mysteriously disappear.
+    ;; FIXME: We should instead do this fontification lazily by adding
+    ;; calls to syntax-propertize wherever it's really needed.
+    ;;(syntax-propertize (point-max))
+    ))
+
+(defcustom js-json-use-tree-sitter nil
+  "If non-nil, `js-json-mode' tries to use tree-sitter.
+Currently `js-json-mode' uses tree-sitter for font-locking and
+indentation."
+  :version "29.1"
+  :type 'boolean
+  :safe 'booleanp)
+
+(defvar js--json-treesit-settings
+  (treesit-font-lock-rules
+   :language 'json
+   :override t
+   `(
+     (pair
+      key: (_) @font-lock-string-face)
+
+     (string) @font-lock-string-face
+
+     (number) @font-lock-constant-face
+
+     [(null) (true) (false)] @font-lock-constant-face
+
+     (escape_sequence) @font-lock-constant-face
+
+     (comment) @font-lock-comment-face
+     )))
+
+
+(defvar js--json-treesit-indent-rules
+  `((json
+     (no-node (js--treesit-backward-up-list) ,js-indent-level)
+     ((node-is "}") parent-bol 0)
+     ((node-is ")") parent-bol 0)
+     ((node-is "]") parent-bol 0)
+     ((parent-is "object") parent-bol ,js-indent-level)
+     )))
+
+
+(defun js--json-treesit-can-enable-p ()
+  (if (and js-json-use-tree-sitter
+           (treesit-can-enable-p)
+           (treesit-language-available-p 'json))
+      t
+    (error "Cannot enable Tree Sitter for JSON.")
+    nil))
+
+
+(defun js--json-treesit-enable ()
+  (setq-local treesit-simple-indent-rules js--json-treesit-indent-rules)
+  (setq-local indent-line-function #'treesit-indent)
+
+  (setq-local beginning-of-defun-function #'ignore)
+  (setq-local end-of-defun-function #'ignore)
+
+  (setq-local font-lock-defaults '(nil t))
+  (setq-local treesit-font-lock-settings js--json-treesit-settings)
+
+  (treesit-font-lock-enable))
+
 
 ;;;###autoload
 (define-derived-mode js-json-mode js-mode "JSON"
-  (setq-local js-enabled-frameworks nil)
-  ;; Speed up `syntax-ppss': JSON files can be big but can't hold
-  ;; regexp matchers nor #! thingies (and `js-enabled-frameworks' is nil).
-  (setq-local syntax-propertize-function #'ignore))
+  (if (js--json-treesit-can-enable-p)
+      (js--json-treesit-enable)
+    (setq-local js-enabled-frameworks nil)
+    ;; Speed up `syntax-ppss': JSON files can be big but can't hold
+    ;; regexp matchers nor #! thingies (and `js-enabled-frameworks' is nil).
+    (setq-local syntax-propertize-function #'ignore)))
 
 ;; Since we made JSX support available and automatically-enabled in
 ;; the base `js-mode' (for ease of use), now `js-jsx-mode' simply
@@ -3520,9 +3812,11 @@ js-jsx-mode
 `js-jsx-enable' in `js-mode-hook'.  You may be better served by
 one of the aforementioned options instead of using this mode."
   :group 'js
-  (js-jsx-enable)
-  (setq-local comment-region-function #'js-jsx--comment-region)
-  (js-use-syntactic-mode-name))
+  (if (js--treesit-can-enable-p)
+      (js--treesit-enable)
+    (js-jsx-enable)
+    (setq-local comment-region-function #'js-jsx--comment-region)
+    (js-use-syntactic-mode-name)))
 
 (defun js-jsx--comment-region (beg end &optional arg)
   (if (or (js-jsx--context)

commit 861e1fb595eb1f01ca5c137fb4830695f9c1e7d2
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Oct 10 09:14:30 2022 -0700

    Fix tree-sitter build script in admin/notes
    
    * admin/notes/tree-sitter/build-module/README: Add explaination.
    * admin/notes/tree-sitter/build-module/build.sh: change
    typescript to tsx.

diff --git a/admin/notes/tree-sitter/build-module/README b/admin/notes/tree-sitter/build-module/README
index ee6076c119..d205661e6c 100644
--- a/admin/notes/tree-sitter/build-module/README
+++ b/admin/notes/tree-sitter/build-module/README
@@ -12,6 +12,6 @@ To build all modules at once, run
 
     ./batch.sh
 
-This gives you C, JSON, Go, HTML, Javascript, CSS, Python, Typescript,
-C#, C++, Rust. More can be added to batch.sh unless it's directory
-strucure is not standard.
\ No newline at end of file
+This gives you C, JSON, Go, HTML, Javascript, CSS, Python, Typescript
+(tsx), C# (csharp), C++ (cpp), Rust. More can be added to batch.sh
+unless it's directory strucure is not standard.
\ No newline at end of file
diff --git a/admin/notes/tree-sitter/build-module/build.sh b/admin/notes/tree-sitter/build-module/build.sh
index 16792d05cb..102ab310fa 100755
--- a/admin/notes/tree-sitter/build-module/build.sh
+++ b/admin/notes/tree-sitter/build-module/build.sh
@@ -25,7 +25,7 @@ lang=
 
 if [ "${lang}" == "typescript/tsx" ]
 then
-    lang="typescript"
+    lang="tsx"
 fi
 
 # Build.

commit b6568c1389128d47538b646d940427949ddf58d0
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Oct 9 20:59:59 2022 -0700

    Rename custom group treesit to tree-sitter
    
    * lisp/treesit.el (treesit): Rename.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index f2e7f478b3..34b501cfba 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -31,7 +31,10 @@
 
 ;;; Activating tree-sitter
 
-(defgroup treesit
+;; Per our naming guideline, we use "tree-sitter" when referring to it
+;; as a name and only use "treesit" for prefix.  Since a group name is
+;; not a prefix, we use "tree-sitter" here.
+(defgroup tree-sitter
   nil
   "Tree-sitter is an incremental parser."
   :group 'tools

commit aaaa4ca77e440499ec852069efaea42410ebe30b
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Oct 9 20:54:19 2022 -0700

    Add :version tag for new tree-sitter custom options
    
    * lisp/progmodes/python.el (python-use-tree-sitter): Add version tag.
    * lisp/treesit.el (treesit):
    (treesit-max-buffer-size): Add version tag.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index d87789fd77..a0466707e6 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -290,7 +290,8 @@ python-use-tree-sitter
   "If non-nil, `python-mode' tries to use tree-sitter.
 Currently `python-mode' uses tree-sitter for font-locking, imenu,
 and movement functions."
-  :type 'boolean)
+  :type 'boolean
+  :version "29.1")
 
 (defcustom python-interpreter "python"
   "Python interpreter for noninteractive use.
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 7132f1d5ee..f2e7f478b3 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -34,11 +34,13 @@
 (defgroup treesit
   nil
   "Tree-sitter is an incremental parser."
-  :group 'tools)
+  :group 'tools
+  :version "29.1")
 
 (defcustom treesit-max-buffer-size (* 4 1024 1024)
-  "Maximum buffer size for enabling tree-sitter parsing."
-  :type 'integer)
+  "Maximum buffer size for enabling tree-sitter parsing (in bytes)."
+  :type 'integer
+  :version "29.1")
 
 (defun treesit-available-p ()
   "Return non-nil if tree-sitter features are available."

commit bb8376145abadd901b0d8f7f586bef658e2b333c
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Oct 9 15:19:36 2022 -0700

    Make python tree-sitter font-lock support decoration levels
    
    * lisp/progmodes/python.el (python--treesit-settings): Stratify into
    three levels.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 801432cd18..d87789fd77 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1031,8 +1031,8 @@ python--treesit-fontify-string
 (defvar python--treesit-settings
   (treesit-font-lock-rules
    :language 'python
-   :override t
-   `(;; Queries for def and class.
+   :level 1
+   '(;; Queries for def and class.
      (function_definition
       name: (identifier) @font-lock-function-name-face)
 
@@ -1045,9 +1045,11 @@ python--treesit-settings
      (string) @python--treesit-fontify-string
      ((string) @font-lock-doc-face
       (:match "^\"\"\"" @font-lock-doc-face))
-     (interpolation (identifier) @font-lock-variable-name-face)
-
-     ;; Keywords, builtins, and constants.
+     (interpolation (identifier) @font-lock-variable-name-face))
+   :language 'python
+   :level 2
+   :override t
+   `(;; Keywords, builtins, and constants.
      [,@python--treesit-keywords] @font-lock-keyword-face
 
      ((identifier) @font-lock-keyword-face
@@ -1061,12 +1063,11 @@ python--treesit-settings
                       eol))
               @font-lock-builtin-face))
 
-     [(true) (false) (none)] @font-lock-constant-face
-
-     ;; Escape sequences
-     (escape_sequence) @font-lock-constant-face
-
-     ;; Variable names.
+     [(true) (false) (none)] @font-lock-constant-face)
+   :language 'python
+   :level 3
+   :override t
+   `(;; Variable names.
      (assignment left: (identifier)
                  @font-lock-variable-name-face)
      (assignment left: (attribute
@@ -1088,7 +1089,10 @@ python--treesit-settings
                 `(seq bol (or ,@python--treesit-exceptions)
                       eol))
               @font-lock-type-face))
-     (type (identifier) @font-lock-type-face)))
+     (type (identifier) @font-lock-type-face)
+
+     ;; Escape sequences
+     (escape_sequence) @font-lock-constant-face))
   "Tree-sitter font-lock settings.")
 
 

commit c88a1631e3f76926bf0fed49fa1b704d6eaf2155
Author: Yuan Fu <casouri@gmail.com>
Date:   Sun Oct 9 15:17:11 2022 -0700

    Make tree-sitter font-lock support decoration levels
    
    * admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html:
    Update.
    * admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html:
    Update.
    * doc/lispref/modes.texi: Mention the new :level option.
    * lisp/treesit.el (treesit-font-lock-settings): Update docstring.
    (treesit-font-lock-rules): Support :level.  Relayout the let form.
    (treesit-font-lock-fontify-region): Support :level.

diff --git a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html
index 246ebf0519..c91152edc0 100644
--- a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html
+++ b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html
@@ -117,8 +117,17 @@
 <tr><td width="15%"></td><td width="15%"><code>keep</code></td><td width="60%">Fill-in regions without an existing face</td></tr>
 <tr><td width="15%"><code>:toggle</code></td><td width="15%"><var>symbol</var></td><td width="60%">If non-nil, its value should be a variable name.  The variable&rsquo;s value
 (nil/non-nil) disables/enables the query during fontification.</td></tr>
+<tr><td width="15%"></td><td width="15%">nil</td><td width="60%">Always enable this query.</td></tr>
+<tr><td width="15%"><code>:level</code></td><td width="15%"><var>integer</var></td><td width="60%">If non-nil, its value should be the decoration level for this query.
+Decoration level is controlled by <code>font-lock-maximum-decoration</code>.</td></tr>
+<tr><td width="15%"></td><td width="15%">nil</td><td width="60%">Always enable this query.</td></tr>
 </table>
 
+<p>Note that a query is applied only when both <code>:toggle</code> and
+<code>:level</code> permit it.  <code>:level</code> is used for global,
+coarse-grained control, whereas <code>:toggle</code> is for local,
+fine-grained control.
+</p>
 <p>Capture names in <var>query</var> should be face names like
 <code>font-lock-keyword-face</code>.  The captured node will be fontified
 with that face.  Capture names can also be function names, in which
diff --git a/admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html b/admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html
index 7b6e51468a..81b42f7f52 100644
--- a/admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html
+++ b/admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html
@@ -94,6 +94,10 @@
 see <a href="Parser_002dbased-Font-Lock.html">Parser-based Font Lock</a>, <a href="Parser_002dbased-Indentation.html">Parser-based Indentation</a>, and
 <a href="List-Motion.html">Moving over Balanced Expressions</a>.
 </p>
+<p>About naming convention: use &ldquo;tree-sitter&rdquo; when referring to it as a
+noun, like <code>python-use-tree-sitter</code>, but use &ldquo;treesit&rdquo; for
+prefixes, like <code>python-treesit-indent-function</code>.
+</p>
 <p>To access the syntax tree of the text in a buffer, we need to first
 load a language definition and create a parser with it.  Next, we can
 query the parser for specific nodes in the syntax tree.  Then, we can
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index dcc0b2958d..b1287c6ad0 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3935,8 +3935,18 @@ Parser-based Font Lock
 @item @code{:toggle} @tab @var{symbol} @tab
 If non-nil, its value should be a variable name.  The variable's value
 (nil/non-nil) disables/enables the query during fontification.
+@item @tab nil @tab Always enable this query.
+@item @code{:level} @tab @var{integer} @tab
+If non-nil, its value should be the decoration level for this query.
+Decoration level is controlled by @code{font-lock-maximum-decoration}.
+@item @tab nil @tab Always enable this query.
 @end multitable
 
+Note that a query is applied only when both @code{:toggle} and
+@code{:level} permit it.  @code{:level} is used for global,
+coarse-grained control, whereas @code{:toggle} is for local,
+fine-grained control.
+
 Capture names in @var{query} should be face names like
 @code{font-lock-keyword-face}.  The captured node will be fontified
 with that face.  Capture names can also be function names, in which
diff --git a/lisp/treesit.el b/lisp/treesit.el
index db96a89975..7132f1d5ee 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -289,7 +289,7 @@ treesit-font-lock-settings
 
 Each SETTING is of form
 
-    (LANGUAGE QUERY OVERRIDE TOGGLE)
+    (LANGUAGE QUERY OVERRIDE TOGGLE LEVEL)
 
 Each SETTING controls one parser (often of different language).
 LANGUAGE is the language symbol.  See Info node `(elisp)Language
@@ -308,7 +308,11 @@ treesit-font-lock-settings
 
 TOGGLE should be a variable (symbol) or nil.  The variable's
 value (nil/non-nil) controls whether to activate the query during
-fontification.  If TOGGLE is nil, the query is always activated.")
+fontification.  If TOGGLE is nil, the query is always activated.
+
+LEVEL is the decoration level of this query or nil.  Decoration
+level is controlled by `font-lock-maximum-decoration'.  If LEVEL
+is nil, the query is always activated.")
 
 (defun treesit-font-lock-rules (&rest args)
   "Return a value suitable for `treesit-font-lock-settings'.
@@ -344,6 +348,15 @@ treesit-font-lock-rules
                       The value of that variable (non-nil/nil)
                       activates/deactivates the query during
                       fontification.
+             nil      Always activate this query.
+  :level     <integer>If non-nil, the value is the decoration
+                      level of this query.
+                      (See `font-lock-maximum-decoration'.)
+             nil      Always activate this query.
+
+Note that a query is applied only when both :toggle and :level
+permit it.  :level is used for global, coarse-grained control,
+whereas :toggle is for local, fine-grained control.
 
 Capture names in QUERY should be face names like
 `font-lock-keyword-face'.  The captured node will be fontified
@@ -356,18 +369,16 @@ treesit-font-lock-rules
 ignored.
 
 \(fn :KEYWORD VALUE QUERY...)"
-  (let (;; Tracks the current language that following queries will
-        ;; apply to.
-        (current-language nil)
-        ;; Tracks :override flag.
-        (current-override nil)
-        ;; Track :toggle flag.
-        (current-toggle t)
+  (let (;; Tracks the current :language/:override/:toggle/:level value
+        ;; that following queries will apply to.
+        current-language current-override
+        current-toggle current-level
         ;; The list this function returns.
         (result nil))
     (while args
       (let ((token (pop args)))
         (pcase token
+          ;; (1) Process keywords.
           (:language
            (let ((lang (pop args)))
              (when (or (not (symbolp lang)) (null lang))
@@ -393,6 +404,14 @@ treesit-font-lock-rules
                        `("Value of :toggle should be a variable name"
                          ,var)))
              (setq current-toggle var)))
+          (:level
+           (let ((level (pop args)))
+             (when (not (and (integerp level) (> level 0)))
+               (signal 'treesit-font-lock-error
+                       `("Value of :level should be a positive integer"
+                         ,level)))
+             (setq current-level level)))
+          ;; (2) Process query.
           ((pred treesit-query-p)
            (when (null current-language)
              (signal 'treesit-font-lock-error
@@ -402,12 +421,14 @@ treesit-font-lock-rules
              (push `(,current-language
                      ,(treesit-query-compile current-language token)
                      ,current-override
-                     ,current-toggle)
+                     ,current-toggle
+                     ,current-level)
                    result))
            ;; Clears any configurations set for this query.
            (setq current-language nil
                  current-override nil
-                 current-toggle nil))
+                 current-toggle nil
+                 current-level nil))
           (_ (signal 'treesit-font-lock-error
                      `("Unexpected value" token))))))
     (nreverse result)))
@@ -423,10 +444,20 @@ treesit-font-lock-fontify-region
            (match-pattern (nth 1 setting))
            (override (nth 2 setting))
            (toggle (nth 3 setting))
+           (level (nth 4 setting))
            (parser (treesit-parser-create language)))
       (when-let ((node (treesit-node-on start end parser))
-                 (activate (or (null toggle)
-                               (symbol-value toggle))))
+                 ;; Only activate this query if both :toggle and
+                 ;; :level permit it.
+                 (activate
+                  (and (or (null toggle)
+                           (symbol-value toggle))
+                       (or (null level)
+                           (pcase (font-lock-value-in-major-mode
+                                   font-lock-maximum-decoration)
+                             ('t t)
+                             ('nil (eq level 1))
+                             (lvl (<= level lvl)))))))
         (ignore activate)
         (let ((captures (treesit-query-capture
                          node match-pattern

commit 9f7c359f4023570616c9961487069ba1122a5bb0
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Oct 7 18:06:04 2022 -0700

    Add note on tree-sitter's naming convention
    
    * admin/notes/tree-sitter/starter-guide: Add note.
    * doc/lispref/parsing.texi: Add note.

diff --git a/admin/notes/tree-sitter/starter-guide b/admin/notes/tree-sitter/starter-guide
index 129f9ee5fa..378ff581af 100644
--- a/admin/notes/tree-sitter/starter-guide
+++ b/admin/notes/tree-sitter/starter-guide
@@ -8,6 +8,7 @@ TOC:
 - Building Emacs with tree-sitter
 - Install language definitions
 - Setup
+- Naming convention
 - Font-lock
 - Indent
 - Imenu
@@ -94,6 +95,12 @@ Then in other places, we decide on whether to enable tree-sitter by
      (treesit-can-enable-p))
 #+end_src
 
+* Naming convention
+
+When referring to tree-sitter as a noun, use “tree-sitter”, like
+python-use-tree-sitter. For prefix use “treesit”, like
+python-treesit-indent.
+
 * Font-lock
 
 Tree-sitter works like this: You provide a query made of patterns and
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 3784531fe5..d0bb642a3e 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -30,6 +30,10 @@ Parsing Program Source
 @pxref{Parser-based Font Lock}, @ref{Parser-based Indentation}, and
 @ref{List Motion}.
 
+About naming convention: use ``tree-sitter'' when referring to it as a
+noun, like @code{python-use-tree-sitter}, but use ``treesit'' for
+prefixes, like @code{python-treesit-indent-function}.
+
 To access the syntax tree of the text in a buffer, we need to first
 load a language definition and create a parser with it.  Next, we can
 query the parser for specific nodes in the syntax tree.  Then, we can

commit 8bc6e31502244ca16bbf7b163a7a321ec9094882
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Oct 7 01:21:09 2022 -0700

    Add a :toggle option for tree-sitter font-lock
    
    * admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html:
    Update html manual.
    * admin/notes/tree-sitter/html-manual/build-manual.sh: Fix manual
    path.
    * admin/notes/tree-sitter/starter-guide: Mention :toggle.
    * doc/lispref/modes.texi: Mention :toggle.
    * lisp/treesit.el (treesit-font-lock-settings): Update docstring.
    (treesit-font-lock-rules): Handle :toggle.  Also change
    some wrong-type-argument signal to treesit-font-lock-error which is
    easier to understand.
    (treesit-font-lock-fontify-region): Handle :toggle.

diff --git a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html
index ec89b7749c..246ebf0519 100644
--- a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html
+++ b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html
@@ -115,6 +115,8 @@
 <tr><td width="15%"></td><td width="15%"><code>append</code></td><td width="60%">Append the new face to existing ones</td></tr>
 <tr><td width="15%"></td><td width="15%"><code>prepend</code></td><td width="60%">Prepend the new face to existing ones</td></tr>
 <tr><td width="15%"></td><td width="15%"><code>keep</code></td><td width="60%">Fill-in regions without an existing face</td></tr>
+<tr><td width="15%"><code>:toggle</code></td><td width="15%"><var>symbol</var></td><td width="60%">If non-nil, its value should be a variable name.  The variable&rsquo;s value
+(nil/non-nil) disables/enables the query during fontification.</td></tr>
 </table>
 
 <p>Capture names in <var>query</var> should be face names like
diff --git a/admin/notes/tree-sitter/html-manual/build-manual.sh b/admin/notes/tree-sitter/html-manual/build-manual.sh
index adde3f2a2a..8d931b143b 100755
--- a/admin/notes/tree-sitter/html-manual/build-manual.sh
+++ b/admin/notes/tree-sitter/html-manual/build-manual.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-MANUAL_DIR="../../../doc/lispref"
+MANUAL_DIR="../../../../doc/lispref"
 THIS_DIR=$(pwd)
 
 echo "Build manual"
diff --git a/admin/notes/tree-sitter/starter-guide b/admin/notes/tree-sitter/starter-guide
index 6cf8cf8a23..129f9ee5fa 100644
--- a/admin/notes/tree-sitter/starter-guide
+++ b/admin/notes/tree-sitter/starter-guide
@@ -238,22 +238,22 @@ You’ll notice that tree-sitter’s font-lock doesn’t respect
 ‘font-lock-maximum-decoration’, major modes are free to set
 ‘treesit-font-lock-settings’ based on the value of
 ‘font-lock-maximum-decoration’, or provide more fine-grained control
-through other mode-specific means.
+through other mode-specific means. (Towards that end, the :toggle option in treesit-font-lock-rules is very useful.)
 
 * Indent
 
-Indent works like this: We have a bunch of rules that look like this:
+Indent works like this: We have a bunch of rules that look like
 
    (MATCHER ANCHOR OFFSET)
 
-At the beginning point is at the BOL of a line, we want to know which
-column to indent this line to. Let NODE be the node at point, we pass
-this node to the MATCHER of each rule, one of them will match the node
-("this node is a closing bracket!"). Then we pass the node to the
-ANCHOR, which returns a point, eg, the BOL of the previous line. We
-find the column number of that point (eg, 4), add OFFSET to it (eg,
-0), and that is the column we want to indent the current line to (4 +
-0 = 4).
+When the indentation process starts, point is at the BOL of a line, we
+want to know which column to indent this line to. Let NODE be the node
+at point, we pass this node to the MATCHER of each rule, one of them
+will match the node (eg, "this node is a closing bracket!"). Then we pass
+the node to the ANCHOR, which returns a point, eg, the BOL of the
+previous line. We find the column number of that point (eg, 4), add
+OFFSET to it (eg, 0), and that is the column we want to indent the
+current line to (4 + 0 = 4).
 
 For MATHCER we have
 
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 883f9d8491..dcc0b2958d 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3932,6 +3932,9 @@ Parser-based Font Lock
 @item @tab @code{append} @tab Append the new face to existing ones
 @item @tab @code{prepend} @tab Prepend the new face to existing ones
 @item @tab @code{keep} @tab Fill-in regions without an existing face
+@item @code{:toggle} @tab @var{symbol} @tab
+If non-nil, its value should be a variable name.  The variable's value
+(nil/non-nil) disables/enables the query during fontification.
 @end multitable
 
 Capture names in @var{query} should be face names like
diff --git a/lisp/treesit.el b/lisp/treesit.el
index bb13021a27..db96a89975 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -289,7 +289,7 @@ treesit-font-lock-settings
 
 Each SETTING is of form
 
-    (LANGUAGE QUERY OVERRIDE)
+    (LANGUAGE QUERY OVERRIDE TOGGLE)
 
 Each SETTING controls one parser (often of different language).
 LANGUAGE is the language symbol.  See Info node `(elisp)Language
@@ -304,7 +304,11 @@ treesit-font-lock-settings
 
 OVERRIDE is the override flag for this query.  Its value can be
 t, nil, append, prepend, keep.  See more in
-`treesit-font-lock-rules'.")
+`treesit-font-lock-rules'.
+
+TOGGLE should be a variable (symbol) or nil.  The variable's
+value (nil/non-nil) controls whether to activate the query during
+fontification.  If TOGGLE is nil, the query is always activated.")
 
 (defun treesit-font-lock-rules (&rest args)
   "Return a value suitable for `treesit-font-lock-settings'.
@@ -320,6 +324,7 @@ treesit-font-lock-rules
     (treesit-font-lock-rules
      :language \\='javascript
      :override t
+     :enable 'html-fontify-script
      \\='((true) @font-lock-constant-face
        (false) @font-lock-constant-face)
      :language \\='html
@@ -335,6 +340,10 @@ treesit-font-lock-rules
              append   Append the new face to existing ones
              prepend  Prepend the new face to existing ones
              keep     Fill-in regions without an existing face
+  :toggle    <symbol> If non-nil, the value should be a variable.
+                      The value of that variable (non-nil/nil)
+                      activates/deactivates the query during
+                      fontification.
 
 Capture names in QUERY should be face names like
 `font-lock-keyword-face'.  The captured node will be fontified
@@ -352,6 +361,8 @@ treesit-font-lock-rules
         (current-language nil)
         ;; Tracks :override flag.
         (current-override nil)
+        ;; Track :toggle flag.
+        (current-toggle t)
         ;; The list this function returns.
         (result nil))
     (while args
@@ -360,15 +371,28 @@ treesit-font-lock-rules
           (:language
            (let ((lang (pop args)))
              (when (or (not (symbolp lang)) (null lang))
-               (signal 'wrong-type-argument `(symbolp ,lang)))
+               (signal 'treesit-font-lock-error
+                       `("Value of :language should be a symbol"
+                         ,lang)))
              (setq current-language lang)))
           (:override
            (let ((flag (pop args)))
              (when (not (memq flag '(t nil append prepend keep)))
+               (signal 'treesit-font-lock-error
+                       `("Value of :override should be one of t, nil, append, prepend, keep"
+                         ,flag))
                (signal 'wrong-type-argument
                        `((or t nil append prepend keep)
                          ,flag)))
              (setq current-override flag)))
+          (:toggle
+           (let ((var (pop args)))
+             (when (or (not (symbolp var))
+                       (memq var '(t nil)))
+               (signal 'treesit-font-lock-error
+                       `("Value of :toggle should be a variable name"
+                         ,var)))
+             (setq current-toggle var)))
           ((pred treesit-query-p)
            (when (null current-language)
              (signal 'treesit-font-lock-error
@@ -377,11 +401,13 @@ treesit-font-lock-rules
                (push `(,current-language token) result)
              (push `(,current-language
                      ,(treesit-query-compile current-language token)
-                     ,current-override)
+                     ,current-override
+                     ,current-toggle)
                    result))
            ;; Clears any configurations set for this query.
            (setq current-language nil
-                 current-override nil))
+                 current-override nil
+                 current-toggle nil))
           (_ (signal 'treesit-font-lock-error
                      `("Unexpected value" token))))))
     (nreverse result)))
@@ -396,8 +422,12 @@ treesit-font-lock-fontify-region
     (let* ((language (nth 0 setting))
            (match-pattern (nth 1 setting))
            (override (nth 2 setting))
+           (toggle (nth 3 setting))
            (parser (treesit-parser-create language)))
-      (when-let ((node (treesit-node-on start end parser)))
+      (when-let ((node (treesit-node-on start end parser))
+                 (activate (or (null toggle)
+                               (symbol-value toggle))))
+        (ignore activate)
         (let ((captures (treesit-query-capture
                          node match-pattern
                          ;; Specifying the range is important. More

commit b755f45f65090665dd40ed0f0dc4eb6f9e4923a0
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Oct 6 15:46:01 2022 -0700

    * src/treesit.c (syms_of_treesit): Add Streesit_language_version.

diff --git a/src/treesit.c b/src/treesit.c
index 77b48133ba..fc7e6c5593 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2280,6 +2280,7 @@ syms_of_treesit (void)
   Vtreesit_extra_load_path = Qnil;
 
   defsubr (&Streesit_language_available_p);
+  defsubr (&Streesit_language_version);
 
   defsubr (&Streesit_parser_p);
   defsubr (&Streesit_node_p);

commit cea1e95d386270e1e682719232f2cfad384fab91
Merge: 7ebbd4efc3 0c65c9dfb3
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Oct 6 11:06:07 2022 -0700

    Merge branch 'master' into feature/tree-sitter

commit 7ebbd4efc3d45403cf845d35c36c21756baeeba8
Merge: cb183f6467 95efafb726
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Oct 5 14:22:03 2022 -0700

    Merge branch 'master' into feature/tree-sitter

commit cb183f6467401fb5ed2b7fc98ca75be9d943cbe3
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Oct 5 14:11:33 2022 -0700

    Add tree-sitter admin notes
    
    starter-guide: Guide on writing major mode features.
    build-module: Script for building official language definitions.
    html-manual: HTML version of the manual for easy access.
    
    * admin/notes/tree-sitter/build-module/README: New file.
    * admin/notes/tree-sitter/build-module/batch.sh: New file.
    * admin/notes/tree-sitter/build-module/build.sh: New file.
    * admin/notes/tree-sitter/starter-guide: New file.
    * admin/notes/tree-sitter/html-manual/Accessing-Node.html: New file.
    * admin/notes/tree-sitter/html-manual/Language-Definitions.html: New file.
    * admin/notes/tree-sitter/html-manual/Multiple-Languages.html: New file.
    * admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html:
    New file.
    * admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html:
    New file.
    * admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html: New
    file.
    * admin/notes/tree-sitter/html-manual/Pattern-Matching.html: New file.
    * admin/notes/tree-sitter/html-manual/Retrieving-Node.html: New file.
    * admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html: New
    file.
    * admin/notes/tree-sitter/html-manual/Using-Parser.html: New file.
    * admin/notes/tree-sitter/html-manual/build-manual.sh: New file.
    * admin/notes/tree-sitter/html-manual/manual.css: New file.

diff --git a/admin/notes/tree-sitter/build-module/README b/admin/notes/tree-sitter/build-module/README
new file mode 100644
index 0000000000..ee6076c119
--- /dev/null
+++ b/admin/notes/tree-sitter/build-module/README
@@ -0,0 +1,17 @@
+To build the language definition for a particular language, run
+
+    ./build.sh <language>
+
+eg,
+
+    ./build.sh html
+
+The dynamic module will be in /dist directory
+
+To build all modules at once, run
+
+    ./batch.sh
+
+This gives you C, JSON, Go, HTML, Javascript, CSS, Python, Typescript,
+C#, C++, Rust. More can be added to batch.sh unless it's directory
+strucure is not standard.
\ No newline at end of file
diff --git a/admin/notes/tree-sitter/build-module/batch.sh b/admin/notes/tree-sitter/build-module/batch.sh
new file mode 100755
index 0000000000..deed18978a
--- /dev/null
+++ b/admin/notes/tree-sitter/build-module/batch.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+languages=(
+    'c'
+    'cpp'
+    'css'
+    'c-sharp'
+    'go'
+    'html'
+    'javascript'
+    'json'
+    'python'
+    'rust'
+    'typescript'
+)
+
+for language in "${languages[@]}"
+do
+    ./build.sh $language
+done
diff --git a/admin/notes/tree-sitter/build-module/build.sh b/admin/notes/tree-sitter/build-module/build.sh
new file mode 100755
index 0000000000..16792d05cb
--- /dev/null
+++ b/admin/notes/tree-sitter/build-module/build.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+lang=$1
+
+if [ $(uname) == "Darwin" ]
+then
+    soext="dylib"
+else
+    soext="so"
+fi
+
+echo "Building ${lang}"
+
+# Retrieve sources.
+git clone "https://github.com/tree-sitter/tree-sitter-${lang}.git" \
+    --depth 1 --quiet
+if [ "${lang}" == "typescript" ]
+then
+    lang="typescript/tsx"
+fi
+cp tree-sitter-lang.in "tree-sitter-${lang}/src"
+cp emacs-module.h "tree-sitter-${lang}/src"
+cp "tree-sitter-${lang}/grammar.js" "tree-sitter-${lang}/src"
+cd "tree-sitter-${lang}/src"
+
+if [ "${lang}" == "typescript/tsx" ]
+then
+    lang="typescript"
+fi
+
+# Build.
+cc -c -I. parser.c
+# Compile scanner.c.
+if test -f scanner.c
+then
+    cc -fPIC -c -I. scanner.c
+fi
+# Compile scanner.cc.
+if test -f scanner.cc
+then
+    c++ -fPIC -I. -c scanner.cc
+fi
+# Link.
+if test -f scanner.cc
+then
+    c++ -fPIC -shared *.o -o "libtree-sitter-${lang}.${soext}"
+else
+    cc -fPIC -shared *.o -o "libtree-sitter-${lang}.${soext}"
+fi
+
+# Copy out.
+
+if [ "${lang}" == "typescript" ]
+then
+    cp "libtree-sitter-${lang}.${soext}" ..
+    cd ..
+fi
+
+mkdir -p ../../dist
+cp "libtree-sitter-${lang}.${soext}" ../../dist
+cd ../../
+rm -rf "tree-sitter-${lang}"
diff --git a/admin/notes/tree-sitter/html-manual/Accessing-Node.html b/admin/notes/tree-sitter/html-manual/Accessing-Node.html
new file mode 100644
index 0000000000..00ac63b833
--- /dev/null
+++ b/admin/notes/tree-sitter/html-manual/Accessing-Node.html
@@ -0,0 +1,206 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- Created by GNU Texinfo 6.8, https://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<!-- This is the GNU Emacs Lisp Reference Manual
+corresponding to Emacs version 29.0.50.
+
+Copyright © 1990-1996, 1998-2022 Free Software Foundation,
+Inc.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being "GNU General Public License," with the
+Front-Cover Texts being "A GNU Manual," and with the Back-Cover
+Texts as in (a) below.  A copy of the license is included in the
+section entitled "GNU Free Documentation License."
+
+(a) The FSF's Back-Cover Text is: "You have the freedom to copy and
+modify this GNU manual.  Buying copies from the FSF supports it in
+developing GNU and promoting software freedom." -->
+<title>Accessing Node (GNU Emacs Lisp Reference Manual)</title>
+
+<meta name="description" content="Accessing Node (GNU Emacs Lisp Reference Manual)">
+<meta name="keywords" content="Accessing Node (GNU Emacs Lisp Reference Manual)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="makeinfo">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="index.html" rel="start" title="Top">
+<link href="Index.html" rel="index" title="Index">
+<link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
+<link href="Parsing-Program-Source.html" rel="up" title="Parsing Program Source">
+<link href="Pattern-Matching.html" rel="next" title="Pattern Matching">
+<link href="Retrieving-Node.html" rel="prev" title="Retrieving Node">
+<style type="text/css">
+<!--
+a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+span:hover a.copiable-anchor {visibility: visible}
+ul.no-bullet {list-style: none}
+-->
+</style>
+<link rel="stylesheet" type="text/css" href="./manual.css">
+
+
+</head>
+
+<body lang="en">
+<div class="section" id="Accessing-Node">
+<div class="header">
+<p>
+Next: <a href="Pattern-Matching.html" accesskey="n" rel="next">Pattern Matching Tree-sitter Nodes</a>, Previous: <a href="Retrieving-Node.html" accesskey="p" rel="prev">Retrieving Node</a>, Up: <a href="Parsing-Program-Source.html" accesskey="u" rel="up">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+<hr>
+<span id="Accessing-Node-Information"></span><h3 class="section">37.4 Accessing Node Information</h3>
+
+<p>Before going further, make sure you have read the basic conventions
+about tree-sitter nodes in the previous node.
+</p>
+<span id="Basic-information"></span><h3 class="heading">Basic information</h3>
+
+<p>Every node is associated with a parser, and that parser is associated
+with a buffer.  The following functions let you retrieve them.
+</p>
+<dl class="def">
+<dt id="index-treesit_002dnode_002dparser"><span class="category">Function: </span><span><strong>treesit-node-parser</strong> <em>node</em><a href='#index-treesit_002dnode_002dparser' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function returns <var>node</var>&rsquo;s associated parser.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dnode_002dbuffer"><span class="category">Function: </span><span><strong>treesit-node-buffer</strong> <em>node</em><a href='#index-treesit_002dnode_002dbuffer' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function returns <var>node</var>&rsquo;s parser&rsquo;s associated buffer.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dnode_002dlanguage"><span class="category">Function: </span><span><strong>treesit-node-language</strong> <em>node</em><a href='#index-treesit_002dnode_002dlanguage' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function returns <var>node</var>&rsquo;s parser&rsquo;s associated language.
+</p></dd></dl>
+
+<p>Each node represents a piece of text in the buffer.  Functions below
+finds relevant information about that text.
+</p>
+<dl class="def">
+<dt id="index-treesit_002dnode_002dstart"><span class="category">Function: </span><span><strong>treesit-node-start</strong> <em>node</em><a href='#index-treesit_002dnode_002dstart' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>Return the start position of <var>node</var>.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dnode_002dend"><span class="category">Function: </span><span><strong>treesit-node-end</strong> <em>node</em><a href='#index-treesit_002dnode_002dend' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>Return the end position of <var>node</var>.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dnode_002dtext"><span class="category">Function: </span><span><strong>treesit-node-text</strong> <em>node &amp;optional object</em><a href='#index-treesit_002dnode_002dtext' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>Returns the buffer text that <var>node</var> represents.  (If <var>node</var> is
+retrieved from parsing a string, it will be text from that string.)
+</p></dd></dl>
+
+<p>Here are some basic checks on tree-sitter nodes.
+</p>
+<dl class="def">
+<dt id="index-treesit_002dnode_002dp"><span class="category">Function: </span><span><strong>treesit-node-p</strong> <em>object</em><a href='#index-treesit_002dnode_002dp' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>Checks if <var>object</var> is a tree-sitter syntax node.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dnode_002deq"><span class="category">Function: </span><span><strong>treesit-node-eq</strong> <em>node1 node2</em><a href='#index-treesit_002dnode_002deq' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>Checks if <var>node1</var> and <var>node2</var> are the same node in a syntax
+tree.
+</p></dd></dl>
+
+<span id="Property-information"></span><h3 class="heading">Property information</h3>
+
+<p>In general, nodes in a concrete syntax tree fall into two categories:
+<em>named nodes</em> and <em>anonymous nodes</em>.  Whether a node is named
+or anonymous is determined by the language definition
+(see <a href="Language-Definitions.html#tree_002dsitter-named-node">named node</a>).
+</p>
+<span id="index-tree_002dsitter-missing-node"></span>
+<p>Apart from being named/anonymous, a node can have other properties.  A
+node can be &ldquo;missing&rdquo;: missing nodes are inserted by the parser in
+order to recover from certain kinds of syntax errors, i.e., something
+should probably be there according to the grammar, but not there.
+</p>
+<span id="index-tree_002dsitter-extra-node"></span>
+<p>A node can be &ldquo;extra&rdquo;: extra nodes represent things like comments,
+which can appear anywhere in the text.
+</p>
+<span id="index-tree_002dsitter-node-that-has-changes"></span>
+<p>A node &ldquo;has changes&rdquo; if the buffer changed since when the node is
+retrieved, i.e., outdated.
+</p>
+<span id="index-tree_002dsitter-node-that-has-error"></span>
+<p>A node &ldquo;has error&rdquo; if the text it spans contains a syntax error.  It
+can be the node itself has an error, or one of its
+children/grandchildren... has an error.
+</p>
+<dl class="def">
+<dt id="index-treesit_002dnode_002dcheck"><span class="category">Function: </span><span><strong>treesit-node-check</strong> <em>node property</em><a href='#index-treesit_002dnode_002dcheck' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function checks if <var>node</var> has <var>property</var>.  <var>property</var>
+can be <code>'named</code>, <code>'missing</code>, <code>'extra</code>,
+<code>'has-changes</code>, or <code>'has-error</code>.
+</p></dd></dl>
+
+
+<dl class="def">
+<dt id="index-treesit_002dnode_002dtype"><span class="category">Function: </span><span><strong>treesit-node-type</strong> <em>node</em><a href='#index-treesit_002dnode_002dtype' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>Named nodes have &ldquo;types&rdquo; (see <a href="Language-Definitions.html#tree_002dsitter-node-type">node type</a>).
+For example, a named node can be a <code>string_literal</code> node, where
+<code>string_literal</code> is its type.
+</p>
+<p>This function returns <var>node</var>&rsquo;s type as a string.
+</p></dd></dl>
+
+<span id="Information-as-a-child-or-parent"></span><h3 class="heading">Information as a child or parent</h3>
+
+<dl class="def">
+<dt id="index-treesit_002dnode_002dindex"><span class="category">Function: </span><span><strong>treesit-node-index</strong> <em>node &amp;optional named</em><a href='#index-treesit_002dnode_002dindex' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function returns the index of <var>node</var> as a child node of its
+parent.  If <var>named</var> is non-nil, it only count named nodes
+(see <a href="Language-Definitions.html#tree_002dsitter-named-node">named node</a>).
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dnode_002dfield_002dname"><span class="category">Function: </span><span><strong>treesit-node-field-name</strong> <em>node</em><a href='#index-treesit_002dnode_002dfield_002dname' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>A child of a parent node could have a field name (see <a href="Language-Definitions.html#tree_002dsitter-node-field-name">field name</a>).  This function returns the field name
+of <var>node</var> as a child of its parent.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dnode_002dfield_002dname_002dfor_002dchild"><span class="category">Function: </span><span><strong>treesit-node-field-name-for-child</strong> <em>node n</em><a href='#index-treesit_002dnode_002dfield_002dname_002dfor_002dchild' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function returns the field name of the <var>n</var>&rsquo;th child of
+<var>node</var>.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dchild_002dcount"><span class="category">Function: </span><span><strong>treesit-child-count</strong> <em>node &amp;optional named</em><a href='#index-treesit_002dchild_002dcount' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function finds the number of children of <var>node</var>.  If
+<var>named</var> is non-nil, it only counts named child (see <a href="Language-Definitions.html#tree_002dsitter-named-node">named node</a>).
+</p></dd></dl>
+
+</div>
+<hr>
+<div class="header">
+<p>
+Next: <a href="Pattern-Matching.html">Pattern Matching Tree-sitter Nodes</a>, Previous: <a href="Retrieving-Node.html">Retrieving Node</a>, Up: <a href="Parsing-Program-Source.html">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+
+
+
+</body>
+</html>
diff --git a/admin/notes/tree-sitter/html-manual/Language-Definitions.html b/admin/notes/tree-sitter/html-manual/Language-Definitions.html
new file mode 100644
index 0000000000..ba3eeb9eeb
--- /dev/null
+++ b/admin/notes/tree-sitter/html-manual/Language-Definitions.html
@@ -0,0 +1,326 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- Created by GNU Texinfo 6.8, https://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<!-- This is the GNU Emacs Lisp Reference Manual
+corresponding to Emacs version 29.0.50.
+
+Copyright © 1990-1996, 1998-2022 Free Software Foundation,
+Inc.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being "GNU General Public License," with the
+Front-Cover Texts being "A GNU Manual," and with the Back-Cover
+Texts as in (a) below.  A copy of the license is included in the
+section entitled "GNU Free Documentation License."
+
+(a) The FSF's Back-Cover Text is: "You have the freedom to copy and
+modify this GNU manual.  Buying copies from the FSF supports it in
+developing GNU and promoting software freedom." -->
+<title>Language Definitions (GNU Emacs Lisp Reference Manual)</title>
+
+<meta name="description" content="Language Definitions (GNU Emacs Lisp Reference Manual)">
+<meta name="keywords" content="Language Definitions (GNU Emacs Lisp Reference Manual)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="makeinfo">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="index.html" rel="start" title="Top">
+<link href="Index.html" rel="index" title="Index">
+<link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
+<link href="Parsing-Program-Source.html" rel="up" title="Parsing Program Source">
+<link href="Using-Parser.html" rel="next" title="Using Parser">
+<style type="text/css">
+<!--
+a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+span:hover a.copiable-anchor {visibility: visible}
+ul.no-bullet {list-style: none}
+-->
+</style>
+<link rel="stylesheet" type="text/css" href="./manual.css">
+
+
+</head>
+
+<body lang="en">
+<div class="section" id="Language-Definitions">
+<div class="header">
+<p>
+Next: <a href="Using-Parser.html" accesskey="n" rel="next">Using Tree-sitter Parser</a>, Up: <a href="Parsing-Program-Source.html" accesskey="u" rel="up">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+<hr>
+<span id="Tree_002dsitter-Language-Definitions"></span><h3 class="section">37.1 Tree-sitter Language Definitions</h3>
+
+<span id="Loading-a-language-definition"></span><h3 class="heading">Loading a language definition</h3>
+
+<p>Tree-sitter relies on language definitions to parse text in that
+language. In Emacs, A language definition is represented by a symbol.
+For example, C language definition is represented as <code>c</code>, and
+<code>c</code> can be passed to tree-sitter functions as the <var>language</var>
+argument.
+</p>
+<span id="index-treesit_002dextra_002dload_002dpath"></span>
+<span id="index-treesit_002dload_002dlanguage_002derror"></span>
+<span id="index-treesit_002dload_002dsuffixes"></span>
+<p>Tree-sitter language definitions are distributed as dynamic libraries.
+In order to use a language definition in Emacs, you need to make sure
+that the dynamic library is installed on the system.  Emacs looks for
+language definitions under load paths in
+<code>treesit-extra-load-path</code>, <code>user-emacs-directory</code>/tree-sitter,
+and system default locations for dynamic libraries, in that order.
+Emacs tries each extensions in <code>treesit-load-suffixes</code>.  If Emacs
+cannot find the library or has problem loading it, Emacs signals
+<code>treesit-load-language-error</code>.  The signal data is a list of
+specific error messages.
+</p>
+<dl class="def">
+<dt id="index-treesit_002dlanguage_002davailable_002dp"><span class="category">Function: </span><span><strong>treesit-language-available-p</strong> <em>language</em><a href='#index-treesit_002dlanguage_002davailable_002dp' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function checks whether the dynamic library for <var>language</var> is
+present on the system, and return non-nil if it is.
+</p></dd></dl>
+
+<span id="index-treesit_002dload_002dname_002doverride_002dlist"></span>
+<p>By convention, the dynamic library for <var>language</var> is
+<code>libtree-sitter-<var>language</var>.<var>ext</var></code>, where <var>ext</var> is the
+system-specific extension for dynamic libraries. Also by convention,
+the function provided by that library is named
+<code>tree_sitter_<var>language</var></code>.  If a language definition doesn&rsquo;t
+follow this convention, you should add an entry
+</p>
+<div class="example">
+<pre class="example">(<var>language</var> <var>library-base-name</var> <var>function-name</var>)
+</pre></div>
+
+<p>to <code>treesit-load-name-override-list</code>, where
+<var>library-base-name</var> is the base filename for the dynamic library
+(conventionally <code>libtree-sitter-<var>language</var></code>), and
+<var>function-name</var> is the function provided by the library
+(conventionally <code>tree_sitter_<var>language</var></code>). For example,
+</p>
+<div class="example">
+<pre class="example">(cool-lang &quot;libtree-sitter-coool&quot; &quot;tree_sitter_cooool&quot;)
+</pre></div>
+
+<p>for a language too cool to abide by conventions.
+</p>
+<dl class="def">
+<dt id="index-treesit_002dlanguage_002dversion"><span class="category">Function: </span><span><strong>treesit-language-version</strong> <em>&amp;optional min-compatible</em><a href='#index-treesit_002dlanguage_002dversion' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>Tree-sitter library has a <em>language version</em>, a language
+definition&rsquo;s version needs to match this version to be compatible.
+</p>
+<p>This function returns tree-sitter library’s language version.  If
+<var>min-compatible</var> is non-nil, it returns the minimal compatible
+version.
+</p></dd></dl>
+
+<span id="Concrete-syntax-tree"></span><h3 class="heading">Concrete syntax tree</h3>
+
+<p>A syntax tree is what a parser generates.  In a syntax tree, each node
+represents a piece of text, and is connected to each other by a
+parent-child relationship.  For example, if the source text is
+</p>
+<div class="example">
+<pre class="example">1 + 2
+</pre></div>
+
+<p>its syntax tree could be
+</p>
+<div class="example">
+<pre class="example">                  +--------------+
+                  | root &quot;1 + 2&quot; |
+                  +--------------+
+                         |
+        +--------------------------------+
+        |       expression &quot;1 + 2&quot;       |
+        +--------------------------------+
+           |             |            |
++------------+   +--------------+   +------------+
+| number &quot;1&quot; |   | operator &quot;+&quot; |   | number &quot;2&quot; |
++------------+   +--------------+   +------------+
+</pre></div>
+
+<p>We can also represent it in s-expression:
+</p>
+<div class="example">
+<pre class="example">(root (expression (number) (operator) (number)))
+</pre></div>
+
+<span id="Node-types"></span><h4 class="subheading">Node types</h4>
+
+<span id="index-tree_002dsitter-node-type"></span>
+<span id="tree_002dsitter-node-type"></span><span id="index-tree_002dsitter-named-node"></span>
+<span id="tree_002dsitter-named-node"></span><span id="index-tree_002dsitter-anonymous-node"></span>
+<p>Names like <code>root</code>, <code>expression</code>, <code>number</code>,
+<code>operator</code> are nodes&rsquo; <em>type</em>.  However, not all nodes in a
+syntax tree have a type.  Nodes that don&rsquo;t are <em>anonymous nodes</em>,
+and nodes with a type are <em>named nodes</em>.  Anonymous nodes are
+tokens with fixed spellings, including punctuation characters like
+bracket &lsquo;<samp>]</samp>&rsquo;, and keywords like <code>return</code>.
+</p>
+<span id="Field-names"></span><h4 class="subheading">Field names</h4>
+
+<span id="index-tree_002dsitter-node-field-name"></span>
+<span id="tree_002dsitter-node-field-name"></span><p>To make the syntax tree easier to
+analyze, many language definitions assign <em>field names</em> to child
+nodes.  For example, a <code>function_definition</code> node could have a
+<code>declarator</code> and a <code>body</code>:
+</p>
+<div class="example">
+<pre class="example">(function_definition
+ declarator: (declaration)
+ body: (compound_statement))
+</pre></div>
+
+<dl class="def">
+<dt id="index-treesit_002dinspect_002dmode"><span class="category">Command: </span><span><strong>treesit-inspect-mode</strong><a href='#index-treesit_002dinspect_002dmode' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This minor mode displays the node that <em>starts</em> at point in
+mode-line.  The mode-line will display
+</p>
+<div class="example">
+<pre class="example"><var>parent</var> <var>field-name</var>: (<var>child</var> (<var>grand-child</var> (...)))
+</pre></div>
+
+<p><var>child</var>, <var>grand-child</var>, and <var>grand-grand-child</var>, etc, are
+nodes that have their beginning at point.  And <var>parent</var> is the
+parent of <var>child</var>.
+</p>
+<p>If there is no node that starts at point, i.e., point is in the middle
+of a node, then the mode-line only displays the smallest node that
+spans point, and its immediate parent.
+</p>
+<p>This minor mode doesn&rsquo;t create parsers on its own.  It simply uses the
+first parser in <code>(treesit-parser-list)</code> (see <a href="Using-Parser.html">Using Tree-sitter Parser</a>).
+</p></dd></dl>
+
+<span id="Reading-the-grammar-definition"></span><h3 class="heading">Reading the grammar definition</h3>
+
+<p>Authors of language definitions define the <em>grammar</em> of a
+language, and this grammar determines how does a parser construct a
+concrete syntax tree out of the text.  In order to use the syntax
+tree effectively, we need to read the <em>grammar file</em>.
+</p>
+<p>The grammar file is usually <code>grammar.js</code> in a language
+definition’s project repository.  The link to a language definition’s
+home page can be found in tree-sitter’s homepage
+(<a href="https://tree-sitter.github.io/tree-sitter">https://tree-sitter.github.io/tree-sitter</a>).
+</p>
+<p>The grammar is written in JavaScript syntax.  For example, the rule
+matching a <code>function_definition</code> node looks like
+</p>
+<div class="example">
+<pre class="example">function_definition: $ =&gt; seq(
+  $.declaration_specifiers,
+  field('declarator', $.declaration),
+  field('body', $.compound_statement)
+)
+</pre></div>
+
+<p>The rule is represented by a function that takes a single argument
+<var>$</var>, representing the whole grammar.  The function itself is
+constructed by other functions: the <code>seq</code> function puts together a
+sequence of children; the <code>field</code> function annotates a child with
+a field name.  If we write the above definition in BNF syntax, it
+would look like
+</p>
+<div class="example">
+<pre class="example">function_definition :=
+  &lt;declaration_specifiers&gt; &lt;declaration&gt; &lt;compound_statement&gt;
+</pre></div>
+
+<p>and the node returned by the parser would look like
+</p>
+<div class="example">
+<pre class="example">(function_definition
+  (declaration_specifier)
+  declarator: (declaration)
+  body: (compound_statement))
+</pre></div>
+
+<p>Below is a list of functions that one will see in a grammar
+definition.  Each function takes other rules as arguments and returns
+a new rule.
+</p>
+<ul>
+<li> <code>seq(rule1, rule2, ...)</code> matches each rule one after another.
+
+</li><li> <code>choice(rule1, rule2, ...)</code> matches one of the rules in its
+arguments.
+
+</li><li> <code>repeat(rule)</code> matches <var>rule</var> for <em>zero or more</em> times.
+This is like the &lsquo;<samp>*</samp>&rsquo; operator in regular expressions.
+
+</li><li> <code>repeat1(rule)</code> matches <var>rule</var> for <em>one or more</em> times.
+This is like the &lsquo;<samp>+</samp>&rsquo; operator in regular expressions.
+
+</li><li> <code>optional(rule)</code> matches <var>rule</var> for <em>zero or one</em> time.
+This is like the &lsquo;<samp>?</samp>&rsquo; operator in regular expressions.
+
+</li><li> <code>field(name, rule)</code> assigns field name <var>name</var> to the child
+node matched by <var>rule</var>.
+
+</li><li> <code>alias(rule, alias)</code> makes nodes matched by <var>rule</var> appear as
+<var>alias</var> in the syntax tree generated by the parser.  For example,
+
+<div class="example">
+<pre class="example">alias(preprocessor_call_exp, call_expression)
+</pre></div>
+
+<p>makes any node matched by <code>preprocessor_call_exp</code> to appear as
+<code>call_expression</code>.
+</p></li></ul>
+
+<p>Below are grammar functions less interesting for a reader of a
+language definition.
+</p>
+<ul>
+<li> <code>token(rule)</code> marks <var>rule</var> to produce a single leaf node.
+That is, instead of generating a parent node with individual child
+nodes under it, everything is combined into a single leaf node.
+
+</li><li> Normally, grammar rules ignore preceding whitespaces,
+<code>token.immediate(rule)</code> changes <var>rule</var> to match only when
+there is no preceding whitespaces.
+
+</li><li> <code>prec(n, rule)</code> gives <var>rule</var> a level <var>n</var> precedence.
+
+</li><li> <code>prec.left([n,] rule)</code> marks <var>rule</var> as left-associative,
+optionally with level <var>n</var>.
+
+</li><li> <code>prec.right([n,] rule)</code> marks <var>rule</var> as right-associative,
+optionally with level <var>n</var>.
+
+</li><li> <code>prec.dynamic(n, rule)</code> is like <code>prec</code>, but the precedence
+is applied at runtime instead.
+</li></ul>
+
+<p>The tree-sitter project talks about writing a grammar in more detail:
+<a href="https://tree-sitter.github.io/tree-sitter/creating-parsers">https://tree-sitter.github.io/tree-sitter/creating-parsers</a>.
+Read especially &ldquo;The Grammar DSL&rdquo; section.
+</p>
+</div>
+<hr>
+<div class="header">
+<p>
+Next: <a href="Using-Parser.html">Using Tree-sitter Parser</a>, Up: <a href="Parsing-Program-Source.html">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+
+
+
+</body>
+</html>
diff --git a/admin/notes/tree-sitter/html-manual/Multiple-Languages.html b/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
new file mode 100644
index 0000000000..1ee2df7f44
--- /dev/null
+++ b/admin/notes/tree-sitter/html-manual/Multiple-Languages.html
@@ -0,0 +1,255 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- Created by GNU Texinfo 6.8, https://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<!-- This is the GNU Emacs Lisp Reference Manual
+corresponding to Emacs version 29.0.50.
+
+Copyright © 1990-1996, 1998-2022 Free Software Foundation,
+Inc.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being "GNU General Public License," with the
+Front-Cover Texts being "A GNU Manual," and with the Back-Cover
+Texts as in (a) below.  A copy of the license is included in the
+section entitled "GNU Free Documentation License."
+
+(a) The FSF's Back-Cover Text is: "You have the freedom to copy and
+modify this GNU manual.  Buying copies from the FSF supports it in
+developing GNU and promoting software freedom." -->
+<title>Multiple Languages (GNU Emacs Lisp Reference Manual)</title>
+
+<meta name="description" content="Multiple Languages (GNU Emacs Lisp Reference Manual)">
+<meta name="keywords" content="Multiple Languages (GNU Emacs Lisp Reference Manual)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="makeinfo">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="index.html" rel="start" title="Top">
+<link href="Index.html" rel="index" title="Index">
+<link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
+<link href="Parsing-Program-Source.html" rel="up" title="Parsing Program Source">
+<link href="Tree_002dsitter-C-API.html" rel="next" title="Tree-sitter C API">
+<link href="Pattern-Matching.html" rel="prev" title="Pattern Matching">
+<style type="text/css">
+<!--
+a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+span:hover a.copiable-anchor {visibility: visible}
+ul.no-bullet {list-style: none}
+-->
+</style>
+<link rel="stylesheet" type="text/css" href="./manual.css">
+
+
+</head>
+
+<body lang="en">
+<div class="section" id="Multiple-Languages">
+<div class="header">
+<p>
+Next: <a href="Tree_002dsitter-C-API.html" accesskey="n" rel="next">Tree-sitter C API Correspondence</a>, Previous: <a href="Pattern-Matching.html" accesskey="p" rel="prev">Pattern Matching Tree-sitter Nodes</a>, Up: <a href="Parsing-Program-Source.html" accesskey="u" rel="up">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+<hr>
+<span id="Parsing-Text-in-Multiple-Languages"></span><h3 class="section">37.6 Parsing Text in Multiple Languages</h3>
+
+<p>Sometimes, the source of a programming language could contain sources
+of other languages, HTML + CSS + JavaScript is one example.  In that
+case, we need to assign individual parsers to text segments written in
+different languages.  Traditionally this is achieved by using
+narrowing.  While tree-sitter works with narrowing (see <a href="Using-Parser.html#tree_002dsitter-narrowing">narrowing</a>), the recommended way is to set ranges in which
+a parser will operate.
+</p>
+<dl class="def">
+<dt id="index-treesit_002dparser_002dset_002dincluded_002dranges"><span class="category">Function: </span><span><strong>treesit-parser-set-included-ranges</strong> <em>parser ranges</em><a href='#index-treesit_002dparser_002dset_002dincluded_002dranges' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function sets the range of <var>parser</var> to <var>ranges</var>.  Then
+<var>parser</var> will only read the text covered in each range.  Each
+range in <var>ranges</var> is a list of cons <code>(<var>beg</var>
+. <var>end</var>)</code>.
+</p>
+<p>Each range in <var>ranges</var> must come in order and not overlap.  That
+is, in pseudo code:
+</p>
+<div class="example">
+<pre class="example">(cl-loop for idx from 1 to (1- (length ranges))
+         for prev = (nth (1- idx) ranges)
+         for next = (nth idx ranges)
+         should (&lt;= (car prev) (cdr prev)
+                    (car next) (cdr next)))
+</pre></div>
+
+<span id="index-treesit_002drange_002dinvalid"></span>
+<p>If <var>ranges</var> violates this constraint, or something else went
+wrong, this function signals a <code>treesit-range-invalid</code>.  The
+signal data contains a specific error message and the ranges we are
+trying to set.
+</p>
+<p>This function can also be used for disabling ranges.  If <var>ranges</var>
+is nil, the parser is set to parse the whole buffer.
+</p>
+<p>Example:
+</p>
+<div class="example">
+<pre class="example">(treesit-parser-set-included-ranges
+ parser '((1 . 9) (16 . 24) (24 . 25)))
+</pre></div>
+</dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dparser_002dincluded_002dranges"><span class="category">Function: </span><span><strong>treesit-parser-included-ranges</strong> <em>parser</em><a href='#index-treesit_002dparser_002dincluded_002dranges' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function returns the ranges set for <var>parser</var>.  The return
+value is the same as the <var>ranges</var> argument of
+<code>treesit-parser-included-ranges</code>: a list of cons
+<code>(<var>beg</var> . <var>end</var>)</code>.  And if <var>parser</var> doesn&rsquo;t have any
+ranges, the return value is nil.
+</p>
+<div class="example">
+<pre class="example">(treesit-parser-included-ranges parser)
+    &rArr; ((1 . 9) (16 . 24) (24 . 25))
+</pre></div>
+</dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dset_002dranges"><span class="category">Function: </span><span><strong>treesit-set-ranges</strong> <em>parser-or-lang ranges</em><a href='#index-treesit_002dset_002dranges' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>Like <code>treesit-parser-set-included-ranges</code>, this function sets
+the ranges of <var>parser-or-lang</var> to <var>ranges</var>.  Conveniently,
+<var>parser-or-lang</var> could be either a parser or a language.  If it is
+a language, this function looks for the first parser in
+<code>(treesit-parser-list)</code> for that language in the current buffer,
+and set range for it.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dget_002dranges"><span class="category">Function: </span><span><strong>treesit-get-ranges</strong> <em>parser-or-lang</em><a href='#index-treesit_002dget_002dranges' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function returns the ranges of <var>parser-or-lang</var>, like
+<code>treesit-parser-included-ranges</code>.  And like
+<code>treesit-set-ranges</code>, <var>parser-or-lang</var> can be a parser or
+a language symbol.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dquery_002drange"><span class="category">Function: </span><span><strong>treesit-query-range</strong> <em>source query &amp;optional beg end</em><a href='#index-treesit_002dquery_002drange' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function matches <var>source</var> with <var>query</var> and returns the
+ranges of captured nodes.  The return value has the same shape of
+other functions: a list of <code>(<var>beg</var> . <var>end</var>)</code>.
+</p>
+<p>For convenience, <var>source</var> can be a language symbol, a parser, or a
+node.  If a language symbol, this function matches in the root node of
+the first parser using that language; if a parser, this function
+matches in the root node of that parser; if a node, this function
+matches in that node.
+</p>
+<p>Parameter <var>query</var> is the query used to capture nodes
+(see <a href="Pattern-Matching.html">Pattern Matching Tree-sitter Nodes</a>). The capture names don&rsquo;t matter.  Parameter
+<var>beg</var> and <var>end</var>, if both non-nil, limits the range in which
+this function queries.
+</p>
+<p>Like other query functions, this function raises an
+<var>treesit-query-error</var> if <var>query</var> is malformed.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dlanguage_002dat"><span class="category">Function: </span><span><strong>treesit-language-at</strong> <em>point</em><a href='#index-treesit_002dlanguage_002dat' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function tries to figure out which language is responsible for
+the text at <var>point</var>.  It goes over each parser in
+<code>(treesit-parser-list)</code> and see if that parser&rsquo;s range covers
+<var>point</var>.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002drange_002dfunctions"><span class="category">Variable: </span><span><strong>treesit-range-functions</strong><a href='#index-treesit_002drange_002dfunctions' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>A list of range functions.  Font-locking and indenting code uses
+functions in this alist to set correct ranges for a language parser
+before using it.
+</p>
+<p>The signature of each function should be
+</p>
+<div class="example">
+<pre class="example">(<var>start</var> <var>end</var> &amp;rest <var>_</var>)
+</pre></div>
+
+<p>where <var>start</var> and <var>end</var> marks the region that is about to be
+used.  A range function only need to (but not limited to) update
+ranges in that region.
+</p>
+<p>Each function in the list is called in-order.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dupdate_002dranges"><span class="category">Function: </span><span><strong>treesit-update-ranges</strong> <em>&amp;optional start end</em><a href='#index-treesit_002dupdate_002dranges' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function is used by font-lock and indent to update ranges before
+using any parser.  Each range function in
+<var>treesit-range-functions</var> is called in-order.  Arguments
+<var>start</var> and <var>end</var> are passed to each range function.
+</p></dd></dl>
+
+<span id="An-example"></span><h3 class="heading">An example</h3>
+
+<p>Normally, in a set of languages that can be mixed together, there is a
+major language and several embedded languages. We first parse the
+whole document with the major language’s parser, set ranges for the
+embedded languages, then parse the embedded languages.
+</p>
+<p>Suppose we want to parse a very simple document that mixes HTML, CSS
+and JavaScript:
+</p>
+<div class="example">
+<pre class="example">&lt;html&gt;
+  &lt;script&gt;1 + 2&lt;/script&gt;
+  &lt;style&gt;body { color: &quot;blue&quot;; }&lt;/style&gt;
+&lt;/html&gt;
+</pre></div>
+
+<p>We first parse with HTML, then set ranges for CSS and JavaScript:
+</p>
+<div class="example">
+<pre class="example">;; Create parsers.
+(setq html (treesit-get-parser-create 'html))
+(setq css (treesit-get-parser-create 'css))
+(setq js (treesit-get-parser-create 'javascript))
+
+;; Set CSS ranges.
+(setq css-range
+      (treesit-query-range
+       'html
+       &quot;(style_element (raw_text) @capture)&quot;))
+(treesit-parser-set-included-ranges css css-range)
+
+;; Set JavaScript ranges.
+(setq js-range
+      (treesit-query-range
+       'html
+       &quot;(script_element (raw_text) @capture)&quot;))
+(treesit-parser-set-included-ranges js js-range)
+</pre></div>
+
+<p>We use a query pattern <code>(style_element (raw_text) @capture)</code> to
+find CSS nodes in the HTML parse tree. For how to write query
+patterns, see <a href="Pattern-Matching.html">Pattern Matching Tree-sitter Nodes</a>.
+</p>
+</div>
+<hr>
+<div class="header">
+<p>
+Next: <a href="Tree_002dsitter-C-API.html">Tree-sitter C API Correspondence</a>, Previous: <a href="Pattern-Matching.html">Pattern Matching Tree-sitter Nodes</a>, Up: <a href="Parsing-Program-Source.html">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+
+
+
+</body>
+</html>
diff --git a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html
new file mode 100644
index 0000000000..ec89b7749c
--- /dev/null
+++ b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Font-Lock.html
@@ -0,0 +1,160 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- Created by GNU Texinfo 6.8, https://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<!-- This is the GNU Emacs Lisp Reference Manual
+corresponding to Emacs version 29.0.50.
+
+Copyright © 1990-1996, 1998-2022 Free Software Foundation,
+Inc.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being "GNU General Public License," with the
+Front-Cover Texts being "A GNU Manual," and with the Back-Cover
+Texts as in (a) below.  A copy of the license is included in the
+section entitled "GNU Free Documentation License."
+
+(a) The FSF's Back-Cover Text is: "You have the freedom to copy and
+modify this GNU manual.  Buying copies from the FSF supports it in
+developing GNU and promoting software freedom." -->
+<title>Parser-based Font Lock (GNU Emacs Lisp Reference Manual)</title>
+
+<meta name="description" content="Parser-based Font Lock (GNU Emacs Lisp Reference Manual)">
+<meta name="keywords" content="Parser-based Font Lock (GNU Emacs Lisp Reference Manual)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="makeinfo">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="index.html" rel="start" title="Top">
+<link href="Index.html" rel="index" title="Index">
+<link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
+<link href="Font-Lock-Mode.html" rel="up" title="Font Lock Mode">
+<link href="Multiline-Font-Lock.html" rel="prev" title="Multiline Font Lock">
+<style type="text/css">
+<!--
+a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+span:hover a.copiable-anchor {visibility: visible}
+ul.no-bullet {list-style: none}
+-->
+</style>
+<link rel="stylesheet" type="text/css" href="./manual.css">
+
+
+</head>
+
+<body lang="en">
+<div class="subsection" id="Parser_002dbased-Font-Lock">
+<div class="header">
+<p>
+Previous: <a href="Multiline-Font-Lock.html" accesskey="p" rel="prev">Multiline Font Lock Constructs</a>, Up: <a href="Font-Lock-Mode.html" accesskey="u" rel="up">Font Lock Mode</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+<hr>
+<span id="Parser_002dbased-Font-Lock-1"></span><h4 class="subsection">24.6.10 Parser-based Font Lock</h4>
+
+
+<p>Besides simple syntactic font lock and regexp-based font lock, Emacs
+also provides complete syntactic font lock with the help of a parser,
+currently provided by the tree-sitter library (see <a href="Parsing-Program-Source.html">Parsing Program Source</a>).
+</p>
+<dl class="def">
+<dt id="index-treesit_002dfont_002dlock_002denable"><span class="category">Function: </span><span><strong>treesit-font-lock-enable</strong><a href='#index-treesit_002dfont_002dlock_002denable' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function enables parser-based font lock in the current buffer.
+</p></dd></dl>
+
+<p>Parser-based font lock and other font lock mechanism are not mutually
+exclusive.  By default, if enabled, parser-based font lock runs first,
+then the simple syntactic font lock (if enabled), then regexp-based
+font lock.
+</p>
+<p>Although parser-based font lock doesn&rsquo;t share the same customization
+variables with regexp-based font lock, parser-based font lock uses
+similar customization schemes.  The tree-sitter counterpart of
+<var>font-lock-keywords</var> is <var>treesit-font-lock-settings</var>.
+</p>
+<dl class="def">
+<dt id="index-treesit_002dfont_002dlock_002drules"><span class="category">Function: </span><span><strong>treesit-font-lock-rules</strong> <em>:keyword value query...</em><a href='#index-treesit_002dfont_002dlock_002drules' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function is used to set <var>treesit-font-lock-settings</var>.  It
+takes care of compiling queries and other post-processing and outputs
+a value that <var>treesit-font-lock-settings</var> accepts.  An example:
+</p>
+<div class="example">
+<pre class="example">(treesit-font-lock-rules
+ :language 'javascript
+ :override t
+ '((true) @font-lock-constant-face
+   (false) @font-lock-constant-face)
+ :language 'html
+ &quot;(script_element) @font-lock-builtin-face&quot;)
+</pre></div>
+
+<p>This function takes a list of text or s-exp queries.  Before each
+query, there are <var>:keyword</var> and <var>value</var> pairs that configure
+that query.  The <code>:lang</code> keyword sets the query’s language and
+every query must specify the language.  Other keywords are optional:
+</p>
+<table>
+<thead><tr><th width="15%">Keyword</th><th width="15%">Value</th><th width="60%">Description</th></tr></thead>
+<tr><td width="15%"><code>:override</code></td><td width="15%">nil</td><td width="60%">If the region already has a face, discard the new face</td></tr>
+<tr><td width="15%"></td><td width="15%">t</td><td width="60%">Always apply the new face</td></tr>
+<tr><td width="15%"></td><td width="15%"><code>append</code></td><td width="60%">Append the new face to existing ones</td></tr>
+<tr><td width="15%"></td><td width="15%"><code>prepend</code></td><td width="60%">Prepend the new face to existing ones</td></tr>
+<tr><td width="15%"></td><td width="15%"><code>keep</code></td><td width="60%">Fill-in regions without an existing face</td></tr>
+</table>
+
+<p>Capture names in <var>query</var> should be face names like
+<code>font-lock-keyword-face</code>.  The captured node will be fontified
+with that face.  Capture names can also be function names, in which
+case the function is called with (<var>start</var> <var>end</var> <var>node</var>),
+where <var>start</var> and <var>end</var> are the start and end position of the
+node in buffer, and <var>node</var> is the node itself.  If a capture name
+is both a face and a function, the face takes priority.  If a capture
+name is not a face name nor a function name, it is ignored.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dfont_002dlock_002dsettings"><span class="category">Variable: </span><span><strong>treesit-font-lock-settings</strong><a href='#index-treesit_002dfont_002dlock_002dsettings' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>A list of <var>setting</var>s for tree-sitter font lock.  The exact format
+of this variable is considered internal.  One should always use
+<code>treesit-font-lock-rules</code> to set this variable.
+</p>
+<p>Each <var>setting</var> is of form
+</p>
+<div class="example">
+<pre class="example">(<var>language</var> <var>query</var>)
+</pre></div>
+
+<p>Each <var>setting</var> controls one parser (often of different language).
+And <var>language</var> is the language symbol (see <a href="Language-Definitions.html">Tree-sitter Language Definitions</a>); <var>query</var> is the query (see <a href="Pattern-Matching.html">Pattern Matching Tree-sitter Nodes</a>).
+</p></dd></dl>
+
+<p>Multi-language major modes should provide range functions in
+<code>treesit-range-functions</code>, and Emacs will set the ranges
+accordingly before fontifing a region (see <a href="Multiple-Languages.html">Parsing Text in Multiple Languages</a>).
+</p>
+</div>
+<hr>
+<div class="header">
+<p>
+Previous: <a href="Multiline-Font-Lock.html">Multiline Font Lock Constructs</a>, Up: <a href="Font-Lock-Mode.html">Font Lock Mode</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+
+
+
+</body>
+</html>
diff --git a/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html
new file mode 100644
index 0000000000..691c8fba8c
--- /dev/null
+++ b/admin/notes/tree-sitter/html-manual/Parser_002dbased-Indentation.html
@@ -0,0 +1,244 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- Created by GNU Texinfo 6.8, https://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<!-- This is the GNU Emacs Lisp Reference Manual
+corresponding to Emacs version 29.0.50.
+
+Copyright © 1990-1996, 1998-2022 Free Software Foundation,
+Inc.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being "GNU General Public License," with the
+Front-Cover Texts being "A GNU Manual," and with the Back-Cover
+Texts as in (a) below.  A copy of the license is included in the
+section entitled "GNU Free Documentation License."
+
+(a) The FSF's Back-Cover Text is: "You have the freedom to copy and
+modify this GNU manual.  Buying copies from the FSF supports it in
+developing GNU and promoting software freedom." -->
+<title>Parser-based Indentation (GNU Emacs Lisp Reference Manual)</title>
+
+<meta name="description" content="Parser-based Indentation (GNU Emacs Lisp Reference Manual)">
+<meta name="keywords" content="Parser-based Indentation (GNU Emacs Lisp Reference Manual)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="makeinfo">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="index.html" rel="start" title="Top">
+<link href="Index.html" rel="index" title="Index">
+<link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
+<link href="Auto_002dIndentation.html" rel="up" title="Auto-Indentation">
+<link href="SMIE.html" rel="prev" title="SMIE">
+<style type="text/css">
+<!--
+a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+span:hover a.copiable-anchor {visibility: visible}
+ul.no-bullet {list-style: none}
+-->
+</style>
+<link rel="stylesheet" type="text/css" href="./manual.css">
+
+
+</head>
+
+<body lang="en">
+<div class="subsection" id="Parser_002dbased-Indentation">
+<div class="header">
+<p>
+Previous: <a href="SMIE.html" accesskey="p" rel="prev">Simple Minded Indentation Engine</a>, Up: <a href="Auto_002dIndentation.html" accesskey="u" rel="up">Automatic Indentation of code</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+<hr>
+<span id="Parser_002dbased-Indentation-1"></span><h4 class="subsection">24.7.2 Parser-based Indentation</h4>
+
+
+<p>When built with the tree-sitter library (see <a href="Parsing-Program-Source.html">Parsing Program Source</a>), Emacs could parse program source and produce a syntax tree.
+And this syntax tree can be used for indentation.  For maximum
+flexibility, we could write a custom indent function that queries the
+syntax tree and indents accordingly for each language, but that would
+be a lot of work.  It is more convenient to use the simple indentation
+engine described below: we only need to write some indentation rules
+and the engine takes care of the rest.
+</p>
+<p>To enable the indentation engine, set the value of
+<code>indent-line-function</code> to <code>treesit-indent</code>.
+</p>
+<dl class="def">
+<dt id="index-treesit_002dindent_002dfunction"><span class="category">Variable: </span><span><strong>treesit-indent-function</strong><a href='#index-treesit_002dindent_002dfunction' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This variable stores the actual function called by
+<code>treesit-indent</code>.  By default, its value is
+<code>treesit-simple-indent</code>.  In the future we might add other
+more complex indentation engines.
+</p></dd></dl>
+
+<span id="Writing-indentation-rules"></span><h3 class="heading">Writing indentation rules</h3>
+
+<dl class="def">
+<dt id="index-treesit_002dsimple_002dindent_002drules"><span class="category">Variable: </span><span><strong>treesit-simple-indent-rules</strong><a href='#index-treesit_002dsimple_002dindent_002drules' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This local variable stores indentation rules for every language. It is
+a list of
+</p>
+<div class="example">
+<pre class="example">(<var>language</var> . <var>rules</var>)
+</pre></div>
+
+<p>where <var>language</var> is a language symbol, and <var>rules</var> is a list
+of
+</p>
+<div class="example">
+<pre class="example">(<var>matcher</var> <var>anchor</var> <var>offset</var>)
+</pre></div>
+
+<p>First Emacs passes the node at point to <var>matcher</var>, if it return
+non-nil, this rule applies.  Then Emacs passes the node to
+<var>anchor</var>, it returns a point.  Emacs takes the column number of
+that point, add <var>offset</var> to it, and the result is the indent for
+the current line.
+</p>
+<p>The <var>matcher</var> and <var>anchor</var> are functions, and Emacs provides
+convenient presets for them.  You can skip over to
+<code>treesit-simple-indent-presets</code> below, those presets should be
+more than enough.
+</p>
+<p>A <var>matcher</var> or an <var>anchor</var> is a function that takes three
+arguments (<var>node</var> <var>parent</var> <var>bol</var>).  Argument <var>bol</var> is
+the point at where we are indenting: the position of the first
+non-whitespace character from the beginning of line; <var>node</var> is the
+largest (highest-in-tree) node that starts at that point; <var>parent</var>
+is the parent of <var>node</var>.  A <var>matcher</var> returns nil/non-nil, and
+<var>anchor</var> returns a point.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dsimple_002dindent_002dpresets"><span class="category">Variable: </span><span><strong>treesit-simple-indent-presets</strong><a href='#index-treesit_002dsimple_002dindent_002dpresets' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This is a list of presets for <var>matcher</var>s and <var>anchor</var>s in
+<code>treesit-simple-indent-rules</code>.  Each of them represent a function
+that takes <var>node</var>, <var>parent</var> and <var>bol</var> as arguments.
+</p>
+<div class="example">
+<pre class="example">no-node
+</pre></div>
+
+<p>This matcher matches the case where <var>node</var> is nil, i.e., there is
+no node that starts at <var>bol</var>.  This is the case when <var>bol</var> is
+at an empty line or inside a multi-line string, etc.
+</p>
+<div class="example">
+<pre class="example">(parent-is <var>type</var>)
+</pre></div>
+
+<p>This matcher matches if <var>parent</var>&rsquo;s type is <var>type</var>.
+</p>
+<div class="example">
+<pre class="example">(node-is <var>type</var>)
+</pre></div>
+
+<p>This matcher matches if <var>node</var>&rsquo;s type is <var>type</var>.
+</p>
+<div class="example">
+<pre class="example">(query <var>query</var>)
+</pre></div>
+
+<p>This matcher matches if querying <var>parent</var> with <var>query</var>
+captures <var>node</var>.  The capture name does not matter.
+</p>
+<div class="example">
+<pre class="example">(match <var>node-type</var> <var>parent-type</var>
+       <var>node-field</var> <var>node-index-min</var> <var>node-index-max</var>)
+</pre></div>
+
+<p>This matcher checks if <var>node</var>&rsquo;s type is <var>node-type</var>,
+<var>parent</var>&rsquo;s type is <var>parent-type</var>, <var>node</var>&rsquo;s field name in
+<var>parent</var> is <var>node-field</var>, and <var>node</var>&rsquo;s index among its
+siblings is between <var>node-index-min</var> and <var>node-index-max</var>.  If
+the value of a constraint is nil, this matcher doesn&rsquo;t check for that
+constraint.  For example, to match the first child where parent is
+<code>argument_list</code>, use
+</p>
+<div class="example">
+<pre class="example">(match nil &quot;argument_list&quot; nil nil 0 0)
+</pre></div>
+
+<div class="example">
+<pre class="example">first-sibling
+</pre></div>
+
+<p>This anchor returns the start of the first child of <var>parent</var>.
+</p>
+<div class="example">
+<pre class="example">parent
+</pre></div>
+
+<p>This anchor returns the start of <var>parent</var>.
+</p>
+<div class="example">
+<pre class="example">parent-bol
+</pre></div>
+
+<p>This anchor returns the beginning of non-space characters on the line
+where <var>parent</var> is on.
+</p>
+<div class="example">
+<pre class="example">prev-sibling
+</pre></div>
+
+<p>This anchor returns the start of the previous sibling of <var>node</var>.
+</p>
+<div class="example">
+<pre class="example">no-indent
+</pre></div>
+
+<p>This anchor returns the start of <var>node</var>, i.e., no indent.
+</p>
+<div class="example">
+<pre class="example">prev-line
+</pre></div>
+
+<p>This anchor returns the first non-whitespace charater on the previous
+line.
+</p></dd></dl>
+
+<span id="Indentation-utilities"></span><h3 class="heading">Indentation utilities</h3>
+
+<p>Here are some utility functions that can help writing indentation
+rules.
+</p>
+<dl class="def">
+<dt id="index-treesit_002dcheck_002dindent"><span class="category">Function: </span><span><strong>treesit-check-indent</strong> <em>mode</em><a href='#index-treesit_002dcheck_002dindent' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function checks current buffer&rsquo;s indentation against major mode
+<var>mode</var>.  It indents the current buffer in <var>mode</var> and compares
+the indentation with the current indentation.  Then it pops up a diff
+buffer showing the difference.  Correct indentation (target) is in
+green, current indentation is in red.
+</p></dd></dl>
+
+<p>It is also helpful to use <code>treesit-inspect-mode</code> when writing
+indentation rules.
+</p>
+</div>
+<hr>
+<div class="header">
+<p>
+Previous: <a href="SMIE.html">Simple Minded Indentation Engine</a>, Up: <a href="Auto_002dIndentation.html">Automatic Indentation of code</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+
+
+
+</body>
+</html>
diff --git a/admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html b/admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html
new file mode 100644
index 0000000000..7b6e51468a
--- /dev/null
+++ b/admin/notes/tree-sitter/html-manual/Parsing-Program-Source.html
@@ -0,0 +1,125 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- Created by GNU Texinfo 6.8, https://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<!-- This is the GNU Emacs Lisp Reference Manual
+corresponding to Emacs version 29.0.50.
+
+Copyright © 1990-1996, 1998-2022 Free Software Foundation,
+Inc.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being "GNU General Public License," with the
+Front-Cover Texts being "A GNU Manual," and with the Back-Cover
+Texts as in (a) below.  A copy of the license is included in the
+section entitled "GNU Free Documentation License."
+
+(a) The FSF's Back-Cover Text is: "You have the freedom to copy and
+modify this GNU manual.  Buying copies from the FSF supports it in
+developing GNU and promoting software freedom." -->
+<title>Parsing Program Source (GNU Emacs Lisp Reference Manual)</title>
+
+<meta name="description" content="Parsing Program Source (GNU Emacs Lisp Reference Manual)">
+<meta name="keywords" content="Parsing Program Source (GNU Emacs Lisp Reference Manual)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="makeinfo">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="index.html" rel="start" title="Top">
+<link href="Index.html" rel="index" title="Index">
+<link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
+<link href="index.html" rel="up" title="Top">
+<link href="Abbrevs.html" rel="next" title="Abbrevs">
+<link href="Syntax-Tables.html" rel="prev" title="Syntax Tables">
+<style type="text/css">
+<!--
+a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+span:hover a.copiable-anchor {visibility: visible}
+ul.no-bullet {list-style: none}
+-->
+</style>
+<link rel="stylesheet" type="text/css" href="./manual.css">
+
+
+</head>
+
+<body lang="en">
+<div class="chapter" id="Parsing-Program-Source">
+<div class="header">
+<p>
+Next: <a href="Abbrevs.html" accesskey="n" rel="next">Abbrevs and Abbrev Expansion</a>, Previous: <a href="Syntax-Tables.html" accesskey="p" rel="prev">Syntax Tables</a>, Up: <a href="index.html" accesskey="u" rel="up">Emacs Lisp</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+<hr>
+<span id="Parsing-Program-Source-1"></span><h2 class="chapter">37 Parsing Program Source</h2>
+
+<p>Emacs provides various ways to parse program source text and produce a
+<em>syntax tree</em>.  In a syntax tree, text is no longer a
+one-dimensional stream but a structured tree of nodes, where each node
+representing a piece of text.  Thus a syntax tree can enable
+interesting features like precise fontification, indentation,
+navigation, structured editing, etc.
+</p>
+<p>Emacs has a simple facility for parsing balanced expressions
+(see <a href="Parsing-Expressions.html">Parsing Expressions</a>).  There is also SMIE library for generic
+navigation and indentation (see <a href="SMIE.html">Simple Minded Indentation Engine</a>).
+</p>
+<p>Emacs also provides integration with tree-sitter library
+(<a href="https://tree-sitter.github.io/tree-sitter">https://tree-sitter.github.io/tree-sitter</a>) if compiled with
+it.  The tree-sitter library implements an incremental parser and has
+support from a wide range of programming languages.
+</p>
+<dl class="def">
+<dt id="index-treesit_002davailable_002dp"><span class="category">Function: </span><span><strong>treesit-available-p</strong><a href='#index-treesit_002davailable_002dp' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function returns non-nil if tree-sitter features are available
+for this Emacs instance.
+</p></dd></dl>
+
+<p>For tree-sitter integration with existing Emacs features,
+see <a href="Parser_002dbased-Font-Lock.html">Parser-based Font Lock</a>, <a href="Parser_002dbased-Indentation.html">Parser-based Indentation</a>, and
+<a href="List-Motion.html">Moving over Balanced Expressions</a>.
+</p>
+<p>To access the syntax tree of the text in a buffer, we need to first
+load a language definition and create a parser with it.  Next, we can
+query the parser for specific nodes in the syntax tree.  Then, we can
+access various information about the node, and we can pattern-match a
+node with a powerful syntax.  Finally, we explain how to work with
+source files that mixes multiple languages.  The following sections
+explain how to do each of the tasks in detail.
+</p>
+
+<ul class="section-toc">
+<li><a href="Language-Definitions.html" accesskey="1">Tree-sitter Language Definitions</a></li>
+<li><a href="Using-Parser.html" accesskey="2">Using Tree-sitter Parser</a></li>
+<li><a href="Retrieving-Node.html" accesskey="3">Retrieving Node</a></li>
+<li><a href="Accessing-Node.html" accesskey="4">Accessing Node Information</a></li>
+<li><a href="Pattern-Matching.html" accesskey="5">Pattern Matching Tree-sitter Nodes</a></li>
+<li><a href="Multiple-Languages.html" accesskey="6">Parsing Text in Multiple Languages</a></li>
+<li><a href="Tree_002dsitter-C-API.html" accesskey="7">Tree-sitter C API Correspondence</a></li>
+</ul>
+</div>
+<hr>
+<div class="header">
+<p>
+Next: <a href="Abbrevs.html">Abbrevs and Abbrev Expansion</a>, Previous: <a href="Syntax-Tables.html">Syntax Tables</a>, Up: <a href="index.html">Emacs Lisp</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+
+
+
+</body>
+</html>
diff --git a/admin/notes/tree-sitter/html-manual/Pattern-Matching.html b/admin/notes/tree-sitter/html-manual/Pattern-Matching.html
new file mode 100644
index 0000000000..e14efe7162
--- /dev/null
+++ b/admin/notes/tree-sitter/html-manual/Pattern-Matching.html
@@ -0,0 +1,430 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- Created by GNU Texinfo 6.8, https://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<!-- This is the GNU Emacs Lisp Reference Manual
+corresponding to Emacs version 29.0.50.
+
+Copyright © 1990-1996, 1998-2022 Free Software Foundation,
+Inc.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being "GNU General Public License," with the
+Front-Cover Texts being "A GNU Manual," and with the Back-Cover
+Texts as in (a) below.  A copy of the license is included in the
+section entitled "GNU Free Documentation License."
+
+(a) The FSF's Back-Cover Text is: "You have the freedom to copy and
+modify this GNU manual.  Buying copies from the FSF supports it in
+developing GNU and promoting software freedom." -->
+<title>Pattern Matching (GNU Emacs Lisp Reference Manual)</title>
+
+<meta name="description" content="Pattern Matching (GNU Emacs Lisp Reference Manual)">
+<meta name="keywords" content="Pattern Matching (GNU Emacs Lisp Reference Manual)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="makeinfo">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="index.html" rel="start" title="Top">
+<link href="Index.html" rel="index" title="Index">
+<link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
+<link href="Parsing-Program-Source.html" rel="up" title="Parsing Program Source">
+<link href="Multiple-Languages.html" rel="next" title="Multiple Languages">
+<link href="Accessing-Node.html" rel="prev" title="Accessing Node">
+<style type="text/css">
+<!--
+a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+span:hover a.copiable-anchor {visibility: visible}
+ul.no-bullet {list-style: none}
+-->
+</style>
+<link rel="stylesheet" type="text/css" href="./manual.css">
+
+
+</head>
+
+<body lang="en">
+<div class="section" id="Pattern-Matching">
+<div class="header">
+<p>
+Next: <a href="Multiple-Languages.html" accesskey="n" rel="next">Parsing Text in Multiple Languages</a>, Previous: <a href="Accessing-Node.html" accesskey="p" rel="prev">Accessing Node Information</a>, Up: <a href="Parsing-Program-Source.html" accesskey="u" rel="up">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+<hr>
+<span id="Pattern-Matching-Tree_002dsitter-Nodes"></span><h3 class="section">37.5 Pattern Matching Tree-sitter Nodes</h3>
+
+<p>Tree-sitter let us pattern match with a small declarative language.
+Pattern matching consists of two steps: first tree-sitter matches a
+<em>pattern</em> against nodes in the syntax tree, then it <em>captures</em>
+specific nodes in that pattern and returns the captured nodes.
+</p>
+<p>We describe first how to write the most basic query pattern and how to
+capture nodes in a pattern, then the pattern-match function, finally
+more advanced pattern syntax.
+</p>
+<span id="Basic-query-syntax"></span><h3 class="heading">Basic query syntax</h3>
+
+<span id="index-Tree_002dsitter-query-syntax"></span>
+<span id="index-Tree_002dsitter-query-pattern"></span>
+<p>A <em>query</em> consists of multiple <em>patterns</em>.  Each pattern is an
+s-expression that matches a certain node in the syntax node.  A
+pattern has the following shape:
+</p>
+<div class="example">
+<pre class="example">(<var>type</var> <var>child</var>...)
+</pre></div>
+
+<p>For example, a pattern that matches a <code>binary_expression</code> node that
+contains <code>number_literal</code> child nodes would look like
+</p>
+<div class="example">
+<pre class="example">(binary_expression (number_literal))
+</pre></div>
+
+<p>To <em>capture</em> a node in the query pattern above, append
+<code>@capture-name</code> after the node pattern you want to capture.  For
+example,
+</p>
+<div class="example">
+<pre class="example">(binary_expression (number_literal) @number-in-exp)
+</pre></div>
+
+<p>captures <code>number_literal</code> nodes that are inside a
+<code>binary_expression</code> node with capture name <code>number-in-exp</code>.
+</p>
+<p>We can capture the <code>binary_expression</code> node too, with capture
+name <code>biexp</code>:
+</p>
+<div class="example">
+<pre class="example">(binary_expression
+ (number_literal) @number-in-exp) @biexp
+</pre></div>
+
+<span id="Query-function"></span><h3 class="heading">Query function</h3>
+
+<p>Now we can introduce the query functions.
+</p>
+<dl class="def">
+<dt id="index-treesit_002dquery_002dcapture"><span class="category">Function: </span><span><strong>treesit-query-capture</strong> <em>node query &amp;optional beg end node-only</em><a href='#index-treesit_002dquery_002dcapture' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function matches patterns in <var>query</var> in <var>node</var>.
+Parameter <var>query</var> can be either a string, a s-expression, or a
+compiled query object.  For now, we focus on the string syntax;
+s-expression syntax and compiled query are described at the end of the
+section.
+</p>
+<p>Parameter <var>node</var> can also be a parser or a language symbol.  A
+parser means using its root node, a language symbol means find or
+create a parser for that language in the current buffer, and use the
+root node.
+</p>
+<p>The function returns all captured nodes in a list of
+<code>(<var>capture_name</var> . <var>node</var>)</code>.  If <var>node-only</var> is
+non-nil, a list of node is returned instead.  If <var>beg</var> and
+<var>end</var> are both non-nil, this function only pattern matches nodes
+in that range.
+</p>
+<span id="index-treesit_002dquery_002derror"></span>
+<p>This function raise a <var>treesit-query-error</var> if <var>query</var> is
+malformed.  The signal data contains a description of the specific
+error.  You can use <code>treesit-query-validate</code> to debug the query.
+</p></dd></dl>
+
+<p>For example, suppose <var>node</var>&rsquo;s content is <code>1 + 2</code>, and
+<var>query</var> is
+</p>
+<div class="example">
+<pre class="example">(setq query
+      &quot;(binary_expression
+        (number_literal) @number-in-exp) @biexp&quot;)
+</pre></div>
+
+<p>Querying that query would return
+</p>
+<div class="example">
+<pre class="example">(treesit-query-capture node query)
+    &rArr; ((biexp . <var>&lt;node for &quot;1 + 2&quot;&gt;</var>)
+       (number-in-exp . <var>&lt;node for &quot;1&quot;&gt;</var>)
+       (number-in-exp . <var>&lt;node for &quot;2&quot;&gt;</var>))
+</pre></div>
+
+<p>As we mentioned earlier, a <var>query</var> could contain multiple
+patterns. For example, it could have two top-level patterns:
+</p>
+<div class="example">
+<pre class="example">(setq query
+      &quot;(binary_expression) @biexp
+       (number_literal)  @number @biexp&quot;)
+</pre></div>
+
+<dl class="def">
+<dt id="index-treesit_002dquery_002dstring"><span class="category">Function: </span><span><strong>treesit-query-string</strong> <em>string query language</em><a href='#index-treesit_002dquery_002dstring' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function parses <var>string</var> with <var>language</var>, pattern matches
+its root node with <var>query</var>, and returns the result.
+</p></dd></dl>
+
+<span id="More-query-syntax"></span><h3 class="heading">More query syntax</h3>
+
+<p>Besides node type and capture, tree-sitter&rsquo;s query syntax can express
+anonymous node, field name, wildcard, quantification, grouping,
+alternation, anchor, and predicate.
+</p>
+<span id="Anonymous-node"></span><h4 class="subheading">Anonymous node</h4>
+
+<p>An anonymous node is written verbatim, surrounded by quotes.  A
+pattern matching (and capturing) keyword <code>return</code> would be
+</p>
+<div class="example">
+<pre class="example">&quot;return&quot; @keyword
+</pre></div>
+
+<span id="Wild-card"></span><h4 class="subheading">Wild card</h4>
+
+<p>In a query pattern, &lsquo;<samp>(_)</samp>&rsquo; matches any named node, and &lsquo;<samp>_</samp>&rsquo;
+matches any named and anonymous node.  For example, to capture any
+named child of a <code>binary_expression</code> node, the pattern would be
+</p>
+<div class="example">
+<pre class="example">(binary_expression (_) @in_biexp)
+</pre></div>
+
+<span id="Field-name"></span><h4 class="subheading">Field name</h4>
+
+<p>We can capture child nodes that has specific field names:
+</p>
+<div class="example">
+<pre class="example">(function_definition
+  declarator: (_) @func-declarator
+  body: (_) @func-body)
+</pre></div>
+
+<p>We can also capture a node that doesn&rsquo;t have certain field, say, a
+<code>function_definition</code> without a <code>body</code> field.
+</p>
+<div class="example">
+<pre class="example">(function_definition !body) @func-no-body
+</pre></div>
+
+<span id="Quantify-node"></span><h4 class="subheading">Quantify node</h4>
+
+<p>Tree-sitter recognizes quantification operators &lsquo;<samp>*</samp>&rsquo;, &lsquo;<samp>+</samp>&rsquo; and
+&lsquo;<samp>?</samp>&rsquo;.  Their meanings are the same as in regular expressions:
+&lsquo;<samp>*</samp>&rsquo; matches the preceding pattern zero or more times, &lsquo;<samp>+</samp>&rsquo;
+matches one or more times, and &lsquo;<samp>?</samp>&rsquo; matches zero or one time.
+</p>
+<p>For example, this pattern matches <code>type_declaration</code> nodes
+that has <em>zero or more</em> <code>long</code> keyword.
+</p>
+<div class="example">
+<pre class="example">(type_declaration &quot;long&quot;*) @long-type
+</pre></div>
+
+<p>And this pattern matches a type declaration that has zero or one
+<code>long</code> keyword:
+</p>
+<div class="example">
+<pre class="example">(type_declaration &quot;long&quot;?) @long-type
+</pre></div>
+
+<span id="Grouping"></span><h4 class="subheading">Grouping</h4>
+
+<p>Similar to groups in regular expression, we can bundle patterns into a
+group and apply quantification operators to it.  For example, to
+express a comma separated list of identifiers, one could write
+</p>
+<div class="example">
+<pre class="example">(identifier) (&quot;,&quot; (identifier))*
+</pre></div>
+
+<span id="Alternation"></span><h4 class="subheading">Alternation</h4>
+
+<p>Again, similar to regular expressions, we can express &ldquo;match anyone
+from this group of patterns&rdquo; in the query pattern.  The syntax is a
+list of patterns enclosed in square brackets.  For example, to capture
+some keywords in C, the query pattern would be
+</p>
+<div class="example">
+<pre class="example">[
+  &quot;return&quot;
+  &quot;break&quot;
+  &quot;if&quot;
+  &quot;else&quot;
+] @keyword
+</pre></div>
+
+<span id="Anchor"></span><h4 class="subheading">Anchor</h4>
+
+<p>The anchor operator &lsquo;<samp>.</samp>&rsquo; can be used to enforce juxtaposition,
+i.e., to enforce two things to be directly next to each other.  The
+two &ldquo;things&rdquo; can be two nodes, or a child and the end of its parent.
+For example, to capture the first child, the last child, or two
+adjacent children:
+</p>
+<div class="example">
+<pre class="example">;; Anchor the child with the end of its parent.
+(compound_expression (_) @last-child .)
+
+;; Anchor the child with the beginning of its parent.
+(compound_expression . (_) @first-child)
+
+;; Anchor two adjacent children.
+(compound_expression
+ (_) @prev-child
+ .
+ (_) @next-child)
+</pre></div>
+
+<p>Note that the enforcement of juxtaposition ignores any anonymous
+nodes.
+</p>
+<span id="Predicate"></span><h4 class="subheading">Predicate</h4>
+
+<p>We can add predicate constraints to a pattern.  For example, if we use
+the following query pattern
+</p>
+<div class="example">
+<pre class="example">(
+ (array . (_) @first (_) @last .)
+ (#equal @first @last)
+)
+</pre></div>
+
+<p>Then tree-sitter only matches arrays where the first element equals to
+the last element.  To attach a predicate to a pattern, we need to
+group then together.  A predicate always starts with a &lsquo;<samp>#</samp>&rsquo;.
+Currently there are two predicates, <code>#equal</code> and <code>#match</code>.
+</p>
+<dl class="def">
+<dt id="index-equal-1"><span class="category">Predicate: </span><span><strong>equal</strong> <em>arg1 arg2</em><a href='#index-equal-1' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>Matches if <var>arg1</var> equals to <var>arg2</var>.  Arguments can be either a
+string or a capture name.  Capture names represent the text that the
+captured node spans in the buffer.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-match"><span class="category">Predicate: </span><span><strong>match</strong> <em>regexp capture-name</em><a href='#index-match' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>Matches if the text that <var>capture-name</var>’s node spans in the buffer
+matches regular expression <var>regexp</var>.  Matching is case-sensitive.
+</p></dd></dl>
+
+<p>Note that a predicate can only refer to capture names appeared in the
+same pattern.  Indeed, it makes little sense to refer to capture names
+in other patterns anyway.
+</p>
+<span id="S_002dexpression-patterns"></span><h3 class="heading">S-expression patterns</h3>
+
+<p>Besides strings, Emacs provides a s-expression based syntax for query
+patterns. It largely resembles the string-based syntax.  For example,
+the following pattern
+</p>
+<div class="example">
+<pre class="example">(treesit-query-capture
+ node &quot;(addition_expression
+        left: (_) @left
+        \&quot;+\&quot; @plus-sign
+        right: (_) @right) @addition
+
+        [\&quot;return\&quot; \&quot;break\&quot;] @keyword&quot;)
+</pre></div>
+
+<p>is equivalent to
+</p>
+<div class="example">
+<pre class="example">(treesit-query-capture
+ node '((addition_expression
+         left: (_) @left
+         &quot;+&quot; @plus-sign
+         right: (_) @right) @addition
+
+         [&quot;return&quot; &quot;break&quot;] @keyword))
+</pre></div>
+
+<p>Most pattern syntax can be written directly as strange but
+never-the-less valid s-expressions.  Only a few of them needs
+modification:
+</p>
+<ul>
+<li> Anchor &lsquo;<samp>.</samp>&rsquo; is written as <code>:anchor</code>.
+</li><li> &lsquo;<samp>?</samp>&rsquo; is written as &lsquo;<samp>:?</samp>&rsquo;.
+</li><li> &lsquo;<samp>*</samp>&rsquo; is written as &lsquo;<samp>:*</samp>&rsquo;.
+</li><li> &lsquo;<samp>+</samp>&rsquo; is written as &lsquo;<samp>:+</samp>&rsquo;.
+</li><li> <code>#equal</code> is written as <code>:equal</code>.  In general, predicates
+change their &lsquo;<samp>#</samp>&rsquo; to &lsquo;<samp>:</samp>&rsquo;.
+</li></ul>
+
+<p>For example,
+</p>
+<div class="example">
+<pre class="example">&quot;(
+  (compound_expression . (_) @first (_)* @rest)
+  (#match \&quot;love\&quot; @first)
+  )&quot;
+</pre></div>
+
+<p>is written in s-expression as
+</p>
+<div class="example">
+<pre class="example">'((
+   (compound_expression :anchor (_) @first (_) :* @rest)
+   (:match &quot;love&quot; @first)
+   ))
+</pre></div>
+
+<span id="Compiling-queries"></span><h3 class="heading">Compiling queries</h3>
+
+<p>If a query will be used repeatedly, especially in tight loops, it is
+important to compile that query, because a compiled query is much
+faster than an uncompiled one.  A compiled query can be used anywhere
+a query is accepted.
+</p>
+<dl class="def">
+<dt id="index-treesit_002dquery_002dcompile"><span class="category">Function: </span><span><strong>treesit-query-compile</strong> <em>language query</em><a href='#index-treesit_002dquery_002dcompile' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function compiles <var>query</var> for <var>language</var> into a compiled
+query object and returns it.
+</p>
+<p>This function raise a <var>treesit-query-error</var> if <var>query</var> is
+malformed.  The signal data contains a description of the specific
+error.  You can use <code>treesit-query-validate</code> to debug the query.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dquery_002dexpand"><span class="category">Function: </span><span><strong>treesit-query-expand</strong> <em>query</em><a href='#index-treesit_002dquery_002dexpand' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function expands the s-expression <var>query</var> into a string
+query.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dpattern_002dexpand"><span class="category">Function: </span><span><strong>treesit-pattern-expand</strong> <em>pattern</em><a href='#index-treesit_002dpattern_002dexpand' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function expands the s-expression <var>pattern</var> into a string
+pattern.
+</p></dd></dl>
+
+<p>Finally, tree-sitter project&rsquo;s documentation about
+pattern-matching can be found at
+<a href="https://tree-sitter.github.io/tree-sitter/using-parsers#pattern-matching-with-queries">https://tree-sitter.github.io/tree-sitter/using-parsers#pattern-matching-with-queries</a>.
+</p>
+</div>
+<hr>
+<div class="header">
+<p>
+Next: <a href="Multiple-Languages.html">Parsing Text in Multiple Languages</a>, Previous: <a href="Accessing-Node.html">Accessing Node Information</a>, Up: <a href="Parsing-Program-Source.html">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+
+
+
+</body>
+</html>
diff --git a/admin/notes/tree-sitter/html-manual/Retrieving-Node.html b/admin/notes/tree-sitter/html-manual/Retrieving-Node.html
new file mode 100644
index 0000000000..1bea0dde76
--- /dev/null
+++ b/admin/notes/tree-sitter/html-manual/Retrieving-Node.html
@@ -0,0 +1,362 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- Created by GNU Texinfo 6.8, https://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<!-- This is the GNU Emacs Lisp Reference Manual
+corresponding to Emacs version 29.0.50.
+
+Copyright © 1990-1996, 1998-2022 Free Software Foundation,
+Inc.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being "GNU General Public License," with the
+Front-Cover Texts being "A GNU Manual," and with the Back-Cover
+Texts as in (a) below.  A copy of the license is included in the
+section entitled "GNU Free Documentation License."
+
+(a) The FSF's Back-Cover Text is: "You have the freedom to copy and
+modify this GNU manual.  Buying copies from the FSF supports it in
+developing GNU and promoting software freedom." -->
+<title>Retrieving Node (GNU Emacs Lisp Reference Manual)</title>
+
+<meta name="description" content="Retrieving Node (GNU Emacs Lisp Reference Manual)">
+<meta name="keywords" content="Retrieving Node (GNU Emacs Lisp Reference Manual)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="makeinfo">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="index.html" rel="start" title="Top">
+<link href="Index.html" rel="index" title="Index">
+<link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
+<link href="Parsing-Program-Source.html" rel="up" title="Parsing Program Source">
+<link href="Accessing-Node.html" rel="next" title="Accessing Node">
+<link href="Using-Parser.html" rel="prev" title="Using Parser">
+<style type="text/css">
+<!--
+a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+span:hover a.copiable-anchor {visibility: visible}
+ul.no-bullet {list-style: none}
+-->
+</style>
+<link rel="stylesheet" type="text/css" href="./manual.css">
+
+
+</head>
+
+<body lang="en">
+<div class="section" id="Retrieving-Node">
+<div class="header">
+<p>
+Next: <a href="Accessing-Node.html" accesskey="n" rel="next">Accessing Node Information</a>, Previous: <a href="Using-Parser.html" accesskey="p" rel="prev">Using Tree-sitter Parser</a>, Up: <a href="Parsing-Program-Source.html" accesskey="u" rel="up">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+<hr>
+<span id="Retrieving-Node-1"></span><h3 class="section">37.3 Retrieving Node</h3>
+
+<span id="index-tree_002dsitter-find-node"></span>
+<span id="index-tree_002dsitter-get-node"></span>
+<p>Before we continue, lets go over some conventions of tree-sitter
+functions.
+</p>
+<p>We talk about a node being &ldquo;smaller&rdquo; or &ldquo;larger&rdquo;, and &ldquo;lower&rdquo; or
+&ldquo;higher&rdquo;.  A smaller and lower node is lower in the syntax tree and
+therefore spans a smaller piece of text; a larger and higher node is
+higher up in the syntax tree, containing many smaller nodes as its
+children, and therefore spans a larger piece of text.
+</p>
+<p>When a function cannot find a node, it returns nil.  And for the
+convenience for function chaining, all the functions that take a node
+as argument and returns a node accept the node to be nil; in that
+case, the function just returns nil.
+</p>
+<span id="index-treesit_002dnode_002doutdated"></span>
+<p>Nodes are not automatically updated when the associated buffer is
+modified.  And there is no way to update a node once it is retrieved.
+Using an outdated node throws <code>treesit-node-outdated</code> error.
+</p>
+<span id="Retrieving-node-from-syntax-tree"></span><h3 class="heading">Retrieving node from syntax tree</h3>
+
+<dl class="def">
+<dt id="index-treesit_002dnode_002dat"><span class="category">Function: </span><span><strong>treesit-node-at</strong> <em>beg end &amp;optional parser-or-lang named</em><a href='#index-treesit_002dnode_002dat' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function returns the <em>smallest</em> node that starts at or after
+the <var>point</var>.  In other words, the start of the node is equal or
+greater than <var>point</var>.
+</p>
+<p>When <var>parser-or-lang</var> is nil, this function uses the first parser
+in <code>(treesit-parser-list)</code> in the current buffer.  If
+<var>parser-or-lang</var> is a parser object, it use that parser; if
+<var>parser-or-lang</var> is a language, it finds the first parser using
+that language in <code>(treesit-parser-list)</code> and use that.
+</p>
+<p>If <var>named</var> is non-nil, this function looks for a named node
+only (see <a href="Language-Definitions.html#tree_002dsitter-named-node">named node</a>).
+</p>
+<p>Example:
+</p><div class="example">
+<pre class="example">;; Find the node at point in a C parser's syntax tree.
+(treesit-node-at (point) 'c)
+    </pre></div>
+</dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dnode_002don"><span class="category">Function: </span><span><strong>treesit-node-on</strong> <em>beg end &amp;optional parser-or-lang named</em><a href='#index-treesit_002dnode_002don' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function returns the <em>smallest</em> node that covers the span
+from <var>beg</var> to <var>end</var>.  In other words, the start of the node is
+less or equal to <var>beg</var>, and the end of the node is greater or
+equal to <var>end</var>.
+</p>
+<p><em>Beware</em> that calling this function on an empty line that is not
+inside any top-level construct (function definition, etc) most
+probably will give you the root node, because the root node is the
+smallest node that covers that empty line.  Most of the time, you want
+to use <code>treesit-node-at</code>.
+</p>
+<p>When <var>parser-or-lang</var> is nil, this function uses the first parser
+in <code>(treesit-parser-list)</code> in the current buffer.  If
+<var>parser-or-lang</var> is a parser object, it use that parser; if
+<var>parser-or-lang</var> is a language, it finds the first parser using
+that language in <code>(treesit-parser-list)</code> and use that.
+</p>
+<p>If <var>named</var> is non-nil, this function looks for a named node only
+(see <a href="Language-Definitions.html#tree_002dsitter-named-node">named node</a>).
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dparser_002droot_002dnode"><span class="category">Function: </span><span><strong>treesit-parser-root-node</strong> <em>parser</em><a href='#index-treesit_002dparser_002droot_002dnode' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function returns the root node of the syntax tree generated by
+<var>parser</var>.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dbuffer_002droot_002dnode"><span class="category">Function: </span><span><strong>treesit-buffer-root-node</strong> <em>&amp;optional language</em><a href='#index-treesit_002dbuffer_002droot_002dnode' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function finds the first parser that uses <var>language</var> in
+<code>(treesit-parser-list)</code> in the current buffer, and returns the
+root node of that buffer.  If it cannot find an appropriate parser,
+nil is returned.
+</p></dd></dl>
+
+<p>Once we have a node, we can retrieve other nodes from it, or query for
+information about this node.
+</p>
+<span id="Retrieving-node-from-other-nodes"></span><h3 class="heading">Retrieving node from other nodes</h3>
+
+<span id="By-kinship"></span><h4 class="subheading">By kinship</h4>
+
+<dl class="def">
+<dt id="index-treesit_002dnode_002dparent"><span class="category">Function: </span><span><strong>treesit-node-parent</strong> <em>node</em><a href='#index-treesit_002dnode_002dparent' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function returns the immediate parent of <var>node</var>.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dnode_002dchild"><span class="category">Function: </span><span><strong>treesit-node-child</strong> <em>node n &amp;optional named</em><a href='#index-treesit_002dnode_002dchild' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function returns the <var>n</var>&rsquo;th child of <var>node</var>.  If
+<var>named</var> is non-nil, then it only counts named nodes
+(see <a href="Language-Definitions.html#tree_002dsitter-named-node">named node</a>).  For example, in a node
+that represents a string: <code>&quot;text&quot;</code>, there are three children
+nodes: the opening quote <code>&quot;</code>, the string content <code>text</code>, and
+the enclosing quote <code>&quot;</code>.  Among these nodes, the first child is
+the opening quote <code>&quot;</code>, the first named child is the string
+content <code>text</code>.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dnode_002dchildren"><span class="category">Function: </span><span><strong>treesit-node-children</strong> <em>node &amp;optional named</em><a href='#index-treesit_002dnode_002dchildren' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function returns all of <var>node</var>&rsquo;s children in a list.  If
+<var>named</var> is non-nil, then it only retrieves named nodes.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dnext_002dsibling"><span class="category">Function: </span><span><strong>treesit-next-sibling</strong> <em>node &amp;optional named</em><a href='#index-treesit_002dnext_002dsibling' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function finds the next sibling of <var>node</var>.  If <var>named</var> is
+non-nil, it finds the next named sibling.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dprev_002dsibling"><span class="category">Function: </span><span><strong>treesit-prev-sibling</strong> <em>node &amp;optional named</em><a href='#index-treesit_002dprev_002dsibling' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function finds the previous sibling of <var>node</var>.  If
+<var>named</var> is non-nil, it finds the previous named sibling.
+</p></dd></dl>
+
+<span id="By-field-name"></span><h4 class="subheading">By field name</h4>
+
+<p>To make the syntax tree easier to analyze, many language definitions
+assign <em>field names</em> to child nodes (see <a href="Language-Definitions.html#tree_002dsitter-node-field-name">field name</a>).  For example, a <code>function_definition</code> node
+could have a <code>declarator</code> and a <code>body</code>.
+</p>
+<dl class="def">
+<dt id="index-treesit_002dchild_002dby_002dfield_002dname"><span class="category">Function: </span><span><strong>treesit-child-by-field-name</strong> <em>node field-name</em><a href='#index-treesit_002dchild_002dby_002dfield_002dname' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function finds the child of <var>node</var> that has <var>field-name</var>
+as its field name.
+</p>
+<div class="example">
+<pre class="example">;; Get the child that has &quot;body&quot; as its field name.
+(treesit-child-by-field-name node &quot;body&quot;)
+    </pre></div>
+</dd></dl>
+
+<span id="By-position"></span><h4 class="subheading">By position</h4>
+
+<dl class="def">
+<dt id="index-treesit_002dfirst_002dchild_002dfor_002dpos"><span class="category">Function: </span><span><strong>treesit-first-child-for-pos</strong> <em>node pos &amp;optional named</em><a href='#index-treesit_002dfirst_002dchild_002dfor_002dpos' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function finds the first child of <var>node</var> that extends beyond
+<var>pos</var>.  &ldquo;Extend beyond&rdquo; means the end of the child node &gt;=
+<var>pos</var>.  This function only looks for immediate children of
+<var>node</var>, and doesn&rsquo;t look in its grand children.  If <var>named</var> is
+non-nil, it only looks for named child (see <a href="Language-Definitions.html#tree_002dsitter-named-node">named node</a>).
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dnode_002ddescendant_002dfor_002drange"><span class="category">Function: </span><span><strong>treesit-node-descendant-for-range</strong> <em>node beg end &amp;optional named</em><a href='#index-treesit_002dnode_002ddescendant_002dfor_002drange' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function finds the <em>smallest</em> child/grandchild... of
+<var>node</var> that spans the range from <var>beg</var> to <var>end</var>.  It is
+similar to <code>treesit-node-at</code>.  If <var>named</var> is non-nil, it only
+looks for named child.
+</p></dd></dl>
+
+<span id="Searching-for-node"></span><h3 class="heading">Searching for node</h3>
+
+<dl class="def">
+<dt id="index-treesit_002dsearch_002dsubtree"><span class="category">Function: </span><span><strong>treesit-search-subtree</strong> <em>node predicate &amp;optional all backward limit</em><a href='#index-treesit_002dsearch_002dsubtree' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function traverses the subtree of <var>node</var> (including
+<var>node</var>), and match <var>predicate</var> with each node along the way.
+And <var>predicate</var> is a regexp that matches (case-insensitively)
+against each node&rsquo;s type, or a function that takes a node and returns
+nil/non-nil.  If a node matches, that node is returned, if no node
+ever matches, nil is returned.
+</p>
+<p>By default, this function only traverses named nodes, if <var>all</var> is
+non-nil, it traverses all nodes.  If <var>backward</var> is non-nil, it
+traverses backwards.  If <var>limit</var> is non-nil, it only traverses
+that number of levels down in the tree.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dsearch_002dforward"><span class="category">Function: </span><span><strong>treesit-search-forward</strong> <em>start predicate &amp;optional all backward up</em><a href='#index-treesit_002dsearch_002dforward' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function is somewhat similar to <code>treesit-search-subtree</code>.
+It also traverse the parse tree and match each node with
+<var>predicate</var> (except for <var>start</var>), where <var>predicate</var> can be
+a (case-insensitive) regexp or a function.  For a tree like the below
+where <var>start</var> is marked 1, this function traverses as numbered:
+</p>
+<div class="example">
+<pre class="example">              o
+              |
+     3--------4-----------8
+     |        |           |
+o--o-+--1  5--+--6    9---+-----12
+|  |    |        |    |         |
+o  o    2        7  +-+-+    +--+--+
+                    |   |    |  |  |
+                    10  11   13 14 15
+</pre></div>
+
+<p>Same as in <code>treesit-search-subtree</code>, this function only searches
+for named nodes by default.  But if <var>all</var> is non-nil, it searches
+for all nodes.  If <var>backward</var> is non-nil, it searches backwards.
+</p>
+<p>If <var>up</var> is non-nil, this function will only traverse to siblings
+and parents.  In that case, only 1 3 4 8 would be traversed.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dsearch_002dforward_002dgoto"><span class="category">Function: </span><span><strong>treesit-search-forward-goto</strong> <em>predicate side &amp;optional all backward up</em><a href='#index-treesit_002dsearch_002dforward_002dgoto' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function jumps to the start or end of the next node in buffer
+that matches <var>predicate</var>.  Parameters <var>predicate</var>, <var>all</var>,
+<var>backward</var>, and <var>up</var> are the same as in
+<code>treesit-search-forward</code>.  And <var>side</var> controls which side of
+the matched no do we stop at, it can be <code>start</code> or <code>end</code>.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dinduce_002dsparse_002dtree"><span class="category">Function: </span><span><strong>treesit-induce-sparse-tree</strong> <em>root predicate &amp;optional process-fn limit</em><a href='#index-treesit_002dinduce_002dsparse_002dtree' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function creates a sparse tree from <var>root</var>&rsquo;s subtree.
+</p>
+<p>Basically, it takes the subtree under <var>root</var>, and combs it so only
+the nodes that match <var>predicate</var> are left, like picking out grapes
+on the vine.  Like previous functions, <var>predicate</var> can be a regexp
+string that matches against each node&rsquo;s type case-insensitively, or a
+function that takes a node and return nil/non-nil.
+</p>
+<p>For example, for a subtree on the left that consist of both numbers
+and letters, if <var>predicate</var> is &ldquo;letter only&rdquo;, the returned tree
+is the one on the right.
+</p>
+<div class="example">
+<pre class="example">    a                 a              a
+    |                 |              |
++---+---+         +---+---+      +---+---+
+|   |   |         |   |   |      |   |   |
+b   1   2         b   |   |      b   c   d
+    |   |     =&gt;      |   |  =&gt;      |
+    c   +--+          c   +          e
+    |   |  |          |   |
+ +--+   d  4       +--+   d
+ |  |              |
+ e  5              e
+</pre></div>
+
+<p>If <var>process-fn</var> is non-nil, instead of returning the matched
+nodes, this function passes each node to <var>process-fn</var> and uses the
+returned value instead.  If non-nil, <var>limit</var> is the number of
+levels to go down from <var>root</var>.
+</p>
+<p>Each node in the returned tree looks like <code>(<var>tree-sitter
+node</var> . (<var>child</var> ...))</code>.  The <var>tree-sitter node</var> of the root
+of this tree will be nil if <var>ROOT</var> doesn&rsquo;t match <var>pred</var>.  If
+no node matches <var>predicate</var>, return nil.
+</p></dd></dl>
+
+<span id="More-convenient-functions"></span><h3 class="heading">More convenient functions</h3>
+
+<dl class="def">
+<dt id="index-treesit_002dfilter_002dchild"><span class="category">Function: </span><span><strong>treesit-filter-child</strong> <em>node pred &amp;optional named</em><a href='#index-treesit_002dfilter_002dchild' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function finds immediate children of <var>node</var> that satisfies
+<var>pred</var>.
+</p>
+<p>Function <var>pred</var> takes the child node as the argument and should
+return non-nil to indicated keeping the child.  If <var>named</var>
+non-nil, this function only searches for named nodes.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dparent_002duntil"><span class="category">Function: </span><span><strong>treesit-parent-until</strong> <em>node pred</em><a href='#index-treesit_002dparent_002duntil' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function repeatedly finds the parent of <var>node</var>, and returns
+the parent if it satisfies <var>pred</var> (which takes the parent as the
+argument).  If no parent satisfies <var>pred</var>, this function returns
+nil.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dparent_002dwhile"><span class="category">Function: </span><span><strong>treesit-parent-while</strong><a href='#index-treesit_002dparent_002dwhile' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function repeatedly finds the parent of <var>node</var>, and keeps
+doing so as long as the parent satisfies <var>pred</var> (which takes the
+parent as the single argument).  I.e., this function returns the
+farthest parent that still satisfies <var>pred</var>.
+</p></dd></dl>
+
+</div>
+<hr>
+<div class="header">
+<p>
+Next: <a href="Accessing-Node.html">Accessing Node Information</a>, Previous: <a href="Using-Parser.html">Using Tree-sitter Parser</a>, Up: <a href="Parsing-Program-Source.html">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+
+
+
+</body>
+</html>
diff --git a/admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html b/admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html
new file mode 100644
index 0000000000..77cea6b3f9
--- /dev/null
+++ b/admin/notes/tree-sitter/html-manual/Tree_002dsitter-C-API.html
@@ -0,0 +1,212 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- Created by GNU Texinfo 6.8, https://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<!-- This is the GNU Emacs Lisp Reference Manual
+corresponding to Emacs version 29.0.50.
+
+Copyright © 1990-1996, 1998-2022 Free Software Foundation,
+Inc.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being "GNU General Public License," with the
+Front-Cover Texts being "A GNU Manual," and with the Back-Cover
+Texts as in (a) below.  A copy of the license is included in the
+section entitled "GNU Free Documentation License."
+
+(a) The FSF's Back-Cover Text is: "You have the freedom to copy and
+modify this GNU manual.  Buying copies from the FSF supports it in
+developing GNU and promoting software freedom." -->
+<title>Tree-sitter C API (GNU Emacs Lisp Reference Manual)</title>
+
+<meta name="description" content="Tree-sitter C API (GNU Emacs Lisp Reference Manual)">
+<meta name="keywords" content="Tree-sitter C API (GNU Emacs Lisp Reference Manual)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="makeinfo">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="index.html" rel="start" title="Top">
+<link href="Index.html" rel="index" title="Index">
+<link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
+<link href="Parsing-Program-Source.html" rel="up" title="Parsing Program Source">
+<link href="Multiple-Languages.html" rel="prev" title="Multiple Languages">
+<style type="text/css">
+<!--
+a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+span:hover a.copiable-anchor {visibility: visible}
+ul.no-bullet {list-style: none}
+-->
+</style>
+<link rel="stylesheet" type="text/css" href="./manual.css">
+
+
+</head>
+
+<body lang="en">
+<div class="section" id="Tree_002dsitter-C-API">
+<div class="header">
+<p>
+Previous: <a href="Multiple-Languages.html" accesskey="p" rel="prev">Parsing Text in Multiple Languages</a>, Up: <a href="Parsing-Program-Source.html" accesskey="u" rel="up">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+<hr>
+<span id="Tree_002dsitter-C-API-Correspondence"></span><h3 class="section">37.7 Tree-sitter C API Correspondence</h3>
+
+<p>Emacs&rsquo; tree-sitter integration doesn&rsquo;t expose every feature
+tree-sitter&rsquo;s C API provides.  Missing features include:
+</p>
+<ul>
+<li> Creating a tree cursor and navigating the syntax tree with it.
+</li><li> Setting timeout and cancellation flag for a parser.
+</li><li> Setting the logger for a parser.
+</li><li> Printing a DOT graph of the syntax tree to a file.
+</li><li> Coping and modifying a syntax tree.  (Emacs doesn&rsquo;t expose a tree
+object.)
+</li><li> Using (row, column) coordinates as position.
+</li><li> Updating a node with changes. (In Emacs, retrieve a new node instead
+of updating the existing one.)
+</li><li> Querying statics of a language definition.
+</li></ul>
+
+<p>In addition, Emacs makes some changes to the C API to make the API more
+convenient and idiomatic:
+</p>
+<ul>
+<li> Instead of using byte positions, the ELisp API uses character
+positions.
+</li><li> Null nodes are converted to nil.
+</li></ul>
+
+<p>Below is the correspondence between all C API functions and their
+ELisp counterparts.  Sometimes one ELisp function corresponds to
+multiple C functions, and many C functions don&rsquo;t have an ELisp
+counterpart.
+</p>
+<div class="example">
+<pre class="example">ts_parser_new                           treesit-parser-create
+ts_parser_delete
+ts_parser_set_language
+ts_parser_language                      treesit-parser-language
+ts_parser_set_included_ranges           treesit-parser-set-included-ranges
+ts_parser_included_ranges               treesit-parser-included-ranges
+ts_parser_parse
+ts_parser_parse_string                  treesit-parse-string
+ts_parser_parse_string_encoding
+ts_parser_reset
+ts_parser_set_timeout_micros
+ts_parser_timeout_micros
+ts_parser_set_cancellation_flag
+ts_parser_cancellation_flag
+ts_parser_set_logger
+ts_parser_logger
+ts_parser_print_dot_graphs
+ts_tree_copy
+ts_tree_delete
+ts_tree_root_node
+ts_tree_language
+ts_tree_edit
+ts_tree_get_changed_ranges
+ts_tree_print_dot_graph
+ts_node_type                            treesit-node-type
+ts_node_symbol
+ts_node_start_byte                      treesit-node-start
+ts_node_start_point
+ts_node_end_byte                        treesit-node-end
+ts_node_end_point
+ts_node_string                          treesit-node-string
+ts_node_is_null
+ts_node_is_named                        treesit-node-check
+ts_node_is_missing                      treesit-node-check
+ts_node_is_extra                        treesit-node-check
+ts_node_has_changes                     treesit-node-check
+ts_node_has_error                       treesit-node-check
+ts_node_parent                          treesit-node-parent
+ts_node_child                           treesit-node-child
+ts_node_field_name_for_child            treesit-node-field-name-for-child
+ts_node_child_count                     treesit-node-child-count
+ts_node_named_child                     treesit-node-child
+ts_node_named_child_count               treesit-node-child-count
+ts_node_child_by_field_name             treesit-node-by-field-name
+ts_node_child_by_field_id
+ts_node_next_sibling                    treesit-next-sibling
+ts_node_prev_sibling                    treesit-prev-sibling
+ts_node_next_named_sibling              treesit-next-sibling
+ts_node_prev_named_sibling              treesit-prev-sibling
+ts_node_first_child_for_byte            treesit-first-child-for-pos
+ts_node_first_named_child_for_byte      treesit-first-child-for-pos
+ts_node_descendant_for_byte_range       treesit-descendant-for-range
+ts_node_descendant_for_point_range
+ts_node_named_descendant_for_byte_range treesit-descendant-for-range
+ts_node_named_descendant_for_point_range
+ts_node_edit
+ts_node_eq                              treesit-node-eq
+ts_tree_cursor_new
+ts_tree_cursor_delete
+ts_tree_cursor_reset
+ts_tree_cursor_current_node
+ts_tree_cursor_current_field_name
+ts_tree_cursor_current_field_id
+ts_tree_cursor_goto_parent
+ts_tree_cursor_goto_next_sibling
+ts_tree_cursor_goto_first_child
+ts_tree_cursor_goto_first_child_for_byte
+ts_tree_cursor_goto_first_child_for_point
+ts_tree_cursor_copy
+ts_query_new
+ts_query_delete
+ts_query_pattern_count
+ts_query_capture_count
+ts_query_string_count
+ts_query_start_byte_for_pattern
+ts_query_predicates_for_pattern
+ts_query_step_is_definite
+ts_query_capture_name_for_id
+ts_query_string_value_for_id
+ts_query_disable_capture
+ts_query_disable_pattern
+ts_query_cursor_new
+ts_query_cursor_delete
+ts_query_cursor_exec                    treesit-query-capture
+ts_query_cursor_did_exceed_match_limit
+ts_query_cursor_match_limit
+ts_query_cursor_set_match_limit
+ts_query_cursor_set_byte_range
+ts_query_cursor_set_point_range
+ts_query_cursor_next_match
+ts_query_cursor_remove_match
+ts_query_cursor_next_capture
+ts_language_symbol_count
+ts_language_symbol_name
+ts_language_symbol_for_name
+ts_language_field_count
+ts_language_field_name_for_id
+ts_language_field_id_for_name
+ts_language_symbol_type
+ts_language_version
+</pre></div>
+</div>
+<hr>
+<div class="header">
+<p>
+Previous: <a href="Multiple-Languages.html">Parsing Text in Multiple Languages</a>, Up: <a href="Parsing-Program-Source.html">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+
+
+
+</body>
+</html>
diff --git a/admin/notes/tree-sitter/html-manual/Using-Parser.html b/admin/notes/tree-sitter/html-manual/Using-Parser.html
new file mode 100644
index 0000000000..438e3858f1
--- /dev/null
+++ b/admin/notes/tree-sitter/html-manual/Using-Parser.html
@@ -0,0 +1,186 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!-- Created by GNU Texinfo 6.8, https://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<!-- This is the GNU Emacs Lisp Reference Manual
+corresponding to Emacs version 29.0.50.
+
+Copyright © 1990-1996, 1998-2022 Free Software Foundation,
+Inc.
+
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with the
+Invariant Sections being "GNU General Public License," with the
+Front-Cover Texts being "A GNU Manual," and with the Back-Cover
+Texts as in (a) below.  A copy of the license is included in the
+section entitled "GNU Free Documentation License."
+
+(a) The FSF's Back-Cover Text is: "You have the freedom to copy and
+modify this GNU manual.  Buying copies from the FSF supports it in
+developing GNU and promoting software freedom." -->
+<title>Using Parser (GNU Emacs Lisp Reference Manual)</title>
+
+<meta name="description" content="Using Parser (GNU Emacs Lisp Reference Manual)">
+<meta name="keywords" content="Using Parser (GNU Emacs Lisp Reference Manual)">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="makeinfo">
+<meta name="viewport" content="width=device-width,initial-scale=1">
+
+<link href="index.html" rel="start" title="Top">
+<link href="Index.html" rel="index" title="Index">
+<link href="index.html#SEC_Contents" rel="contents" title="Table of Contents">
+<link href="Parsing-Program-Source.html" rel="up" title="Parsing Program Source">
+<link href="Retrieving-Node.html" rel="next" title="Retrieving Node">
+<link href="Language-Definitions.html" rel="prev" title="Language Definitions">
+<style type="text/css">
+<!--
+a.copiable-anchor {visibility: hidden; text-decoration: none; line-height: 0em}
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+span:hover a.copiable-anchor {visibility: visible}
+ul.no-bullet {list-style: none}
+-->
+</style>
+<link rel="stylesheet" type="text/css" href="./manual.css">
+
+
+</head>
+
+<body lang="en">
+<div class="section" id="Using-Parser">
+<div class="header">
+<p>
+Next: <a href="Retrieving-Node.html" accesskey="n" rel="next">Retrieving Node</a>, Previous: <a href="Language-Definitions.html" accesskey="p" rel="prev">Tree-sitter Language Definitions</a>, Up: <a href="Parsing-Program-Source.html" accesskey="u" rel="up">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+<hr>
+<span id="Using-Tree_002dsitter-Parser"></span><h3 class="section">37.2 Using Tree-sitter Parser</h3>
+<span id="index-Tree_002dsitter-parser"></span>
+
+<p>This section described how to create and configure a tree-sitter
+parser.  In Emacs, each tree-sitter parser is associated with a
+buffer.  As we edit the buffer, the associated parser and the syntax
+tree is automatically kept up-to-date.
+</p>
+<dl class="def">
+<dt id="index-treesit_002dmax_002dbuffer_002dsize"><span class="category">Variable: </span><span><strong>treesit-max-buffer-size</strong><a href='#index-treesit_002dmax_002dbuffer_002dsize' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This variable contains the maximum size of buffers in which
+tree-sitter can be activated.  Major modes should check this value
+when deciding whether to enable tree-sitter features.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dcan_002denable_002dp"><span class="category">Function: </span><span><strong>treesit-can-enable-p</strong><a href='#index-treesit_002dcan_002denable_002dp' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function checks whether the current buffer is suitable for
+activating tree-sitter features.  It basically checks
+<code>treesit-available-p</code> and <code>treesit-max-buffer-size</code>.
+</p></dd></dl>
+
+<span id="index-Creating-tree_002dsitter-parsers"></span>
+<dl class="def">
+<dt id="index-treesit_002dparser_002dcreate"><span class="category">Function: </span><span><strong>treesit-parser-create</strong> <em>language &amp;optional buffer no-reuse</em><a href='#index-treesit_002dparser_002dcreate' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>To create a parser, we provide a <var>buffer</var> and the <var>language</var>
+to use (see <a href="Language-Definitions.html">Tree-sitter Language Definitions</a>).  If <var>buffer</var> is nil, the
+current buffer is used.
+</p>
+<p>By default, this function reuses a parser if one already exists for
+<var>language</var> in <var>buffer</var>, if <var>no-reuse</var> is non-nil, this
+function always creates a new parser.
+</p></dd></dl>
+
+<p>Given a parser, we can query information about it:
+</p>
+<dl class="def">
+<dt id="index-treesit_002dparser_002dbuffer"><span class="category">Function: </span><span><strong>treesit-parser-buffer</strong> <em>parser</em><a href='#index-treesit_002dparser_002dbuffer' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>Returns the buffer associated with <var>parser</var>.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dparser_002dlanguage"><span class="category">Function: </span><span><strong>treesit-parser-language</strong> <em>parser</em><a href='#index-treesit_002dparser_002dlanguage' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>Returns the language that <var>parser</var> uses.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dparser_002dp"><span class="category">Function: </span><span><strong>treesit-parser-p</strong> <em>object</em><a href='#index-treesit_002dparser_002dp' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>Checks if <var>object</var> is a tree-sitter parser. Return non-nil if it
+is, return nil otherwise.
+</p></dd></dl>
+
+<p>There is no need to explicitly parse a buffer, because parsing is done
+automatically and lazily.  A parser only parses when we query for a
+node in its syntax tree.  Therefore, when a parser is first created,
+it doesn&rsquo;t parse the buffer; it waits until we query for a node for
+the first time.  Similarly, when some change is made in the buffer, a
+parser doesn&rsquo;t re-parse immediately.
+</p>
+<span id="index-treesit_002dbuffer_002dtoo_002dlarge"></span>
+<p>When a parser do parse, it checks for the size of the buffer.
+Tree-sitter can only handle buffer no larger than about 4GB.  If the
+size exceeds that, Emacs signals <code>treesit-buffer-too-large</code>
+with signal data being the buffer size.
+</p>
+<p>Once a parser is created, Emacs automatically adds it to the
+internal parser list.  Every time a change is made to the buffer,
+Emacs updates parsers in this list so they can update their syntax
+tree incrementally.
+</p>
+<dl class="def">
+<dt id="index-treesit_002dparser_002dlist"><span class="category">Function: </span><span><strong>treesit-parser-list</strong> <em>&amp;optional buffer</em><a href='#index-treesit_002dparser_002dlist' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function returns the parser list of <var>buffer</var>.  And
+<var>buffer</var> defaults to the current buffer.
+</p></dd></dl>
+
+<dl class="def">
+<dt id="index-treesit_002dparser_002ddelete"><span class="category">Function: </span><span><strong>treesit-parser-delete</strong> <em>parser</em><a href='#index-treesit_002dparser_002ddelete' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>This function deletes <var>parser</var>.
+</p></dd></dl>
+
+<span id="index-tree_002dsitter-narrowing"></span>
+<span id="tree_002dsitter-narrowing"></span><p>Normally, a parser &ldquo;sees&rdquo; the whole
+buffer, but when the buffer is narrowed (see <a href="Narrowing.html">Narrowing</a>), the
+parser will only see the visible region.  As far as the parser can
+tell, the hidden region is deleted.  And when the buffer is later
+widened, the parser thinks text is inserted in the beginning and in
+the end.  Although parsers respect narrowing, narrowing shouldn&rsquo;t be
+the mean to handle a multi-language buffer; instead, set the ranges in
+which a parser should operate in.  See <a href="Multiple-Languages.html">Parsing Text in Multiple Languages</a>.
+</p>
+<p>Because a parser parses lazily, when we narrow the buffer, the parser
+is not affected immediately; as long as we don&rsquo;t query for a node
+while the buffer is narrowed, the parser is oblivious of the
+narrowing.
+</p>
+<span id="index-tree_002dsitter-parse-string"></span>
+<dl class="def">
+<dt id="index-treesit_002dparse_002dstring"><span class="category">Function: </span><span><strong>treesit-parse-string</strong> <em>string language</em><a href='#index-treesit_002dparse_002dstring' class='copiable-anchor'> &para;</a></span></dt>
+<dd><p>Besides creating a parser for a buffer, we can also just parse a
+string.  Unlike a buffer, parsing a string is a one-time deal, and
+there is no way to update the result.
+</p>
+<p>This function parses <var>string</var> with <var>language</var>, and returns the
+root node of the generated syntax tree.
+</p></dd></dl>
+
+</div>
+<hr>
+<div class="header">
+<p>
+Next: <a href="Retrieving-Node.html">Retrieving Node</a>, Previous: <a href="Language-Definitions.html">Tree-sitter Language Definitions</a>, Up: <a href="Parsing-Program-Source.html">Parsing Program Source</a> &nbsp; [<a href="index.html#SEC_Contents" title="Table of contents" rel="contents">Contents</a>][<a href="Index.html" title="Index" rel="index">Index</a>]</p>
+</div>
+
+
+
+</body>
+</html>
diff --git a/admin/notes/tree-sitter/html-manual/build-manual.sh b/admin/notes/tree-sitter/html-manual/build-manual.sh
new file mode 100755
index 0000000000..adde3f2a2a
--- /dev/null
+++ b/admin/notes/tree-sitter/html-manual/build-manual.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+MANUAL_DIR="../../../doc/lispref"
+THIS_DIR=$(pwd)
+
+echo "Build manual"
+cd "${MANUAL_DIR}"
+make elisp.html HTML_OPTS="--html --css-ref=./manual.css"
+
+cd "${THIS_DIR}"
+
+echo "Copy manual"
+cp -f "${MANUAL_DIR}/elisp.html/Parsing-Program-Source.html" .
+cp -f "${MANUAL_DIR}/elisp.html/Language-Definitions.html" .
+cp -f "${MANUAL_DIR}/elisp.html/Using-Parser.html" .
+cp -f "${MANUAL_DIR}/elisp.html/Retrieving-Node.html" .
+cp -f "${MANUAL_DIR}/elisp.html/Accessing-Node.html" .
+cp -f "${MANUAL_DIR}/elisp.html/Pattern-Matching.html" .
+cp -f "${MANUAL_DIR}/elisp.html/Multiple-Languages.html" .
+cp -f "${MANUAL_DIR}/elisp.html/Tree_002dsitter-C-API.html" .
+
+cp -f "${MANUAL_DIR}/elisp.html/Parser_002dbased-Font-Lock.html" .
+cp -f "${MANUAL_DIR}/elisp.html/Parser_002dbased-Indentation.html" .
diff --git a/admin/notes/tree-sitter/html-manual/manual.css b/admin/notes/tree-sitter/html-manual/manual.css
new file mode 100644
index 0000000000..5a6790a345
--- /dev/null
+++ b/admin/notes/tree-sitter/html-manual/manual.css
@@ -0,0 +1,374 @@
+/* Style-sheet to use for Emacs manuals  */
+
+/* Copyright (C) 2013-2014 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without any warranty.
+*/
+
+/* style.css begins here */
+
+/* This stylesheet is used by manuals and a few older resources. */
+
+/* reset.css begins here */
+
+/*
+Software License Agreement (BSD License)
+
+Copyright (c) 2006, Yahoo! Inc.
+All rights reserved.
+
+Redistribution and use of this software in source and
+binary forms, with or without modification, arepermitted
+provided that the following conditions are met:
+
+* Redistributions of source code must retain the above
+copyright notice, this list of conditions and the
+following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the
+following disclaimer in the documentation and/or other
+materials provided with the distribution.
+
+* Neither the name of Yahoo! Inc. nor the names of its
+contributors may be used to endorse or promote products
+derived from this software without specific prior
+written permission of Yahoo! Inc.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+*/
+
+html {
+    color: #000;
+    background: #FFF;
+}
+
+body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4,
+h5, h6, pre, code, form, fieldset, legend, input,
+button, textarea, p, blockquote, th, td {
+    margin: 0;
+    padding: 0;
+}
+
+table {
+    border-collapse: collapse;
+    border-spacing: 0;
+}
+
+fieldset, img {
+    border: 0;
+}
+
+address, caption, cite, code, dfn, em, strong,
+th, var, optgroup {
+    font-style: inherit;
+    font-weight: inherit;
+}
+
+del, ins {
+    text-decoration: none;
+}
+
+li {
+    list-style:none;
+}
+
+caption, th {
+    text-align: left;
+}
+
+h1, h2, h3, h4, h5, h6 {
+    font-size: 100%;
+    font-weight: normal;
+}
+
+q:before, q:after {
+    content:'';
+}
+
+abbr, acronym {
+    border: 0;
+    font-variant: normal;
+}
+
+sup {
+    vertical-align: baseline;
+}
+sub {
+    vertical-align: baseline;
+}
+
+legend {
+    color: #000;
+}
+
+input, button, textarea, select, optgroup, option {
+    font-family: inherit;
+    font-size: inherit;
+    font-style: inherit;
+    font-weight: inherit;
+}
+
+input, button, textarea, select {
+    *font-size: 100%;
+}
+
+
+/* reset.css ends here */
+
+/***  PAGE LAYOUT  ***/
+
+html, body {
+    font-size: 1em;
+    text-align: left;
+    text-decoration: none;
+}
+html { background-color: #e7e7e7; }
+
+body {
+    max-width: 74.92em;
+    margin: 0 auto;
+    padding: .5em 1em 1em 1em;
+    background-color: white;
+    border: .1em solid #c0c0c0;
+}
+
+
+/*** BASIC ELEMENTS ***/
+
+/* Size and positioning */
+
+p, pre, li, dt, dd, table, code, address { line-height: 1.3em; }
+
+h1 { font-size: 2em; margin: 1em 0 }
+h2 { font-size: 1.50em; margin: 1.0em 0 0.87em 0; }
+h3 { font-size: 1.30em; margin: 1.0em 0 0.87em 0; }
+h4 { font-size: 1.13em; margin: 1.0em 0 0.88em 0; }
+h5 { font-size: 1.00em; margin: 1.0em 0 1.00em 0; }
+
+p, pre { margin: 1em 0; }
+pre { overflow: auto; padding-bottom: .3em; }
+
+ul, ol, blockquote { margin-left: 1.5%; margin-right: 1.5%; }
+hr { margin: 1em 0; }
+/* Lists of underlined links are difficult to read. The top margin
+   gives a little more spacing between entries. */
+ul li { margin: .5em 1em; }
+ol li { margin: 1em; }
+ol ul li { margin: .5em 1em; }
+ul li p, ul ul li { margin-top: .3em; margin-bottom: .3em; }
+ul ul, ol ul { margin-top: 0; margin-bottom: 0; }
+
+/* Separate description lists from preceding text */
+dl { margin: 1em 0 0 0; }
+/* separate the "term" from subsequent "description" */
+dt { margin: .5em 0; }
+/* separate the "description" from subsequent list item
+   when the final <dd> child is an anonymous box */
+dd { margin: .5em 3% 1em 3%; }
+/* separate anonymous box (used to be the first element in <dd>)
+   from subsequent <p> */
+dd p { margin: .5em 0; }
+
+table {
+    display: block; overflow: auto;
+    margin-top: 1.5em; margin-bottom: 1.5em;
+}
+th { padding: .3em .5em; text-align: center; }
+td { padding: .2em .5em; }
+
+address { margin-bottom: 1em; }
+caption { margin-bottom: .5em; text-align: center; }
+sup { vertical-align: super; }
+sub { vertical-align: sub; }
+
+/* Style */
+
+h1, h2, h3, h4, h5, h6, strong, dt, th { font-weight: bold; }
+
+/* The default color (black) is too dark for large text in
+   bold font. */
+h1, h2, h3, h4 { color: #333; }
+h5, h6, dt { color: #222; }
+
+a[href] { color: #005090; }
+a[href]:visited { color: #100070; }
+a[href]:active, a[href]:hover {
+    color: #100070;
+    text-decoration: none;
+}
+
+h1 a[href]:visited, h2 a[href]:visited, h3 a[href]:visited,
+h4 a[href]:visited { color: #005090; }
+h1 a[href]:hover, h2 a[href]:hover, h3 a[href]:hover,
+h4 a[href]:hover { color: #100070; }
+
+ol { list-style: decimal outside;}
+ul { list-style: square outside; }
+ul ul, ol ul { list-style: circle; }
+li { list-style: inherit; }
+
+hr { background-color: #ede6d5; }
+table { border: 0; }
+
+abbr,acronym {
+    border-bottom:1px dotted #000;
+    text-decoration: none;
+    cursor:help;
+}
+del { text-decoration: line-through; }
+em { font-style: italic; }
+small { font-size: .9em; }
+
+img { max-width: 100%}
+
+
+/*** SIMPLE CLASSES ***/
+
+.center, .c { text-align: center; }
+.nocenter{ text-align: left; }
+
+.underline { text-decoration: underline; }
+.nounderline { text-decoration: none; }
+
+.no-bullet { list-style: none; }
+.inline-list li { display: inline }
+
+.netscape4, .no-display { display: none; }
+
+
+/*** MANUAL PAGES ***/
+
+/* This makes the very long tables of contents in Gnulib and other
+   manuals easier to read. */
+.contents ul, .shortcontents ul { font-weight: bold; }
+.contents ul ul, .shortcontents ul ul { font-weight: normal; }
+.contents ul { list-style: none; }
+
+/* For colored navigation bars (Emacs manual): make the bar extend
+   across the whole width of the page and give it a decent height. */
+.header, .node { margin: 0 -1em; padding: 0 1em; }
+.header p, .node p { line-height: 2em; }
+
+/* For navigation links */
+.node a, .header a { display: inline-block; line-height: 2em; }
+.node a:hover, .header a:hover { background: #f2efe4; }
+
+/* Inserts */
+table.cartouche td { padding: 1.5em; }
+
+div.display, div.lisp, div.smalldisplay,
+div.smallexample, div.smalllisp { margin-left: 3%; }
+
+div.example { padding: .8em 1.2em .4em; }
+pre.example { padding: .8em 1.2em; }
+div.example, pre.example {
+    margin: 1em 0 1em 3% ;
+    -webkit-border-radius: .3em;
+    -moz-border-radius: .3em;
+    border-radius: .3em;
+    border: 1px solid #d4cbb6;
+    background-color: #f2efe4;
+}
+div.example > pre.example {
+    padding: 0 0 .4em;
+    margin: 0;
+    border: none;
+}
+
+pre.menu-comment { padding-top: 1.3em; margin: 0; }
+
+
+/*** FOR WIDE SCREENS ***/
+
+@media (min-width: 40em) {
+    body { padding: .5em 3em 1em 3em; }
+    div.header, div.node { margin: 0 -3em; padding: 0 3em; }
+}
+
+/* style.css ends here */
+
+/* makeinfo convert @deffn and similar functions to something inside
+   <blockquote>.  style.css uses italic for blockquote.  This looks poor
+   in the Emacs manuals, which make extensive use of @defun (etc).
+   In particular, references to function arguments appear as <var>
+   inside <blockquote>.  Since <var> is also italic, it makes it
+   impossible to distinguish variables.  We could change <var> to
+   e.g. bold-italic, or normal, or a different color, but that does
+   not look as good IMO.  So we just override blockquote to be non-italic.
+   */
+blockquote { font-style: normal; }
+
+var { font-style: italic; }
+
+div.header {
+    background-color: #DDDDFF;
+    padding-top: 0.2em;
+}
+
+
+/*** Customization ***/
+
+body {
+    font-family: Charter, serif;
+    font-size: 14pt;
+    line-height: 1.4;
+    background-color: #fefefc;
+    color: #202010;
+}
+
+pre.menu-comment {
+    font-family: Charter, serif;
+    font-size: 14pt;
+}
+
+body > *, body > div.display, body > div.lisp, body > div.smalldisplay,
+body > div.example, body > div.smallexample, body > div.smalllisp {
+    width: 700px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+div.header {
+    width: 100%;
+    min-height: 3em;
+    font-size: 13pt;
+}
+
+/* Documentation block for functions and variables. Make then
+   narrower*/
+dd {
+    margin: .5em 6% 1em 6%
+}
+
+code, pre, kbd, samp, tt {
+    font-size: 12pt;
+    font-family: monospace;
+}
+
+/* In each node we have index table to all sub-nodes. Make more space
+   for the first column, which is the name to each sub-node. */
+table.menu tbody tr td:nth-child(1) {
+    white-space: nowrap;
+}
+
+div.header p {
+    text-align: center;
+    margin: 0.5em auto 0.5em auto;
+}
diff --git a/admin/notes/tree-sitter/starter-guide b/admin/notes/tree-sitter/starter-guide
new file mode 100644
index 0000000000..6cf8cf8a23
--- /dev/null
+++ b/admin/notes/tree-sitter/starter-guide
@@ -0,0 +1,442 @@
+STARTER GUIDE ON WRITTING MAJOR MODE WITH TREE-SITTER -*- org -*-
+
+This document guides you on adding tree-sitter support to a major
+mode.
+
+TOC:
+
+- Building Emacs with tree-sitter
+- Install language definitions
+- Setup
+- Font-lock
+- Indent
+- Imenu
+- Navigation
+- Which-func
+- More features?
+- Common tasks (code snippets)
+- Manual
+
+* Building Emacs with tree-sitter
+
+You can either install tree-sitter by your package manager, or from
+source:
+
+    git clone https://github.com/tree-sitter/tree-sitter.git
+    cd tree-sitter
+    make
+    make install
+
+Then pull the tree-sitter branch (or the master branch, if it has
+merged) and rebuild Emacs.
+
+* Install language definitions
+
+Tree-sitter by itself doesn’t know how to parse any particular
+language. We need to install language definitions (or “grammars”) for
+a language to be able to parse it. There are a couple of ways to get
+them.
+
+You can use this script that I put together here:
+
+    https://github.com/casouri/tree-sitter-module
+
+You can also find them under this directory in /build-modules.
+
+This script automatically pulls and builds language definitions for C,
+C++, Rust, JSON, Go, HTML, Javascript, CSS, Python, Typescript,
+and C#. Better yet, I pre-built these language definitions for
+GNU/Linux and macOS, they can be downloaded here:
+
+    https://github.com/casouri/tree-sitter-module/releases/tag/v2.1
+
+To build them yourself, run
+
+    git clone git@github.com:casouri/tree-sitter-module.git
+    cd tree-sitter-module
+    ./batch.sh
+
+and language definitions will be in the /dist directory. You can
+either copy them to standard dynamic library locations of your system,
+eg, /usr/local/lib, or leave them in /dist and later tell Emacs where
+to find language definitions by setting ‘treesit-extra-load-path’.
+
+Language definition sources can be found on GitHub under
+tree-sitter/xxx, like tree-sitter/tree-sitter-python. The tree-sitter
+organization has all the "official" language definitions:
+
+   https://github.com/tree-sitter
+
+* Setting up for adding major mode features
+
+Start Emacs, and load tree-sitter with
+
+    (require 'treesit)
+
+Now check if Emacs is built with tree-sitter library
+
+    (treesit-available-p)
+
+For your major mode, first create a tree-sitter switch:
+
+#+begin_src elisp
+(defcustom python-use-tree-sitter nil
+  "If non-nil, `python-mode' tries to use tree-sitter.
+Currently `python-mode' can utilize tree-sitter for font-locking,
+imenu, and movement functions."
+  :type 'boolean)
+#+end_src
+
+Then in other places, we decide on whether to enable tree-sitter by
+
+#+begin_src elisp
+(and python-use-tree-sitter
+     (treesit-can-enable-p))
+#+end_src
+
+* Font-lock
+
+Tree-sitter works like this: You provide a query made of patterns and
+capture names, tree-sitter finds the nodes that match these patterns,
+tag the corresponding capture names onto the nodes and return them to
+you. The query function returns a list of (capture-name . node). For
+font-lock, we use face names as capture names. And the captured node
+will be fontified in their capture name. The capture name could also
+be a function, in which case (START END NODE) is passed to the
+function for font-lock. START and END is the start and end the
+captured NODE.
+
+** Query syntax
+
+There are two types of nodes, named, like (identifier),
+(function_definition), and anonymous, like "return", "def", "(",
+"}". Parent-child relationship is expressed as
+
+   (parent (child) (child) (child (grand_child)))
+
+Eg, an argument list (1, "3", 1) could be:
+
+   (argument_list "(" (number) (string) (number) ")")
+
+Children could have field names in its parent:
+
+   (function_definition name: (identifier) type: (identifier))
+
+Match any of the list:
+
+    ["true" "false" "none"]
+
+Capture names can come after any node in the pattern:
+
+    (parent (child) @child) @parent
+
+The query above captures both parent and child.
+
+   ["return" "continue" "break"] @keyword
+
+The query above captures all the keywords with capture name
+"keyword".
+
+These are the common syntax, see all of them in the manual
+("Parsing Program Source" section).
+
+** Query references
+
+But how do one come up with the queries? Take python for an
+example, open any python source file, evaluate
+
+    (treesit-parser-create 'python)
+
+so there is a parser available, then enable ‘treesit-inspect-mode’.
+Now you should see information of the node under point in
+mode-line. Move around and you should be able to get a good
+picture. Besides this, you can consult the grammar of the language
+definition. For example, Python’s grammar file is at
+
+    https://github.com/tree-sitter/tree-sitter-python/blob/master/grammar.js
+
+Neovim also has a bunch of queries to reference:
+
+    https://github.com/nvim-treesitter/nvim-treesitter/tree/master/queries
+
+The manual explains how to read grammar files in the bottom of section
+"Tree-sitter Language Definitions".
+
+** Debugging queires
+
+If your query has problems, it usually cannot compile. In that case
+use ‘treesit-query-validate’ to debug the query. It will pop a buffer
+containing the query (in text format) and mark the offending part in
+red.
+
+** Code
+
+To enable tree-sitter font-lock, set ‘treesit-font-lock-settings’
+buffer-locally and call ‘treesit-font-lock-enable’. For example, see
+‘python--treesit-settings’ in python.el. Below I paste a snippet of
+it.
+
+Note that like the current font-lock, if the to-be-fontified region
+already has a face (ie, an earlier match fontified part/all of the
+region), the new face is discarded rather than applied.  If you want
+later matches always override earlier matches, use the :override
+keyword.
+
+#+begin_src elisp
+(defvar python--treesit-settings
+  (treesit-font-lock-rules
+   :language 'python
+   :override t
+   `(;; Queries for def and class.
+     (function_definition
+      name: (identifier) @font-lock-function-name-face)
+
+     (class_definition
+      name: (identifier) @font-lock-type-face)
+
+     ;; Comment and string.
+     (comment) @font-lock-comment-face
+
+     ...)))
+#+end_src
+
+Then in ‘python-mode’, enable tree-sitter font-lock:
+
+#+begin_src elisp
+(treesit-parser-create 'python)
+;; This turns off the syntax-based font-lock for comments and
+;; strings.  So it doesn’t override tree-sitter’s fontification.
+(setq-local font-lock-keywords-only t)
+(setq-local treesit-font-lock-settings
+            python--treesit-settings)
+(treesit-font-lock-enable)
+#+end_src
+
+Concretely, something like this:
+
+#+begin_src elisp
+(define-derived-mode python-mode prog-mode "Python"
+  ...
+
+  (treesit-parser-create 'python)
+
+  (if (and python-use-tree-sitter
+           (treesit-can-enable-p))
+      ;; Tree-sitter.
+      (progn
+        (setq-local font-lock-keywords-only t)
+        (setq-local treesit-font-lock-settings
+                    python--treesit-settings)
+        (treesit-font-lock-enable))
+    ;; No tree-sitter
+    (setq-local font-lock-defaults ...))
+
+  ...)
+#+end_src
+
+You’ll notice that tree-sitter’s font-lock doesn’t respect
+‘font-lock-maximum-decoration’, major modes are free to set
+‘treesit-font-lock-settings’ based on the value of
+‘font-lock-maximum-decoration’, or provide more fine-grained control
+through other mode-specific means.
+
+* Indent
+
+Indent works like this: We have a bunch of rules that look like this:
+
+   (MATCHER ANCHOR OFFSET)
+
+At the beginning point is at the BOL of a line, we want to know which
+column to indent this line to. Let NODE be the node at point, we pass
+this node to the MATCHER of each rule, one of them will match the node
+("this node is a closing bracket!"). Then we pass the node to the
+ANCHOR, which returns a point, eg, the BOL of the previous line. We
+find the column number of that point (eg, 4), add OFFSET to it (eg,
+0), and that is the column we want to indent the current line to (4 +
+0 = 4).
+
+For MATHCER we have
+
+    (parent-is TYPE)
+    (node-is TYPE)
+    (query QUERY) => matches if querying PARENT with QUERY
+                     captures NODE.
+
+    (match NODE-TYPE PARENT-TYPE NODE-FIELD
+           NODE-INDEX-MIN NODE-INDEX-MAX)
+
+    => checks everything. If an argument is nil, don’t match that. Eg,
+    (match nil nil TYPE) is the same as (parent-is TYPE)
+
+For ANCHOR we have
+
+    first-sibling => start of the first sibling
+    parent => start of parent
+    parent-bol => BOL of the line parent is on.
+    prev-sibling
+    no-indent => don’t indent
+    prev-line => same indent as previous line
+
+There is also a manual section for indent: "Parser-based Indentation".
+
+When writing indent rules, you can use ‘treesit-check-indent’ to
+check if your indentation is correct. To debug what went wrong, set
+‘treesit--indent-verboase’ to non-nil. Then when you indent, Emacs
+tells you which rule is applied in the echo area.
+
+#+begin_src elisp
+(defvar typescript-mode-indent-rules
+  (let ((offset typescript-indent-offset))
+    `((typescript
+       ;; This rule matches if node at point is "}", ANCHOR is the
+       ;; parent node’s BOL, and offset is 0.
+       ((node-is "}") parent-bol 0)
+       ((node-is ")") parent-bol 0)
+       ((node-is "]") parent-bol 0)
+       ((node-is ">") parent-bol 0)
+       ((node-is ".") parent-bol ,offset)
+       ((parent-is "ternary_expression") parent-bol ,offset)
+       ((parent-is "named_imports") parent-bol ,offset)
+       ((parent-is "statement_block") parent-bol ,offset)
+       ((parent-is "type_arguments") parent-bol ,offset)
+       ((parent-is "variable_declarator") parent-bol ,offset)
+       ((parent-is "arguments") parent-bol ,offset)
+       ((parent-is "array") parent-bol ,offset)
+       ((parent-is "formal_parameters") parent-bol ,offset)
+       ((parent-is "template_substitution") parent-bol ,offset)
+       ((parent-is "object_pattern") parent-bol ,offset)
+       ((parent-is "object") parent-bol ,offset)
+       ((parent-is "object_type") parent-bol ,offset)
+       ((parent-is "enum_body") parent-bol ,offset)
+       ((parent-is "arrow_function") parent-bol ,offset)
+       ((parent-is "parenthesized_expression") parent-bol ,offset)
+       ...))))
+#+end_src
+
+Then you set ‘treesit-simple-indent-rules’ to your rules, and set
+‘indent-line-function’:
+
+#+begin_src elisp
+(setq-local treesit-simple-indent-rules typescript-mode-indent-rules)
+(setq-local indent-line-function #'treesit-indent)
+#+end_src
+
+* Imenu
+
+Not much to say except for utilizing ‘treesit-induce-sparse-tree’.
+See ‘python--imenu-treesit-create-index-1’ in python.el for an
+example.
+
+Once you have the index builder, set ‘imenu-create-index-function’.
+
+* Navigation
+
+Mainly ‘beginning-of-defun-function’ and ‘end-of-defun-function’.
+You can find the end of a defun with something like
+
+(treesit-search-forward-goto "function_definition" 'end)
+
+where "function_definition" matches the node type of a function
+definition node, and ’end means we want to go to the end of that
+node.
+
+Something like this should suffice:
+
+#+begin_src elisp
+(defun xxx-beginning-of-defun (&optional arg)
+  (if (> arg 0)
+      ;; Go backward.
+      (while (and (> arg 0)
+                  (treesit-search-forward-goto
+                   "function_definition" 'start nil t))
+        (setq arg (1- arg)))
+    ;; Go forward.
+    (while (and (< arg 0)
+                (treesit-search-forward-goto
+                 "function_definition" 'start))
+      (setq arg (1+ arg)))))
+
+(setq-local beginning-of-defun-function #'xxx-beginning-of-defun)
+#+end_src
+
+And the same for end-of-defun.
+
+* Which-func
+
+You can find the current function by going up the tree and looking for
+the function_definition node. See ‘python-info-treesit-current-defun’
+in python.el for an example.  Since Python allows nested function
+definitions, that function keeps going until it reaches the root node,
+and records all the function names along the way.
+
+#+begin_src elisp
+(defun python-info-treesit-current-defun (&optional include-type)
+  "Identical to `python-info-current-defun' but use tree-sitter.
+For INCLUDE-TYPE see `python-info-current-defun'."
+  (let ((node (treesit-node-at (point)))
+        (name-list ())
+        (type nil))
+    (cl-loop while node
+             if (pcase (treesit-node-type node)
+                  ("function_definition"
+                   (setq type 'def))
+                  ("class_definition"
+                   (setq type 'class))
+                  (_ nil))
+             do (push (treesit-node-text
+                       (treesit-node-child-by-field-name node "name")
+                       t)
+                      name-list)
+             do (setq node (treesit-node-parent node))
+             finally return (concat (if include-type
+                                        (format "%s " type)
+                                      "")
+                                    (string-join name-list ".")))))
+#+end_src
+
+* More features?
+
+Obviously this list is just a starting point, if there are features in
+the major mode that would benefit a parse tree, adding tree-sitter
+support for that would be great. But in the minimal case, just adding
+font-lock is awesome.
+
+* Common tasks
+
+How to...
+
+** Get the buffer text corresponding to a node?
+
+(treesit-node-text node)
+
+BTW ‘treesit-node-string’ does different things.
+
+** Scan the whole tree for stuff?
+
+(treesit-search-subtree)
+(treesit-search-forward)
+(treesit-induce-sparse-tree)
+
+** Move to next node that...?
+
+(treesit-search-forward-goto)
+
+** Get the root node?
+
+(treesit-buffer-root-node)
+
+** Get the node at point?
+
+(treesit-node-at (point))
+
+* Manual
+
+I suggest you read the manual section for tree-sitter in Info. The
+section is Parsing Program Source. Typing
+
+    C-h i d m elisp RET g Parsing Program Source RET
+
+will bring you to that section. You can also read the HTML version
+under /html-manual in this directory. I find the HTML version easier
+to read. You don’t need to read through every sentence, just read the
+text paragraphs and glance over function names.

commit 1ea503ed4b3a14b3dc0a597cfbfe57d73b871422
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Oct 4 13:30:00 2022 -0700

    Add :override flag for python tree-sitter font-lock settings
    
    * lisp/progmodes/python.el (python--treesit-settings): Add :override.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 3f85201c10..b498baec60 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -987,6 +987,7 @@ python--treesit-fontify-string
 (defvar python--treesit-settings
   (treesit-font-lock-rules
    :language 'python
+   :override t
    `(;; Queries for def and class.
      (function_definition
       name: (identifier) @font-lock-function-name-face)

commit 23bb724c922de95573f73b22ae311696ae08464e
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Oct 4 13:28:46 2022 -0700

    Add :override flag for tree-sitter font-lock
    
    * doc/lispref/modes.texi (Parser-based Font Lock): Update manual.
    * lisp/treesit.el (treesit-font-lock-settings): Update docstring.
    (treesit-font-lock-rules): Handle :override.
    (treesit-font-lock-fontify-region): Handle :override.  Also set
    inhibit-point-motion-hooks to t.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 0d58c28e27..883f9d8491 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3911,6 +3911,7 @@ Parser-based Font Lock
 @group
 (treesit-font-lock-rules
  :language 'javascript
+ :override t
  '((true) @@font-lock-constant-face
    (false) @@font-lock-constant-face)
  :language 'html
@@ -3919,9 +3920,19 @@ Parser-based Font Lock
 @end example
 
 This function takes a list of text or s-exp queries.  Before each
-query, there are @var{:keyword} and @var{value} pairs that configures
-that query.  The @code{:lang} keyword sets the query’s language, and is
-currently the only recognized keyword.
+query, there are @var{:keyword} and @var{value} pairs that configure
+that query.  The @code{:lang} keyword sets the query’s language and
+every query must specify the language.  Other keywords are optional:
+
+@multitable @columnfractions .15 .15 .6
+@headitem Keyword @tab Value @tab Description
+@item @code{:override} @tab nil
+@tab If the region already has a face, discard the new face
+@item @tab t @tab Always apply the new face
+@item @tab @code{append} @tab Append the new face to existing ones
+@item @tab @code{prepend} @tab Prepend the new face to existing ones
+@item @tab @code{keep} @tab Fill-in regions without an existing face
+@end multitable
 
 Capture names in @var{query} should be face names like
 @code{font-lock-keyword-face}.  The captured node will be fontified
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 100bf9ac67..bb13021a27 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -277,6 +277,10 @@ treesit-update-ranges
 
 ;;; Font-lock
 
+(define-error 'treesit-font-lock-error
+              "Generic tree-sitter font-lock error"
+              'treesit-error)
+
 (defvar-local treesit-font-lock-settings nil
   "A list of SETTINGs for treesit-based fontification.
 
@@ -285,7 +289,7 @@ treesit-font-lock-settings
 
 Each SETTING is of form
 
-    (LANGUAGE QUERY)
+    (LANGUAGE QUERY OVERRIDE)
 
 Each SETTING controls one parser (often of different language).
 LANGUAGE is the language symbol.  See Info node `(elisp)Language
@@ -296,7 +300,11 @@ treesit-font-lock-settings
 a query in either string or s-expression form.  When using
 repeatedly, a compiled query is much faster than a string or sexp
 one, so it is recommend to compile your queries if it will be
-used over and over.")
+used over and over.
+
+OVERRIDE is the override flag for this query.  Its value can be
+t, nil, append, prepend, keep.  See more in
+`treesit-font-lock-rules'.")
 
 (defun treesit-font-lock-rules (&rest args)
   "Return a value suitable for `treesit-font-lock-settings'.
@@ -311,13 +319,22 @@ treesit-font-lock-rules
 
     (treesit-font-lock-rules
      :language \\='javascript
+     :override t
      \\='((true) @font-lock-constant-face
        (false) @font-lock-constant-face)
      :language \\='html
      \"(script_element) @font-lock-builtin-face\")
 
-For each QUERY, a :language keyword is required.  Currently the
-only recognized keyword is :language.
+For each QUERY, a :language keyword is required.  Other keywords
+include:
+
+  KEYWORD    VALUE    DESCRIPTION
+  :override  nil      If the region already has a face,
+                      discard the new face
+             t        Always apply the new face
+             append   Append the new face to existing ones
+             prepend  Prepend the new face to existing ones
+             keep     Fill-in regions without an existing face
 
 Capture names in QUERY should be face names like
 `font-lock-keyword-face'.  The captured node will be fontified
@@ -333,6 +350,8 @@ treesit-font-lock-rules
   (let (;; Tracks the current language that following queries will
         ;; apply to.
         (current-language nil)
+        ;; Tracks :override flag.
+        (current-override nil)
         ;; The list this function returns.
         (result nil))
     (while args
@@ -343,30 +362,41 @@ treesit-font-lock-rules
              (when (or (not (symbolp lang)) (null lang))
                (signal 'wrong-type-argument `(symbolp ,lang)))
              (setq current-language lang)))
+          (:override
+           (let ((flag (pop args)))
+             (when (not (memq flag '(t nil append prepend keep)))
+               (signal 'wrong-type-argument
+                       `((or t nil append prepend keep)
+                         ,flag)))
+             (setq current-override flag)))
           ((pred treesit-query-p)
            (when (null current-language)
-             (signal 'treesit-error
+             (signal 'treesit-font-lock-error
                      `("Language unspecified, use :language keyword to specify a language for this query" ,token)))
            (if (treesit-compiled-query-p token)
                (push `(,current-language token) result)
              (push `(,current-language
-                     ,(treesit-query-compile current-language token))
+                     ,(treesit-query-compile current-language token)
+                     ,current-override)
                    result))
            ;; Clears any configurations set for this query.
-           (setq current-language nil))
-          (_ (signal 'treesit-error
+           (setq current-language nil
+                 current-override nil))
+          (_ (signal 'treesit-font-lock-error
                      `("Unexpected value" token))))))
     (nreverse result)))
 
-(defun treesit-font-lock-fontify-region (start end &optional loudly)
+(defun treesit-font-lock-fontify-region
+    (start end &optional loudly)
   "Fontify the region between START and END.
 If LOUDLY is non-nil, message some debugging information."
   (treesit-update-ranges start end)
   (font-lock-unfontify-region start end)
   (dolist (setting treesit-font-lock-settings)
-    (when-let* ((language (nth 0 setting))
-                (match-pattern (nth 1 setting))
-                (parser (treesit-parser-create language)))
+    (let* ((language (nth 0 setting))
+           (match-pattern (nth 1 setting))
+           (override (nth 2 setting))
+           (parser (treesit-parser-create language)))
       (when-let ((node (treesit-node-on start end parser)))
         (let ((captures (treesit-query-capture
                          node match-pattern
@@ -374,17 +404,33 @@ treesit-font-lock-fontify-region
                          ;; often than not, NODE will be the root
                          ;; node, and if we don't specify the range,
                          ;; we are basically querying the whole file.
-                         start end)))
+                         start end))
+              (inhibit-point-motion-hooks t))
           (with-silent-modifications
             (dolist (capture captures)
               (let* ((face (car capture))
                      (node (cdr capture))
                      (start (treesit-node-start node))
                      (end (treesit-node-end node)))
-                (cond ((facep face)
-                       (put-text-property start end 'face face))
-                      ((functionp face)
-                       (funcall face start end node)))
+                (cond
+                 ((facep face)
+                  (pcase override
+                    ('nil (unless (text-property-not-all
+                                   start end 'face nil)
+                            (put-text-property start end 'face face)))
+                    ('t (put-text-property start end 'face face))
+                    ('append (font-lock-append-text-property
+                              start end 'face face))
+                    ('prepend (font-lock-prepend-text-property
+                               start end 'face face))
+                    ('keep (font-lock-fillin-text-property
+                            start end 'face face))
+                    (_ (signal 'treesit-font-lock-error
+                               (list
+                                "Unrecognized value of :override option"
+                                override)))))
+                 ((functionp face)
+                  (funcall face start end node)))
                 ;; Don't raise an error if FACE is neither a face nor
                 ;; a function.  This is to allow intermediate capture
                 ;; names used for #match and #eq.

commit 7a4380b9051ddd0bcc4d5c90abe0f826a9b922dc
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Oct 4 13:02:07 2022 -0700

    ; * doc/lispref/parsing.texi (Language Definitions): Fix typo.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 0511b85bd7..3784531fe5 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -83,7 +83,7 @@ Language Definitions
 @code{libtree-sitter-@var{language}.@var{ext}}, where @var{ext} is the
 system-specific extension for dynamic libraries. Also by convention,
 the function provided by that library is named
-@code{tree_sitter_@var{language}.  If a language definition doesn't
+@code{tree_sitter_@var{language}}.  If a language definition doesn't
 follow this convention, you should add an entry
 
 @example

commit 253126bf339a16589e86acd51c0f96da07e658d9
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Oct 4 12:18:53 2022 -0700

    Fix python tree-sitter font-lock
    
    Add fontification for lhs attribute and some operators.
    
    * lisp/progmodes/python.el (python--treesit-keywords): Add operators.
    (python--treesit-settings): Add lhs attribute.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 5b70c63f7b..3f85201c10 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -915,7 +915,10 @@ python--treesit-keywords
   '("as" "assert" "async" "await" "break" "class" "continue" "def"
     "del" "elif" "else" "except" "exec" "finally" "for" "from"
     "global" "if" "import" "lambda" "nonlocal" "pass" "print"
-    "raise" "return" "try" "while" "with" "yield"))
+    "raise" "return" "try" "while" "with" "yield"
+    ;; These are technically operators, but we fontify them as
+    ;; keywords.
+    "and" "in" "is" "not" "or"))
 
 (defvar python--treesit-builtins
   '("abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray"
@@ -934,6 +937,8 @@ python--treesit-constants
     "copyright" "credits" "exit" "license" "quit"))
 
 (defvar python--treesit-operators
+  ;; This is not used. And and, or, not, is, in are fontified as
+  ;; keywords.
   '("-" "-=" "!=" "*" "**" "**=" "*=" "/" "//" "//=" "/=" "&" "%" "%="
     "^" "+" "+=" "<" "<<" "<=" "<>" "=" "==" ">" ">=" ">>" "|" "~"
     "and" "in" "is" "not" "or"))
@@ -1019,6 +1024,9 @@ python--treesit-settings
      ;; Variable names.
      (assignment left: (identifier)
                  @font-lock-variable-name-face)
+     (assignment left: (attribute
+                        attribute: (identifier)
+                        @font-lock-variable-name-face))
      (pattern_list (identifier)
                    @font-lock-variable-name-face)
      (tuple_pattern (identifier)

commit 96d44c4321724556819e2f718f1d94470d753d07
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Oct 4 12:16:47 2022 -0700

    Add treesit-language-version
    
    * doc/lispref/parsing.texi (Language Definitions): Update manual.
    * src/treesit.c (Ftreesit_language_version): New function

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 05f4050b54..0511b85bd7 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -102,6 +102,15 @@ Language Definitions
 
 for a language too cool to abide by conventions.
 
+@defun treesit-language-version &optional min-compatible
+Tree-sitter library has a @dfn{language version}, a language
+definition's version needs to match this version to be compatible.
+
+This function returns tree-sitter library’s language version.  If
+@var{min-compatible} is non-nil, it returns the minimal compatible
+version.
+@end defun
+
 @heading Concrete syntax tree
 
 A syntax tree is what a parser generates.  In a syntax tree, each node
diff --git a/src/treesit.c b/src/treesit.c
index d72c99a974..77b48133ba 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -316,6 +316,20 @@ DEFUN ("treesit-language-available-p",
     return Qt;
 }
 
+DEFUN ("treesit-language-version",
+       Ftreesit_language_version,
+       Streesit_language_version,
+       0, 1, 0,
+       doc: /* Return the language version of tree-sitter library.
+If MIN-COMPATIBLE non-nil, return the minimal compatible version.  */)
+  (Lisp_Object min_compatible)
+{
+  if (NILP (min_compatible))
+    return make_fixnum (TREE_SITTER_LANGUAGE_VERSION);
+  else
+    return make_fixnum (TREE_SITTER_MIN_COMPATIBLE_LANGUAGE_VERSION);
+}
+
 /*** Parsing functions */
 
 static void

commit 10f96a8c57b031b521ae8ba5a02413b94ece423b
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Oct 1 20:29:35 2022 -0700

    Improve documentation of tree-sitter search functions
    
    * doc/lispref/parsing.texi (Retrieving Node): Update manual.
    * src/treesit.c (treesit-search-subtree)
    (treesit-search-forwardn)
    (treesit-induce-sparse-tree): Mention case-insensitivity.
    * lisp/treesit.el (treesit-simple-indent): Mention case-insensitivity.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 4ae2c4e341..05f4050b54 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -575,10 +575,10 @@ Retrieving Node
 @defun treesit-search-subtree node predicate &optional all backward limit
 This function traverses the subtree of @var{node} (including
 @var{node}), and match @var{predicate} with each node along the way.
-And @var{predicate} is a regexp that matches against each node's type,
-or a function that takes a node and returns nil/non-nil.  If a node
-matches, that node is returned, if no node ever matches, nil is
-returned.
+And @var{predicate} is a regexp that matches (case-insensitively)
+against each node's type, or a function that takes a node and returns
+nil/non-nil.  If a node matches, that node is returned, if no node
+ever matches, nil is returned.
 
 By default, this function only traverses named nodes, if @var{all} is
 non-nil, it traverses all nodes.  If @var{backward} is non-nil, it
@@ -590,8 +590,8 @@ Retrieving Node
 This function is somewhat similar to @code{treesit-search-subtree}.
 It also traverse the parse tree and match each node with
 @var{predicate} (except for @var{start}), where @var{predicate} can be
-a regexp or a function.  For a tree like the below where @var{start}
-is marked 1, this function traverses as numbered:
+a (case-insensitive) regexp or a function.  For a tree like the below
+where @var{start} is marked 1, this function traverses as numbered:
 
 @example
 @group
@@ -629,8 +629,8 @@ Retrieving Node
 Basically, it takes the subtree under @var{root}, and combs it so only
 the nodes that match @var{predicate} are left, like picking out grapes
 on the vine.  Like previous functions, @var{predicate} can be a regexp
-string that matches against each node's type, or a function that takes
-a node and return nil/non-nil.
+string that matches against each node's type case-insensitively, or a
+function that takes a node and return nil/non-nil.
 
 For example, for a subtree on the left that consist of both numbers
 and letters, if @var{predicate} is ``letter only'', the returned tree
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 4f56a14387..100bf9ac67 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -703,8 +703,8 @@ treesit-search-forward-goto
 
 Stops at the first node after point that matches PREDICATE.
 PREDICATE can be either a regexp that matches against each node's
-type, or a function that takes a node and returns nil/non-nil for
-match/no match.
+type case-insensitively, or a function that takes a node and
+returns nil/non-nil for match/no match.
 
 If a node matches, move to that node and return the node,
 otherwise return nil.  SIDE controls whether we move to the start
diff --git a/src/treesit.c b/src/treesit.c
index c9bccb123f..d72c99a974 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1973,7 +1973,8 @@ DEFUN ("treesit-search-subtree",
 
 Traverse the subtree of NODE, and match PREDICATE with each node along
 the way.  PREDICATE is a regexp string that matches against each
-node's type, or a function that takes a node and returns nil/non-nil.
+node's type case-insensitively, or a function that takes a node and
+returns nil/non-nil.
 
 By default, only traverse named nodes, if ALL is non-nil, traverse all
 nodes.  If BACKWARD is non-nil, traverse backwards.  If LIMIT is
@@ -2018,8 +2019,8 @@ DEFUN ("treesit-search-forward",
 
 Start traversing the tree from node START, and match PREDICATE with
 each node along the way (except START).  PREDICATE is a regexp string
-that matches against each node's type, or a function that takes a node
-and returns nil/non-nil.
+that matches against each node's type case-insensitively, or a
+function that takes a node and returns nil/non-nil.
 
 By default, only search for named nodes, if ALL is non-nil, search for
 all nodes.  If BACKWARD is non-nil, search backwards.
@@ -2122,7 +2123,8 @@ DEFUN ("treesit-induce-sparse-tree",
 
 Basically, take the subtree under ROOT, and comb it so only the nodes
 that match PREDICATE are left, like picking out grapes on the vine.
-PREDICATE is a regexp string that matches against each node's type.
+PREDICATE is a regexp string that matches against each node's type
+case-insensitively.
 
 For a subtree on the left that consist of both numbers and letters, if
 PREDICATE is "is letter", the returned tree is the one on the right.

commit 9b5ecffeb00f22ca6663aa14e7807c9886ed1716
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Oct 1 20:25:25 2022 -0700

    Ignore some capture name in treesit-font-lock-fontify-region
    
    * doc/lispref/modes.texi (Parser-based Font Lock): Update manual.
    * lisp/treesit.el: (treesit-font-lock-fontify-region): Ignore names
    that are not face nor function.
    (treesit-font-lock-rules): Update docstring.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index ab83d8712b..0d58c28e27 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3929,7 +3929,8 @@ Parser-based Font Lock
 case the function is called with (@var{start} @var{end} @var{node}),
 where @var{start} and @var{end} are the start and end position of the
 node in buffer, and @var{node} is the node itself.  If a capture name
-is both a face and a function, the face takes priority.
+is both a face and a function, the face takes priority.  If a capture
+name is not a face name nor a function name, it is ignored.
 @end defun
 
 @defvar treesit-font-lock-settings
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 91e3d05a51..4f56a14387 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -325,7 +325,9 @@ treesit-font-lock-rules
 which case the function is called with (START END NODE), where
 START and END are the start and end position of the node in
 buffer, and NODE is the tree-sitter node object.  If a capture
-name is both a face and a function, the face takes priority.
+name is both a face and a function, the face takes priority.  If
+a capture name is not a face name nor a function name, it is
+ignored.
 
 \(fn :KEYWORD VALUE QUERY...)"
   (let (;; Tracks the current language that following queries will
@@ -382,8 +384,10 @@ treesit-font-lock-fontify-region
                 (cond ((facep face)
                        (put-text-property start end 'face face))
                       ((functionp face)
-                       (funcall face start end node))
-                      (t (error "Capture name %s is neither a face nor a function" face)))
+                       (funcall face start end node)))
+                ;; Don't raise an error if FACE is neither a face nor
+                ;; a function.  This is to allow intermediate capture
+                ;; names used for #match and #eq.
                 (when loudly
                   (message "Fontifying text from %d to %d, Face: %s Language: %s"
                            start end face language)))))))))

commit 6a3caeab580f61f88c4ad49ff32cdf74eea4fb97
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Sep 30 17:20:34 2022 -0700

    Remove treesit-query-in
    
    Because treesit-query-capture can now do everything it does.
    
    * doc/lispref/parsing.texi (Pattern Matching): Update manual.
    * lisp/treesit.el (treesit-query-in): Remove function.
    * src/treesit.c (Ftreesit_query_capture): Accept parser and language
    symbol as NODE.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 32d151d45b..4ae2c4e341 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -867,6 +867,11 @@ Pattern Matching
 s-expression syntax and compiled query are described at the end of the
 section.
 
+Parameter @var{node} can also be a parser or a language symbol.  A
+parser means using its root node, a language symbol means find or
+create a parser for that language in the current buffer, and use the
+root node.
+
 The function returns all captured nodes in a list of
 @code{(@var{capture_name} . @var{node})}.  If @var{node-only} is
 non-nil, a list of node is returned instead.  If @var{beg} and
@@ -879,22 +884,6 @@ Pattern Matching
 error.  You can use @code{treesit-query-validate} to debug the query.
 @end defun
 
-@defun treesit-query-in source query &optional beg end node-only
-This function matches patterns in @var{query} in @var{source}, and
-returns all captured nodes in a list of @code{(@var{capture_name}
-. @var{node})}.  If @var{node-only} is non-nil, a list of node is
-returned instead.  If @var{beg} and @var{end} are both non-nil, it
-only pattern match nodes in that range.
-
-Argument @var{source} designates a node, it can be a language symbol,
-a parser, or simply a node.  If a language symbol, @var{source}
-represents the root node of the first parser for that language in the
-current buffer; if a parser, @var{source} represents the root node of
-that parser.
-
-This function also raises @var{treesit-query-error}.
-@end defun
-
 For example, suppose @var{node}'s content is @code{1 + 2}, and
 @var{query} is
 
diff --git a/lisp/treesit.el b/lisp/treesit.el
index cf586f9978..91e3d05a51 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -20,11 +20,12 @@
 ;;; Commentary:
 ;;
 ;; Note to self: we don't create parsers automatically in any provided
-;; functions.
+;; functions if we don't know what language to use.
 
 ;;; Code:
 
 (eval-when-compile (require 'cl-lib))
+(eval-when-compile (require 'subr-x)) ; For `string-join'.
 (require 'cl-seq)
 (require 'font-lock)
 
@@ -227,33 +228,6 @@ treesit-node-field-name
 
 ;;; Query API supplement
 
-(defun treesit-query-in (source query &optional beg end node-only)
-  "Query the current buffer with QUERY.
-
-SOURCE can be a language symbol, a parser, or a node.  If a
-language symbol, use the root node of the first parser for that
-language; if a parser, use the root node of that parser; if a
-node, use that node.
-
-QUERY is either a string query, a sexp query, or a compiled
-query.  See Info node `(elisp)Pattern Matching' for how to write
-a query in either string or s-expression form.  When using
-repeatedly, a compiled query is much faster than a string or sexp
-one, so it is recommend to compile your queries if it will be
-used over and over.
-
-BEG and END, if _both_ non-nil, specifies the range in which the query
-is executed.  If NODE-ONLY non-nil, return a list of nodes.
-
-Raise an treesit-query-error if QUERY is malformed."
-  (treesit-query-capture
-   (cond ((symbolp source) (treesit-buffer-root-node source))
-         ((treesit-parser-p source)
-          (treesit-parser-root-node source))
-         ((treesit-node-p source) source))
-   query
-   beg end node-only))
-
 (defun treesit-query-string (string query language)
   "Query STRING with QUERY in LANGUAGE.
 See `treesit-query-capture' for QUERY."
@@ -272,7 +246,7 @@ treesit-query-range
 of (START . END), where START and END specifics the range of each
 captured node.  Capture names don't matter."
   (cl-loop for capture
-           in (treesit-query-in source query beg end)
+           in (treesit-query-capture source query beg end)
            for node = (cdr capture)
            collect (cons (treesit-node-start node)
                          (treesit-node-end node))))
@@ -847,7 +821,7 @@ treesit-query-validate
     (with-temp-buffer
       (treesit-parser-create language)
       (condition-case err
-          (progn (treesit-query-in language query)
+          (progn (treesit-query-capture language query)
                  (message "QUERY is valid"))
         (treesit-query-error
          (with-current-buffer buf
diff --git a/src/treesit.c b/src/treesit.c
index 1a61e354cf..c9bccb123f 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1691,13 +1691,17 @@ DEFUN ("treesit-query-capture",
 BEG and END, if both non-nil, specifies the range in which the query
 is executed.  If NODE-ONLY is non-nil, return a list of nodes.
 
+Besides a node, NODE can also be a parser, then the root node of that
+parser is used; NODE can be a language symbol, then the root node of a
+parser for that language is used.  If such a parser doesn't exist, it
+is created.
+
 Signals treesit-query-error if QUERY is malformed or something else
 goes wrong.  You can use `treesit-query-validate' to debug the
 query.  */)
   (Lisp_Object node, Lisp_Object query,
    Lisp_Object beg, Lisp_Object end, Lisp_Object node_only)
 {
-  ts_check_node (node);
   if (!NILP (beg))
     CHECK_INTEGER (beg);
   if (!NILP (end))
@@ -1707,11 +1711,29 @@ DEFUN ("treesit-query-capture",
 	|| CONSP (query) || STRINGP (query)))
     wrong_type_argument (Qtreesit_query_p, query);
 
+
+  Lisp_Object lisp_node;
+  if (TS_NODEP (node))
+    lisp_node = node;
+  else if (TS_PARSERP (node))
+    lisp_node = Ftreesit_parser_root_node (node);
+  else if (SYMBOLP (node))
+    {
+      Lisp_Object parser
+	= Ftreesit_parser_create (node, Fcurrent_buffer (), Qnil);
+      lisp_node = Ftreesit_parser_root_node (parser);
+    }
+  else
+    xsignal2 (Qwrong_type_argument,
+	      list4 (Qor, Qtreesit_node_p,
+		     Qtreesit_parser_p, Qsymbolp),
+	      node);
+
   /* Extract C values from Lisp objects.  */
-  TSNode ts_node = XTS_NODE (node)->node;
-  Lisp_Object lisp_parser = XTS_NODE (node)->parser;
+  TSNode ts_node = XTS_NODE (lisp_node)->node;
+  Lisp_Object lisp_parser = XTS_NODE (lisp_node)->parser;
   ptrdiff_t visible_beg =
-    XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
+    XTS_PARSER (XTS_NODE (lisp_node)->parser)->visible_beg;
   const TSLanguage *lang = ts_parser_language
     (XTS_PARSER (lisp_parser)->parser);
 

commit e504eabe88727141e70ae9793be71d4285f839a5
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Sep 30 16:54:42 2022 -0700

    Change tree-sitter indent anchor preset 'prev-line'
    
    * doc/lispref/modes.texi: Update manual.
    * lisp/treesit.el (treesit-simple-indent-presets): Change prev-line to
    mean bol of prev-line.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index d6797fe04f..ab83d8712b 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -4820,8 +4820,8 @@ Parser-based Indentation
 prev-line
 @end example
 
-This anchor returns the start of the first named node on the previous
-line.  This can be used for indenting an empty line.
+This anchor returns the first non-whitespace charater on the previous
+line.
 @end defvar
 
 @heading Indentation utilities
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 001404d88d..cf586f9978 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -522,9 +522,7 @@ treesit-simple-indent-presets
                    (save-excursion
                      (goto-char bol)
                      (forward-line -1)
-                     (skip-chars-forward " \t")
-                     (treesit-node-start
-                      (treesit-node-at (point) nil t))))))
+                     (skip-chars-forward " \t")))))
   "A list of presets.
 These presets that can be used as MATHER and ANCHOR in
 `treesit-simple-indent-rules'.
@@ -585,8 +583,7 @@ treesit-simple-indent-presets
 
 prev-line
 
-    Find the named node on the previous line.  This can be used when
-    indenting an empty line: just indent like the previous node.")
+    The first non-whitespace charater on the previous line.")
 
 (defun treesit--simple-apply (fn args)
   "Apply ARGS to FN.

commit 6e60d464188994bdce97f1aef3b81fae3fd28583
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri Sep 30 16:51:21 2022 -0700

    Fix tree-sitter manuals
    
    * doc/lispref/modes.texi: Fix typos, reword, etc.
    * doc/lispref/parsing.texi: Fix typos, reword, etc.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 2d80a9db2f..d6797fe04f 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3886,10 +3886,7 @@ Parser-based Font Lock
 Besides simple syntactic font lock and regexp-based font lock, Emacs
 also provides complete syntactic font lock with the help of a parser,
 currently provided by the tree-sitter library (@pxref{Parsing Program
-Source}).  Because it is an optional feature, parser-based font lock
-is less integrated with Emacs.  Most variables introduced in previous
-sections only apply to regexp-based font lock, except for
-@var{font-lock-maximum-decoration}.
+Source}).
 
 @defun treesit-font-lock-enable
 This function enables parser-based font lock in the current buffer.
@@ -3923,7 +3920,7 @@ Parser-based Font Lock
 
 This function takes a list of text or s-exp queries.  Before each
 query, there are @var{:keyword} and @var{value} pairs that configures
-that query.  The @var{:lang} keyword sets the query’s language, and is
+that query.  The @code{:lang} keyword sets the query’s language, and is
 currently the only recognized keyword.
 
 Capture names in @var{query} should be face names like
@@ -3931,8 +3928,8 @@ Parser-based Font Lock
 with that face.  Capture names can also be function names, in which
 case the function is called with (@var{start} @var{end} @var{node}),
 where @var{start} and @var{end} are the start and end position of the
-node in buffer, and @var{node} is the tree-sitter node object.  If a
-capture name is both a face and a function, the face takes priority.
+node in buffer, and @var{node} is the node itself.  If a capture name
+is both a face and a function, the face takes priority.
 @end defun
 
 @defvar treesit-font-lock-settings
@@ -3948,12 +3945,11 @@ Parser-based Font Lock
 
 Each @var{setting} controls one parser (often of different language).
 And @var{language} is the language symbol (@pxref{Language
-Definitions}); @var{query} is either a string query or a sexp query
-(@pxref{Pattern Matching}).
+Definitions}); @var{query} is the query (@pxref{Pattern Matching}).
 @end defvar
 
 Multi-language major modes should provide range functions in
-@var{treesit-range-functions}, and Emacs will set the ranges
+@code{treesit-range-functions}, and Emacs will set the ranges
 accordingly before fontifing a region (@pxref{Multiple Languages}).
 
 @node Auto-Indentation
@@ -4700,8 +4696,7 @@ Parser-based Indentation
 This variable stores the actual function called by
 @code{treesit-indent}.  By default, its value is
 @code{treesit-simple-indent}.  In the future we might add other
-more complex indentation engines, if @code{treesit-simple-indent}
-proves to be insufficient.
+more complex indentation engines.
 @end defvar
 
 @heading Writing indentation rules
@@ -4714,57 +4709,37 @@ Parser-based Indentation
 (@var{language} . @var{rules})
 @end example
 
-where @var{language} is a language symbol, @var{rules} is a list of
+where @var{language} is a language symbol, and @var{rules} is a list
+of
 
 @example
 (@var{matcher} @var{anchor} @var{offset})
 @end example
 
-The @var{matcher} determines whether this rule applies, @var{anchor}
-and @var{offset} together determines which column to indent to.
-
-A @var{matcher} is a function that takes three arguments (@var{node}
-@var{parent} @var{bol}).  Argument @var{bol} is the point at where we
-are indenting: the position of the first non-whitespace character from
-the beginning of line; @var{node} is the largest (highest-in-tree)
-node that starts at that point; @var{parent} is the parent of
-@var{node};
-
-If @var{matcher} returns non-nil, meaning the rule matches, Emacs then
-uses @var{anchor} to find an anchor, it should be a function that
-takes the same argument (@var{node} @var{parent} @var{bol}) and
-returns a point.
-
-Finally Emacs computes the column of that point returned by
-@var{anchor} and adds @var{offset} to it, and indents to that column.
-
-For @var{matcher} and @var{anchor}, Emacs provides some convenient
-presets to spare us from writing these functions ourselves. They are
-stored in @var{treesit-simple-indent-presets}, see below.
+First Emacs passes the node at point to @var{matcher}, if it return
+non-nil, this rule applies.  Then Emacs passes the node to
+@var{anchor}, it returns a point.  Emacs takes the column number of
+that point, add @var{offset} to it, and the result is the indent for
+the current line.
+
+The @var{matcher} and @var{anchor} are functions, and Emacs provides
+convenient presets for them.  You can skip over to
+@code{treesit-simple-indent-presets} below, those presets should be
+more than enough.
+
+A @var{matcher} or an @var{anchor} is a function that takes three
+arguments (@var{node} @var{parent} @var{bol}).  Argument @var{bol} is
+the point at where we are indenting: the position of the first
+non-whitespace character from the beginning of line; @var{node} is the
+largest (highest-in-tree) node that starts at that point; @var{parent}
+is the parent of @var{node}.  A @var{matcher} returns nil/non-nil, and
+@var{anchor} returns a point.
 @end defvar
 
 @defvar treesit-simple-indent-presets
 This is a list of presets for @var{matcher}s and @var{anchor}s in
-@var{treesit-simple-indent-rules}. Each of them represent a
-function that takes @var{node}, @var{parent} and @var{bol} as
-arguments.
-
-@example
-(match @var{node-type} @var{parent-type}
-       @var{node-field} @var{node-index-min} @var{node-index-max})
-@end example
-
-This matcher checks if @var{node}'s type is @var{node-type},
-@var{parent}'s type is @var{parent-type}, @var{node}'s field name in
-@var{parent} is @var{node-field}, and @var{node}'s index among its
-siblings is between @var{node-index-min} and @var{node-index-max}.  If
-the value of a constraint is nil, this matcher doesn't check for that
-constraint.  For example, to match the first child where parent is
-@code{argument_list}, use
-
-@example
-(match nil "argument_list" nil nil 0 0)
-@end example
+@code{treesit-simple-indent-rules}.  Each of them represent a function
+that takes @var{node}, @var{parent} and @var{bol} as arguments.
 
 @example
 no-node
@@ -4793,6 +4768,23 @@ Parser-based Indentation
 This matcher matches if querying @var{parent} with @var{query}
 captures @var{node}.  The capture name does not matter.
 
+@example
+(match @var{node-type} @var{parent-type}
+       @var{node-field} @var{node-index-min} @var{node-index-max})
+@end example
+
+This matcher checks if @var{node}'s type is @var{node-type},
+@var{parent}'s type is @var{parent-type}, @var{node}'s field name in
+@var{parent} is @var{node-field}, and @var{node}'s index among its
+siblings is between @var{node-index-min} and @var{node-index-max}.  If
+the value of a constraint is nil, this matcher doesn't check for that
+constraint.  For example, to match the first child where parent is
+@code{argument_list}, use
+
+@example
+(match nil "argument_list" nil nil 0 0)
+@end example
+
 @example
 first-sibling
 @end example
@@ -4822,7 +4814,7 @@ Parser-based Indentation
 no-indent
 @end example
 
-This anchor returns the start of @var{node}, i.e., do not indent.
+This anchor returns the start of @var{node}, i.e., no indent.
 
 @example
 prev-line
@@ -4838,8 +4830,8 @@ Parser-based Indentation
 rules.
 
 @defun treesit-check-indent mode
-This function check current buffer's indentation against major mode
-@var{mode}.  It indents the current line in @var{mode} and compares
+This function checks current buffer's indentation against major mode
+@var{mode}.  It indents the current buffer in @var{mode} and compares
 the indentation with the current indentation.  Then it pops up a diff
 buffer showing the difference.  Correct indentation (target) is in
 green, current indentation is in red.
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 32fc6a69a5..32d151d45b 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -66,11 +66,11 @@ Language Definitions
 In order to use a language definition in Emacs, you need to make sure
 that the dynamic library is installed on the system.  Emacs looks for
 language definitions under load paths in
-@var{treesit-extra-load-path}, @var{user-emacs-directory}/tree-sitter,
+@code{treesit-extra-load-path}, @code{user-emacs-directory}/tree-sitter,
 and system default locations for dynamic libraries, in that order.
-Emacs tries each extensions in @var{treesit-load-suffixes}.  If Emacs
+Emacs tries each extensions in @code{treesit-load-suffixes}.  If Emacs
 cannot find the library or has problem loading it, Emacs signals
-@var{treesit-load-language-error}.  The signal data is a list of
+@code{treesit-load-language-error}.  The signal data is a list of
 specific error messages.
 
 @defun treesit-language-available-p language
@@ -83,14 +83,14 @@ Language Definitions
 @code{libtree-sitter-@var{language}.@var{ext}}, where @var{ext} is the
 system-specific extension for dynamic libraries. Also by convention,
 the function provided by that library is named
-@code{tree_sitter_<language>}.  If a language definition doesn't
+@code{tree_sitter_@var{language}.  If a language definition doesn't
 follow this convention, you should add an entry
 
 @example
 (@var{language} @var{library-base-name} @var{function-name})
 @end example
 
-to @var{treesit-load-name-override-list}, where
+to @code{treesit-load-name-override-list}, where
 @var{library-base-name} is the base filename for the dynamic library
 (conventionally @code{libtree-sitter-@var{language}}), and
 @var{function-name} is the function provided by the library
@@ -100,14 +100,13 @@ Language Definitions
 (cool-lang "libtree-sitter-coool" "tree_sitter_cooool")
 @end example
 
-for a language too cool to abide by the rules.
+for a language too cool to abide by conventions.
 
 @heading Concrete syntax tree
 
-A syntax tree is what a language definition defines (more or less) and
-what a parser generates.  In a syntax tree, each node represents a
-piece of text, and is connected to each other by a parent-child
-relationship.  For example, if the source text is
+A syntax tree is what a parser generates.  In a syntax tree, each node
+represents a piece of text, and is connected to each other by a
+parent-child relationship.  For example, if the source text is
 
 @example
 1 + 2
@@ -192,7 +191,7 @@ Language Definitions
 
 Authors of language definitions define the @dfn{grammar} of a
 language, and this grammar determines how does a parser construct a
-concrete syntax tree out of the text.  In order to used the syntax
+concrete syntax tree out of the text.  In order to use the syntax
 tree effectively, we need to read the @dfn{grammar file}.
 
 The grammar file is usually @code{grammar.js} in a language
@@ -319,8 +318,8 @@ Using Parser
 
 This section described how to create and configure a tree-sitter
 parser.  In Emacs, each tree-sitter parser is associated with a
-buffer.  As we edit the buffer, the associated parser is automatically
-kept up-to-date.
+buffer.  As we edit the buffer, the associated parser and the syntax
+tree is automatically kept up-to-date.
 
 @defvar treesit-max-buffer-size
 This variable contains the maximum size of buffers in which
@@ -331,14 +330,14 @@ Using Parser
 @defun treesit-can-enable-p
 This function checks whether the current buffer is suitable for
 activating tree-sitter features.  It basically checks
-@code{treesit-available-p} and @var{treesit-max-buffer-size}.
+@code{treesit-available-p} and @code{treesit-max-buffer-size}.
 @end defun
 
 @cindex Creating tree-sitter parsers
 @defun treesit-parser-create language &optional buffer no-reuse
-To create a parser, we provide a @var{buffer} to keep track of and the
-@var{language} to use (@pxref{Language Definitions}).  If @var{buffer}
-is nil, the current buffer is used.
+To create a parser, we provide a @var{buffer} and the @var{language}
+to use (@pxref{Language Definitions}).  If @var{buffer} is nil, the
+current buffer is used.
 
 By default, this function reuses a parser if one already exists for
 @var{language} in @var{buffer}, if @var{no-reuse} is non-nil, this
@@ -363,15 +362,14 @@ Using Parser
 There is no need to explicitly parse a buffer, because parsing is done
 automatically and lazily.  A parser only parses when we query for a
 node in its syntax tree.  Therefore, when a parser is first created,
-it doesn't parse the buffer; instead, it waits until we query for a
-node for the first time.  Similarly, when some change is made in the
-buffer, a parser doesn't re-parse immediately and only records some
-necessary information to later re-parse when necessary.
+it doesn't parse the buffer; it waits until we query for a node for
+the first time.  Similarly, when some change is made in the buffer, a
+parser doesn't re-parse immediately.
 
 @vindex treesit-buffer-too-large
 When a parser do parse, it checks for the size of the buffer.
 Tree-sitter can only handle buffer no larger than about 4GB.  If the
-size exceeds that, Emacs signals @var{treesit-buffer-too-large}
+size exceeds that, Emacs signals @code{treesit-buffer-too-large}
 with signal data being the buffer size.
 
 Once a parser is created, Emacs automatically adds it to the
@@ -418,9 +416,8 @@ Retrieving Node
 
 @cindex tree-sitter find node
 @cindex tree-sitter get node
-There are two ways to retrieve a node: directly from the syntax tree,
-or by traveling from other nodes.  But before we continue, lets go
-over some conventions of tree-sitter functions.
+Before we continue, lets go over some conventions of tree-sitter
+functions.
 
 We talk about a node being ``smaller'' or ``larger'', and ``lower'' or
 ``higher''.  A smaller and lower node is lower in the syntax tree and
@@ -435,11 +432,8 @@ Retrieving Node
 
 @vindex treesit-node-outdated
 Nodes are not automatically updated when the associated buffer is
-modified.  In fact, there is no way to update a node once it is
-retrieved.  It is best to use a node and throw it away and not save
-it.  A node is @dfn{outdated} if the buffer has changed since the node
-is retrieved.  Using an outdated node throws
-@var{treesit-node-outdated} error.
+modified.  And there is no way to update a node once it is retrieved.
+Using an outdated node throws @code{treesit-node-outdated} error.
 
 @heading Retrieving node from syntax tree
 
@@ -455,12 +449,13 @@ Retrieving Node
 that language in @code{(treesit-parser-list)} and use that.
 
 If @var{named} is non-nil, this function looks for a named node
-instead (@pxref{tree-sitter named node, named node}).
+only (@pxref{tree-sitter named node, named node}).
 
+Example:
 @example
 @group
 ;; Find the node at point in a C parser's syntax tree.
-(treesit-node-on (point) 'c)
+(treesit-node-at (point) 'c)
     @c @result{} #<treesit-node from 1 to 4 in *scratch*>
 @end group
 @end example
@@ -472,11 +467,11 @@ Retrieving Node
 less or equal to @var{beg}, and the end of the node is greater or
 equal to @var{end}.
 
-@emph{Beware}, Calling this function on an empty line that is not
+@emph{Beware} that calling this function on an empty line that is not
 inside any top-level construct (function definition, etc) most
 probably will give you the root node, because the root node is the
-smallest node that covers that empty line.  You probably want to use
-@code{treesit-node-at} instead.
+smallest node that covers that empty line.  Most of the time, you want
+to use @code{treesit-node-at}.
 
 When @var{parser-or-lang} is nil, this function uses the first parser
 in @code{(treesit-parser-list)} in the current buffer.  If
@@ -484,8 +479,8 @@ Retrieving Node
 @var{parser-or-lang} is a language, it finds the first parser using
 that language in @code{(treesit-parser-list)} and use that.
 
-If @var{named} is non-nil, this function looks for a named node
-instead (@pxref{tree-sitter named node, named node}).
+If @var{named} is non-nil, this function looks for a named node only
+(@pxref{tree-sitter named node, named node}).
 @end defun
 
 @defun treesit-parser-root-node parser
@@ -496,8 +491,8 @@ Retrieving Node
 @defun treesit-buffer-root-node &optional language
 This function finds the first parser that uses @var{language} in
 @code{(treesit-parser-list)} in the current buffer, and returns the
-root node of that buffer.  If it cannot find an appropriate parser, it
-returns nil.
+root node of that buffer.  If it cannot find an appropriate parser,
+nil is returned.
 @end defun
 
 Once we have a node, we can retrieve other nodes from it, or query for
@@ -524,20 +519,17 @@ Retrieving Node
 
 @defun treesit-node-children node &optional named
 This function returns all of @var{node}'s children in a list.  If
-@var{named} is non-nil, then it only retrieves named nodes
-(@pxref{tree-sitter named node, named node}).
+@var{named} is non-nil, then it only retrieves named nodes.
 @end defun
 
 @defun treesit-next-sibling node &optional named
 This function finds the next sibling of @var{node}.  If @var{named} is
-non-nil, it finds the next named sibling (@pxref{tree-sitter named
-node, named node}).
+non-nil, it finds the next named sibling.
 @end defun
 
 @defun treesit-prev-sibling node &optional named
 This function finds the previous sibling of @var{node}.  If
-@var{named} is non-nil, it finds the previous named sibling
-(@pxref{tree-sitter named node, named node}).
+@var{named} is non-nil, it finds the previous named sibling.
 @end defun
 
 @subheading By field name
@@ -564,33 +556,34 @@ Retrieving Node
 
 @defun treesit-first-child-for-pos node pos &optional named
 This function finds the first child of @var{node} that extends beyond
-@var{pos}.  ``Extend beyond'' means the end of the child node
-@code{>=} @var{pos}.  This function only looks for immediate children of
+@var{pos}.  ``Extend beyond'' means the end of the child node >=
+@var{pos}.  This function only looks for immediate children of
 @var{node}, and doesn't look in its grand children.  If @var{named} is
 non-nil, it only looks for named child (@pxref{tree-sitter named node,
 named node}).
 @end defun
 
 @defun treesit-node-descendant-for-range node beg end &optional named
-This function finds the @emph{smallest} (grand)child of @var{node}
-that spans the range from @var{beg} to @var{end}.  It is similar to
-@code{treesit-node-at}.  If @var{named} is non-nil, it only looks
-for named child (@pxref{tree-sitter named node, named node}).
+This function finds the @emph{smallest} child/grandchild... of
+@var{node} that spans the range from @var{beg} to @var{end}.  It is
+similar to @code{treesit-node-at}.  If @var{named} is non-nil, it only
+looks for named child.
 @end defun
 
 @heading Searching for node
 
 @defun treesit-search-subtree node predicate &optional all backward limit
-This function traverses the subtree of @var{node}, and match
-@var{predicate} with each node along the way.  And @var{predicate} is
-a regexp that matches against each node's type, or a function that
-takes a node and returns nil/non-nil.  If a node matches, that node is
-returned, if no node ever matches, nil is returned.
+This function traverses the subtree of @var{node} (including
+@var{node}), and match @var{predicate} with each node along the way.
+And @var{predicate} is a regexp that matches against each node's type,
+or a function that takes a node and returns nil/non-nil.  If a node
+matches, that node is returned, if no node ever matches, nil is
+returned.
 
 By default, this function only traverses named nodes, if @var{all} is
 non-nil, it traverses all nodes.  If @var{backward} is non-nil, it
-traverse backwards.  If @var{limit} is non-nil, it only traverses that
-number of levels down in the tree.
+traverses backwards.  If @var{limit} is non-nil, it only traverses
+that number of levels down in the tree.
 @end defun
 
 @defun treesit-search-forward start predicate &optional all backward up
@@ -598,7 +591,7 @@ Retrieving Node
 It also traverse the parse tree and match each node with
 @var{predicate} (except for @var{start}), where @var{predicate} can be
 a regexp or a function.  For a tree like the below where @var{start}
-is marked 1, this function will traverse as numbered:
+is marked 1, this function traverses as numbered:
 
 @example
 @group
@@ -616,8 +609,7 @@ Retrieving Node
 
 Same as in @code{treesit-search-subtree}, this function only searches
 for named nodes by default.  But if @var{all} is non-nil, it searches
-for all nodes.  And If @var{backward} is non-nil, it searches
-backwards.
+for all nodes.  If @var{backward} is non-nil, it searches backwards.
 
 If @var{up} is non-nil, this function will only traverse to siblings
 and parents.  In that case, only 1 3 4 8 would be traversed.
@@ -628,11 +620,11 @@ Retrieving Node
 that matches @var{predicate}.  Parameters @var{predicate}, @var{all},
 @var{backward}, and @var{up} are the same as in
 @code{treesit-search-forward}.  And @var{side} controls which side of
-the matched no do we stop at, it can be @code{'start} or @code{'end}.
+the matched no do we stop at, it can be @code{start} or @code{end}.
 @end defun
 
 @defun treesit-induce-sparse-tree root predicate &optional process-fn limit
-This function creates a sparse tree of @var{root}'s subtree.
+This function creates a sparse tree from @var{root}'s subtree.
 
 Basically, it takes the subtree under @var{root}, and combs it so only
 the nodes that match @var{predicate} are left, like picking out grapes
@@ -641,8 +633,8 @@ Retrieving Node
 a node and return nil/non-nil.
 
 For example, for a subtree on the left that consist of both numbers
-and letters, if @var{predicate} is ``is letter'', the returned tree is
-the one on the right.
+and letters, if @var{predicate} is ``letter only'', the returned tree
+is the one on the right.
 
 @example
 @group
@@ -661,20 +653,21 @@ Retrieving Node
 @end example
 
 If @var{process-fn} is non-nil, instead of returning the matched
-nodes, pass each node to @var{process-fn} use the return value
-instead.  If non-nil, @var{limit} is the number of levels to go down
-from @var{root}.
-
-Each node in the returned tree looks like @code{(@var{node}
-. (@var{child} ...))}.  The root of this tree might be nil, if
-@var{root} doesn't match @var{pred}.  If no node matches
-@var{predicate}, return nil.
+nodes, this function passes each node to @var{process-fn} and uses the
+returned value instead.  If non-nil, @var{limit} is the number of
+levels to go down from @var{root}.
+
+Each node in the returned tree looks like @code{(@var{tree-sitter
+node} . (@var{child} ...))}.  The @var{tree-sitter node} of the root
+of this tree will be nil if @var{ROOT} doesn't match @var{pred}.  If
+no node matches @var{predicate}, return nil.
 @end defun
 
 @heading More convenient functions
 
 @defun treesit-filter-child node pred &optional named
-This function finds children of @var{node} that satisfies @var{pred}.
+This function finds immediate children of @var{node} that satisfies
+@var{pred}.
 
 Function @var{pred} takes the child node as the argument and should
 return non-nil to indicated keeping the child.  If @var{named}
@@ -731,8 +724,7 @@ Accessing Node
 
 @defun treesit-node-text node &optional object
 Returns the buffer text that @var{node} represents.  (If @var{node} is
-retrieved from parsing a string, it will be the text from that
-string.)
+retrieved from parsing a string, it will be text from that string.)
 @end defun
 
 Here are some basic checks on tree-sitter nodes.
@@ -765,13 +757,12 @@ Accessing Node
 
 @cindex tree-sitter node that has changes
 A node ``has changes'' if the buffer changed since when the node is
-retrieved.  In this case, the node's start and end position would be
-off and we better throw it away and retrieve a new one.
+retrieved, i.e., outdated.
 
 @cindex tree-sitter node that has error
 A node ``has error'' if the text it spans contains a syntax error.  It
-can be the node itself has an error, or one of its (grand)children has
-an error.
+can be the node itself has an error, or one of its
+children/grandchildren... has an error.
 
 @defun treesit-node-check node property
 This function checks if @var{node} has @var{property}.  @var{property}
@@ -779,12 +770,13 @@ Accessing Node
 @code{'has-changes}, or @code{'has-error}.
 @end defun
 
+
+@defun treesit-node-type node
 Named nodes have ``types'' (@pxref{tree-sitter node type, node type}).
 For example, a named node can be a @code{string_literal} node, where
 @code{string_literal} is its type.
 
-@defun treesit-node-type node
-Return @var{node}'s type as a string.
+This function returns @var{node}'s type as a string.
 @end defun
 
 @heading Information as a child or parent
@@ -802,8 +794,8 @@ Accessing Node
 @end defun
 
 @defun treesit-node-field-name-for-child node n
-This is a more primitive function that returns the field name of the
-@var{n}'th child of @var{node}.
+This function returns the field name of the @var{n}'th child of
+@var{node}.
 @end defun
 
 @defun treesit-child-count node &optional named
@@ -869,10 +861,11 @@ Pattern Matching
 Now we can introduce the query functions.
 
 @defun treesit-query-capture node query &optional beg end node-only
-This function matches patterns in @var{query} in @var{node}.  Argument
-@var{query} can be either a string, a s-expression, or a compiled
-query object.  For now, we focus on the string syntax; s-expression
-syntax and compiled query are described at the end of the section.
+This function matches patterns in @var{query} in @var{node}.
+Parameter @var{query} can be either a string, a s-expression, or a
+compiled query object.  For now, we focus on the string syntax;
+s-expression syntax and compiled query are described at the end of the
+section.
 
 The function returns all captured nodes in a list of
 @code{(@var{capture_name} . @var{node})}.  If @var{node-only} is
@@ -913,7 +906,6 @@ Pattern Matching
 @end group
 @end example
 
-@noindent
 Querying that query would return
 
 @example
@@ -996,15 +988,14 @@ Pattern Matching
 that has @emph{zero or more} @code{long} keyword.
 
 @example
-(type_declaration "long"* @@long-in-type)
+(type_declaration "long"*) @@long-type
 @end example
 
-@noindent
 And this pattern matches a type declaration that has zero or one
 @code{long} keyword:
 
 @example
-(type_declaration "long"?) @@type-decl
+(type_declaration "long"?) @@long-type
 @end example
 
 @subheading Grouping
@@ -1185,12 +1176,12 @@ Pattern Matching
 error.  You can use @code{treesit-query-validate} to debug the query.
 @end defun
 
-@defun treesit-expand-query query
+@defun treesit-query-expand query
 This function expands the s-expression @var{query} into a string
 query.
 @end defun
 
-@defun treesit-expand-pattern pattern
+@defun treesit-pattern-expand pattern
 This function expands the s-expression @var{pattern} into a string
 pattern.
 @end defun
@@ -1231,7 +1222,7 @@ Multiple Languages
 
 @vindex treesit-range-invalid
 If @var{ranges} violates this constraint, or something else went
-wrong, this function signals a @var{treesit-range-invalid}.  The
+wrong, this function signals a @code{treesit-range-invalid}.  The
 signal data contains a specific error message and the ranges we are
 trying to set.
 
@@ -1279,8 +1270,8 @@ Multiple Languages
 a language symbol.
 @end defun
 
-@defun treesit-query-range source pattern &optional beg end
-This function matches @var{source} with @var{pattern} and returns the
+@defun treesit-query-range source query &optional beg end
+This function matches @var{source} with @var{query} and returns the
 ranges of captured nodes.  The return value has the same shape of
 other functions: a list of @code{(@var{beg} . @var{end})}.
 
@@ -1290,13 +1281,13 @@ Multiple Languages
 matches in the root node of that parser; if a node, this function
 matches in that node.
 
-Parameter @var{pattern} is the query pattern used to capture nodes
+Parameter @var{query} is the query used to capture nodes
 (@pxref{Pattern Matching}). The capture names don't matter.  Parameter
 @var{beg} and @var{end}, if both non-nil, limits the range in which
 this function queries.
 
 Like other query functions, this function raises an
-@var{treesit-query-error} if @var{pattern} is malformed.
+@var{treesit-query-error} if @var{query} is malformed.
 @end defun
 
 @defun treesit-language-at point
@@ -1334,12 +1325,9 @@ Multiple Languages
 @heading An example
 
 Normally, in a set of languages that can be mixed together, there is a
-major language and several embedded languages. The major language
-parses the whole document, and skips the embedded languages. Then the
-parser for the major language knows the ranges of the embedded
-languages. So we first parse the whole document with the major
-language’s parser, set ranges for the embedded languages, then parse
-the embedded languages.
+major language and several embedded languages. We first parse the
+whole document with the major language’s parser, set ranges for the
+embedded languages, then parse the embedded languages.
 
 Suppose we want to parse a very simple document that mixes HTML, CSS
 and JavaScript:

commit 9ed53535f5543910f746662618927052dd718991
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Sep 24 20:54:03 2022 -0700

    ; * lisp/progmodes/python.el (python-mode): Fix typo.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index fb91d00053..5b70c63f7b 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -6143,7 +6143,7 @@ python-mode
   (if (and python-use-tree-sitter
            (treesit-can-enable-p))
       (setq-local imenu-create-index-function
-                  #'python-treesit-imenu-create-index)
+                  #'python-imenu-treesit-create-index)
     (setq-local imenu-create-index-function
                 #'python-imenu-create-index))
 

commit 9e339415b4c068242e7cd785d2ac95420f1934ba
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Sep 24 20:52:32 2022 -0700

    Fix treesit-induce-sparse-tree
    
    Because not-at-all-werid way we implemented ts_build_sparse_tree, it’s
    return value needs a bit post-processing (i.e., reverse its cdr).
    
    * src/treesit.c (Ftreesit_induce_sparse_tree): Reverse the top-level
    children list.
    (ts_build_sparse_tree): Add comment.

diff --git a/src/treesit.c b/src/treesit.c
index 5917931e44..1a61e354cf 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -2041,7 +2041,9 @@ DEFUN ("treesit-search-forward",
 }
 
 /* Recursively traverse the tree under CURSOR, and append the result
-   subtree to PARENT's cdr.  See more in `ts_build_sparse_tree'.  */
+   subtree to PARENT's cdr.  See more in Ftreesit_induce_sparse_tree.
+   Note that the top-level children list is reversed, because
+   reasons.  */
 static void
 ts_build_sparse_tree
 (TSTreeCursor *cursor, Lisp_Object parent, Lisp_Object pred,
@@ -2151,6 +2153,7 @@ DEFUN ("treesit-induce-sparse-tree",
   ts_build_sparse_tree
     (&cursor, parent, predicate, process_fn,
      the_limit, no_limit, parser);
+  Fsetcdr (parent, Fnreverse (Fcdr (parent)));
   if (NILP (Fcdr (parent)))
     return Qnil;
   else

commit ef6e18a6b9ab103f3f076b35100d09cff1687396
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Sep 24 20:42:03 2022 -0700

    Improve treesit-search-forward-goto
    
    * doc/lispref/parsing.texi (Retrieving Node): Update manual.
    * lisp/treesit.el (treesit-search-forward-goto): Instead of taking a
    node, use the node at point, and make sure we make progress.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 868b9bc074..32fc6a69a5 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -623,33 +623,12 @@ Retrieving Node
 and parents.  In that case, only 1 3 4 8 would be traversed.
 @end defun
 
-@defun treesit-search-forward-goto start predicate side &optional all backward up
-For those who want to not only search for a node but also move to it,
-this is the function to use.  Parameter @var{start}, @var{predicate},
-@var{all}, @var{backward}, and @var{up} are the same as in
+@defun treesit-search-forward-goto predicate side &optional all backward up
+This function jumps to the start or end of the next node in buffer
+that matches @var{predicate}.  Parameters @var{predicate}, @var{all},
+@var{backward}, and @var{up} are the same as in
 @code{treesit-search-forward}.  And @var{side} controls which side of
 the matched no do we stop at, it can be @code{'start} or @code{'end}.
-
-Beware of this common pitfall:
-
-@example
-@group
-;; This will not move point forward.
-(while (treesit-search-forward-goto
-        (treesit-node-at (point))
-        "xxx"
-        'start)
-  ...)
-
-;; This is will move point forward.
-(let ((node (treesit-node-at (point))))
-  (while (setq node (treesit-search-forward-goto
-                     node "xxx" 'start))
-    ...))
-@end group
-@end example
-
-The exact reason why is left as an exercise for the reader.
 @end defun
 
 @defun treesit-induce-sparse-tree root predicate &optional process-fn limit
diff --git a/lisp/treesit.el b/lisp/treesit.el
index def2e6259e..001404d88d 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -723,13 +723,13 @@ treesit-check-indent
 ;;; Search
 
 (defun treesit-search-forward-goto
-    (start predicate side &optional all backward up)
-  "Search for node in the parse tree and move point to it.
+    (predicate side &optional all backward up)
+  "Search forward for a node and move to it.
 
-Start traversing the tree from node START, and match PREDICATE with
-each node along the way (except START).  PREDICATE can be either a
-regexp that matches against each node's type, or a function that takes
-a node and returns nil/non-nil for match/no match.
+Stops at the first node after point that matches PREDICATE.
+PREDICATE can be either a regexp that matches against each node's
+type, or a function that takes a node and returns nil/non-nil for
+match/no match.
 
 If a node matches, move to that node and return the node,
 otherwise return nil.  SIDE controls whether we move to the start
@@ -737,11 +737,24 @@ treesit-search-forward-goto
 \\='end.
 
 ALL, BACKWARD, and UP are the same as in `treesit-search-forward'."
-  (when-let ((node (treesit-search-forward
-                    start predicate all backward up)))
-    (pcase side
-      ('start (goto-char (treesit-node-start node)))
-      ('end (goto-char (treesit-node-end node))))
+  (let ((node (treesit-node-at (point)))
+        (start (point)))
+    ;; When searching forward, it is possible for (point) < start,
+    ;; because `treesit-search-forward' goes to parents.
+    (while (and node (if backward
+                         (>= (point) start)
+                       (<= (point) start)))
+      (setq node (treesit-search-forward
+                  node predicate all backward up))
+      (if-let ((pos (pcase side
+                      ('start (treesit-node-start node))
+                      ('end (treesit-node-end node)))))
+          (goto-char pos)))
+    ;; If we made reverse progress, go back to where we started.
+    (when (if backward
+              (>= (point) start)
+            (<= (point) start))
+      (goto-char start))
     node))
 
 ;;; Debugging

commit a31538ea5b006c3901ab85354725993b689a259d
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Sep 24 20:41:30 2022 -0700

    Fix treesit-search-forward
    
    * src/treesit.c (ts_search_forward): Fix return value.

diff --git a/src/treesit.c b/src/treesit.c
index f3efcbe596..5917931e44 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1920,7 +1920,7 @@ ts_traverse_sibling_helper (TSNode node, bool forward, bool named)
       (start, pred, parser, named, forward, 0, true, skip_start))
     return true;
 
-  TSNode next = ts_traverse_sibling_helper(node, forward, named);
+  TSNode next = ts_traverse_sibling_helper (node, forward, named);
   while (ts_node_is_null (next))
     {
       node = ts_node_parent (node);
@@ -1930,9 +1930,9 @@ ts_traverse_sibling_helper (TSNode node, bool forward, bool named)
       if (ts_traverse_match_predicate (node, pred, parser))
 	{
 	  *start = node;
-	  return false;
+	  return true;
 	}
-      next = ts_traverse_sibling_helper(node, forward, named);
+      next = ts_traverse_sibling_helper (node, forward, named);
     }
   if (ts_search_forward
       (&next, pred, parser, named, forward, up_only, false))

commit 795e01ac248d389a581589b13a02465a2f99202f
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Sep 24 19:41:17 2022 -0700

    Update and enable treesit-imenu function in python.el
    
    * lisp/progmodes/python.el (python--treesit-settings): Add docstring.
    (python--imenu-treesit-create-index-1): Rewrite with
    treesit-induce-sparse-tree.
    (python-imenu-treesit-create-index): Move main body to
    python--imenu-treesit-create-index-1.
    (python-imenu-treesit-create-flat-index): Fix typo.
    (python-mode): Enable treesit-imenu.  Also fix indentation for
    which-func code.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 8368f4da51..fb91d00053 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1035,7 +1035,9 @@ python--treesit-settings
                 `(seq bol (or ,@python--treesit-exceptions)
                       eol))
               @font-lock-type-face))
-     (type (identifier) @font-lock-type-face))))
+     (type (identifier) @font-lock-type-face)))
+  "Tree-sitter font-lock settings.")
+
 
 ;;; Indentation
 
@@ -5244,61 +5246,79 @@ python-imenu-create-flat-index
           (python-imenu-create-index))))))
 
 ;;; Tree-sitter imenu
-;;
-;; This works, but is slower than the native functions, presumably
-;; because traversing the parser tree is slower than scanning the
-;; text.  Also I'm sure this consumes more memory as we allocate
-;; memory for every node in the tree.
 
-(defun python--imenu-treesit-create-index (&optional node)
-  "Return tree Imenu alist for the current Python buffer.
+(defun python--imenu-treesit-create-index-1 (node)
+  "Given a sparse tree, create an imenu alist.
 
-Change `python-imenu-format-item-label-function',
-`python-imenu-format-parent-item-label-function',
-`python-imenu-format-parent-item-jump-label-function' to
-customize how labels are formatted.
+NODE is the root node of the tree returned by
+`treesit-induce-sparse-tree' (not a tree-sitter node, its car is
+a tree-sitter node).  Walk that tree and return an imenu alist.
 
-NODE is the root node of the subtree you want to build an index
-of.  If nil, use the root node of the whole parse tree.
+Return a list of ENTRY where
 
-Similar to `python-imenu-create-index' but use tree-sitter."
-  (let* ((node (or node (treesit-buffer-root-node 'python)))
-         (children (treesit-node-children node t))
-         (subtrees (mapcan #'python--imenu-treesit-create-index
+ENTRY := (NAME . MARKER)
+       | (NAME . ((JUMP-LABEL . MARKER)
+                  ENTRY
+                  ...)
+
+NAME is the function/class's name, JUMP-LABEL is like \"*function
+definition*\"."
+  (let* ((ts-node (car node))
+         (children (cdr node))
+         (subtrees (mapcan #'python--imenu-treesit-create-index-1
                            children))
-         (type (pcase (treesit-node-type node)
-                ("function_definition" 'def)
-                ("class_definition" 'class)
-                (_ nil)))
-         (name (when type
+         (type (pcase (treesit-node-type ts-node)
+                 ("function_definition" 'def)
+                 ("class_definition" 'class)))
+         ;; The root of the tree could have a nil ts-node.
+         (name (when ts-node
                  (treesit-node-text
                   (treesit-node-child-by-field-name
-                   node "name") t))))
+                   ts-node "name") t)))
+         (marker (when ts-node
+                   (set-marker (make-marker)
+                               (treesit-node-start ts-node)))))
     (cond
-     ;; 1. This node is a function/class and doesn't have children.
-     ((and type (not subtrees))
-      (let ((label
-             (funcall python-imenu-format-item-label-function
-                           type name)))
-        (list (cons label
-                    (set-marker (make-marker)
-                                (treesit-node-start node))))))
-     ;; 2. This node is a function/class and has children.
-     ((and type subtrees)
+     ((null ts-node)
+      subtrees)
+     (subtrees
       (let ((parent-label
              (funcall python-imenu-format-parent-item-label-function
                       type name))
             (jump-label
-             (funcall python-imenu-format-parent-item-jump-label-function
-                      type name)))
+             (funcall
+              python-imenu-format-parent-item-jump-label-function
+              type name)))
         `((,parent-label
-           ,(cons jump-label (set-marker (make-marker)
-                                         (treesit-node-start node)))
+           ,(cons jump-label marker)
            ,@subtrees))))
-     ;; 3. This node is not a function/class.
-     ((not type) subtrees))))
+     (t (let ((label
+               (funcall python-imenu-format-item-label-function
+                        type name)))
+          (list (cons label marker)))))))
+
+(defun python-imenu-treesit-create-index (&optional node)
+  "Return tree Imenu alist for the current Python buffer.
 
-(defun python--imenu-treesit-create-flat-index ()
+Change `python-imenu-format-item-label-function',
+`python-imenu-format-parent-item-label-function',
+`python-imenu-format-parent-item-jump-label-function' to
+customize how labels are formatted.
+
+NODE is the root node of the subtree you want to build an index
+of.  If nil, use the root node of the whole parse tree.
+
+Similar to `python-imenu-create-index' but use tree-sitter."
+  (let* ((node (or node (treesit-buffer-root-node 'python)))
+         (tree (treesit-induce-sparse-tree
+                node
+                (rx (seq bol
+                         (or "function" "class")
+                         "_definition"
+                         eol)))))
+    (python--imenu-treesit-create-index-1 tree)))
+
+(defun python-imenu-treesit-create-flat-index ()
   "Return flat outline of the current Python buffer for Imenu.
 
 Change `python-imenu-format-item-label-function',
@@ -5309,7 +5329,7 @@ python--imenu-treesit-create-flat-index
 Similar to `python-imenu-create-flat-index' but use
 tree-sitter."
   (python-imenu-create-flat-index
-   (python--imenu-treesit-create-index)))
+   (python-imenu-treesit-create-index)))
 
 ;;; Misc helpers
 
@@ -6120,14 +6140,18 @@ python-mode
   (add-hook 'post-self-insert-hook
             #'python-indent-post-self-insert-function 'append 'local)
 
-  (setq-local imenu-create-index-function
-              #'python-imenu-create-index)
+  (if (and python-use-tree-sitter
+           (treesit-can-enable-p))
+      (setq-local imenu-create-index-function
+                  #'python-treesit-imenu-create-index)
+    (setq-local imenu-create-index-function
+                #'python-imenu-create-index))
 
   (setq-local add-log-current-defun-function
               #'python-info-current-defun)
 
   (if (and python-use-tree-sitter
-             (treesit-can-enable-p))
+           (treesit-can-enable-p))
       (add-hook 'which-func-functions
                 #'python-info-treesit-current-defun nil t)
     (add-hook 'which-func-functions #'python-info-current-defun nil t))

commit f071e61d106e6f3c17b660e3aa1a5b7890ea5d41
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Sep 24 19:39:10 2022 -0700

    ; Fix docstrings in treesit.el
    
    * lisp/treesit.el (treesit-font-lock-rules)
    (treesit-inspect-mode): Fix docstrings.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 9bdff83da8..def2e6259e 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -336,10 +336,10 @@ treesit-font-lock-rules
 configure the query (and only that query).  For example,
 
     (treesit-font-lock-rules
-     :language 'javascript
-     '((true) @font-lock-constant-face
+     :language \\='javascript
+     \\='((true) @font-lock-constant-face
        (false) @font-lock-constant-face)
-     :language 'html
+     :language \\='html
      \"(script_element) @font-lock-builtin-face\")
 
 For each QUERY, a :language keyword is required.  Currently the
@@ -803,7 +803,7 @@ treesit-inspect-mode
 
 The mode-line displays
 
-    PARENT FIELD-NAME: (CHILD (GRAND-CHILD (...)))
+    PARENT FIELD-NAME: (CHILD FIELD_NAME: (GRAND-CHILD (...)))
 
 CHILD, GRAND-CHILD, and GRAND-GRAND-CHILD, etc, are nodes that
 have their beginning at point.  And PARENT is the parent of

commit eba65824364474bde89bdce5f57a772d74a2c409
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Sep 24 19:35:11 2022 -0700

    Add the treesit-search functions that supplant the removed ones
    
    The signatures also changed.
    
    treesit-traverse-depth-first   -> treesit-search-subtree
    treesit-traverse-breadth-first ->
    treesit-traverse-forward       -> treesit-search-forward
    treesit-search-forward         -> treesit-search-forward-goto
    treesit-search-beginning/end   -> treesit-search-forward-goto
                                   -> treesit-induce-sparse-tree
    
    * doc/lispref/parsing.texi (Retrieving Node): Add relevant manual
    sections.
    * lisp/treesit.el (treesit-search-forward-goto): New function.
    * src/treesit.c (ts_traverse_sibling_helper)
    (ts_traverse_match_predicate)
    (ts_search_dfs)
    (ts_search_forward)
    (treesit-search-subtree)
    (treesit-search-forward)
    (ts_build_sparse_tree)
    (Ftreesit_induce_sparse_tree): Add functions.
    * test/src/treesit-tests.el (treesit-node-supplemental): Add comments.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 0dbc70ce2d..868b9bc074 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -580,11 +580,116 @@ Retrieving Node
 
 @heading Searching for node
 
+@defun treesit-search-subtree node predicate &optional all backward limit
+This function traverses the subtree of @var{node}, and match
+@var{predicate} with each node along the way.  And @var{predicate} is
+a regexp that matches against each node's type, or a function that
+takes a node and returns nil/non-nil.  If a node matches, that node is
+returned, if no node ever matches, nil is returned.
+
+By default, this function only traverses named nodes, if @var{all} is
+non-nil, it traverses all nodes.  If @var{backward} is non-nil, it
+traverse backwards.  If @var{limit} is non-nil, it only traverses that
+number of levels down in the tree.
+@end defun
+
+@defun treesit-search-forward start predicate &optional all backward up
+This function is somewhat similar to @code{treesit-search-subtree}.
+It also traverse the parse tree and match each node with
+@var{predicate} (except for @var{start}), where @var{predicate} can be
+a regexp or a function.  For a tree like the below where @var{start}
+is marked 1, this function will traverse as numbered:
+
+@example
+@group
+              o
+              |
+     3--------4-----------8
+     |        |           |
+o--o-+--1  5--+--6    9---+-----12
+|  |    |        |    |         |
+o  o    2        7  +-+-+    +--+--+
+                    |   |    |  |  |
+                    10  11   13 14 15
+@end group
+@end example
+
+Same as in @code{treesit-search-subtree}, this function only searches
+for named nodes by default.  But if @var{all} is non-nil, it searches
+for all nodes.  And If @var{backward} is non-nil, it searches
+backwards.
 
+If @var{up} is non-nil, this function will only traverse to siblings
+and parents.  In that case, only 1 3 4 8 would be traversed.
 @end defun
 
+@defun treesit-search-forward-goto start predicate side &optional all backward up
+For those who want to not only search for a node but also move to it,
+this is the function to use.  Parameter @var{start}, @var{predicate},
+@var{all}, @var{backward}, and @var{up} are the same as in
+@code{treesit-search-forward}.  And @var{side} controls which side of
+the matched no do we stop at, it can be @code{'start} or @code{'end}.
+
+Beware of this common pitfall:
+
+@example
+@group
+;; This will not move point forward.
+(while (treesit-search-forward-goto
+        (treesit-node-at (point))
+        "xxx"
+        'start)
+  ...)
+
+;; This is will move point forward.
+(let ((node (treesit-node-at (point))))
+  (while (setq node (treesit-search-forward-goto
+                     node "xxx" 'start))
+    ...))
+@end group
+@end example
+
+The exact reason why is left as an exercise for the reader.
 @end defun
 
+@defun treesit-induce-sparse-tree root predicate &optional process-fn limit
+This function creates a sparse tree of @var{root}'s subtree.
+
+Basically, it takes the subtree under @var{root}, and combs it so only
+the nodes that match @var{predicate} are left, like picking out grapes
+on the vine.  Like previous functions, @var{predicate} can be a regexp
+string that matches against each node's type, or a function that takes
+a node and return nil/non-nil.
+
+For example, for a subtree on the left that consist of both numbers
+and letters, if @var{predicate} is ``is letter'', the returned tree is
+the one on the right.
+
+@example
+@group
+    a                 a              a
+    |                 |              |
++---+---+         +---+---+      +---+---+
+|   |   |         |   |   |      |   |   |
+b   1   2         b   |   |      b   c   d
+    |   |     =>      |   |  =>      |
+    c   +--+          c   +          e
+    |   |  |          |   |
+ +--+   d  4       +--+   d
+ |  |              |
+ e  5              e
+@end group
+@end example
+
+If @var{process-fn} is non-nil, instead of returning the matched
+nodes, pass each node to @var{process-fn} use the return value
+instead.  If non-nil, @var{limit} is the number of levels to go down
+from @var{root}.
+
+Each node in the returned tree looks like @code{(@var{node}
+. (@var{child} ...))}.  The root of this tree might be nil, if
+@var{root} doesn't match @var{pred}.  If no node matches
+@var{predicate}, return nil.
 @end defun
 
 @heading More convenient functions
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 2defd83dc6..9bdff83da8 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -722,9 +722,27 @@ treesit-check-indent
 
 ;;; Search
 
-
-
-
+(defun treesit-search-forward-goto
+    (start predicate side &optional all backward up)
+  "Search for node in the parse tree and move point to it.
+
+Start traversing the tree from node START, and match PREDICATE with
+each node along the way (except START).  PREDICATE can be either a
+regexp that matches against each node's type, or a function that takes
+a node and returns nil/non-nil for match/no match.
+
+If a node matches, move to that node and return the node,
+otherwise return nil.  SIDE controls whether we move to the start
+or end of the matches node, it can be either \\='start or
+\\='end.
+
+ALL, BACKWARD, and UP are the same as in `treesit-search-forward'."
+  (when-let ((node (treesit-search-forward
+                    start predicate all backward up)))
+    (pcase side
+      ('start (goto-char (treesit-node-start node)))
+      ('end (goto-char (treesit-node-end node))))
+    node))
 
 ;;; Debugging
 
diff --git a/src/treesit.c b/src/treesit.c
index 51261c34a2..f3efcbe596 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1805,6 +1805,358 @@ DEFUN ("treesit-query-capture",
   return Fnreverse (result);
 }
 
+/*** Navigation */
+
+/* Return the next/previous named/unnamed sibling of NODE.  FORWARD
+   controls the direction and NAMED controls the nameness.
+ */
+static TSNode
+ts_traverse_sibling_helper (TSNode node, bool forward, bool named)
+{
+  if (forward)
+    {
+      if (named)
+	return ts_node_next_named_sibling (node);
+      else
+	return ts_node_next_sibling (node);
+    }
+  else
+    {
+      if (named)
+	return ts_node_prev_named_sibling (node);
+      else
+	return ts_node_prev_sibling (node);
+    }
+}
+
+/* Return true if NODE matches PRED.  PRED can be a string or a
+   function.  This function doesn't check for PRED's type.  */
+static bool
+ts_traverse_match_predicate
+(TSNode node, Lisp_Object pred, Lisp_Object parser)
+{
+  if (STRINGP (pred))
+    {
+      const char *type = ts_node_type (node);
+      return (fast_c_string_match_ignore_case
+	      (pred, type, strlen (type)) >= 0);
+    }
+  else
+    {
+      Lisp_Object lisp_node = make_ts_node (parser, node);
+      return !NILP (CALLN (Ffuncall, pred, lisp_node));
+    }
+
+}
+
+/* Traverse the parse tree starting from ROOT (but ROOT is not
+   matches against PRED).  PRED can be a function (takes a node and
+   returns nil/non-nil),or a string (treated as regexp matching the
+   node's type, ignores case, must be all single byte characters).  If
+   the node satisfies PRED , terminate, set ROOT to that node, and
+   return true.  If no node satisfies PRED, return FALSE.  PARSER is
+   the parser of ROOT.
+
+   LIMIT is the number of levels we descend in the tree.  If NO_LIMIT
+   is true, LIMIT is ignored.  FORWARD controls the direction in which
+   we traverse the tree, true means forward, false backward.  If NAMED
+   is true, only traverse named nodes, if false, all nodes.  If
+   SKIP_ROOT is true, don't match ROOT.  */
+static bool
+ts_search_dfs
+(TSNode *root, Lisp_Object pred, Lisp_Object parser,
+ bool named, bool forward, ptrdiff_t limit, bool no_limit,
+ bool skip_root)
+{
+  /* TSTreeCursor doesn't allow us to move backward, so we can't use
+     it.  We could use limit == -1 to indicate no_limit == true, but
+     separating them is safer.  */
+  TSNode node = *root;
+
+  if (!skip_root && ts_traverse_match_predicate (node, pred, parser))
+    {
+      *root = node;
+      return true;
+    }
+
+  if (!no_limit && limit <= 0)
+    return false;
+  else
+    {
+      int count = named ?
+	ts_node_named_child_count( node)
+	: ts_node_child_count (node);
+      for (int offset=0; offset < count; offset++)
+	{
+	  uint32_t idx = forward ? offset
+	    : count - offset - 1;
+	  TSNode child = ts_node_child (node, idx);
+
+	  if (!ts_node_is_null (child)
+	      && ts_search_dfs (&child, pred, parser, named,
+				forward, limit - 1, no_limit, false))
+	    {
+	      *root = child;
+	      return true;
+	    }
+	}
+      return false;
+    }
+}
+
+/* Go thought the whole tree linearly depth first, starting from
+   START.  PRED, PARSER, NAMED, FORWARD are the same as in
+   ts_search_subtre.  If UP_ONLY is true, never go to children, only
+   sibling and parents.  If SKIP_START is true, don'tt match
+   START.  */
+static bool
+ts_search_forward
+(TSNode *start, Lisp_Object pred, Lisp_Object parser,
+ bool named, bool forward, bool up_only, bool skip_start)
+{
+  TSNode node = *start;
+
+  if (!up_only && ts_search_dfs
+      (start, pred, parser, named, forward, 0, true, skip_start))
+    return true;
+
+  TSNode next = ts_traverse_sibling_helper(node, forward, named);
+  while (ts_node_is_null (next))
+    {
+      node = ts_node_parent (node);
+      if (ts_node_is_null (node))
+	return false;
+
+      if (ts_traverse_match_predicate (node, pred, parser))
+	{
+	  *start = node;
+	  return false;
+	}
+      next = ts_traverse_sibling_helper(node, forward, named);
+    }
+  if (ts_search_forward
+      (&next, pred, parser, named, forward, up_only, false))
+    {
+      *start = next;
+      return true;
+    }
+  else
+    return false;
+}
+
+DEFUN ("treesit-search-subtree",
+       Ftreesit_search_subtree,
+       Streesit_search_subtree, 2, 5, 0,
+       doc: /* Traverse the parse tree depth-first.
+
+Traverse the subtree of NODE, and match PREDICATE with each node along
+the way.  PREDICATE is a regexp string that matches against each
+node's type, or a function that takes a node and returns nil/non-nil.
+
+By default, only traverse named nodes, if ALL is non-nil, traverse all
+nodes.  If BACKWARD is non-nil, traverse backwards.  If LIMIT is
+non-nil, we only traverse that number of levels down in the tree.
+
+Return the first matched node, or nil if none matches.  */)
+  (Lisp_Object node, Lisp_Object predicate, Lisp_Object all,
+   Lisp_Object backward, Lisp_Object limit)
+{
+  CHECK_TS_NODE (node);
+  CHECK_TYPE (STRINGP (predicate) || FUNCTIONP (predicate),
+	      list3 (Qor, Qstringp, Qfunctionp), predicate);
+  CHECK_SYMBOL (all);
+  CHECK_SYMBOL (backward);
+
+  ptrdiff_t the_limit = 0;
+  bool no_limit = false;
+  if (NILP (limit))
+      no_limit = true;
+  else
+    {
+      CHECK_FIXNUM (limit);
+      the_limit = XFIXNUM (limit);
+    }
+
+  TSNode ts_node = XTS_NODE (node)->node;
+  Lisp_Object parser = XTS_NODE (node)->parser;
+  if (ts_search_dfs
+      (&ts_node, predicate, parser, NILP (all),
+       NILP (backward), the_limit, no_limit, false))
+    {
+      return make_ts_node (parser, ts_node);
+    }
+  else
+    return Qnil;
+}
+
+DEFUN ("treesit-search-forward",
+       Ftreesit_search_forward,
+       Streesit_search_forward, 2, 5, 0,
+       doc: /* Search for node in the parse tree.
+
+Start traversing the tree from node START, and match PREDICATE with
+each node along the way (except START).  PREDICATE is a regexp string
+that matches against each node's type, or a function that takes a node
+and returns nil/non-nil.
+
+By default, only search for named nodes, if ALL is non-nil, search for
+all nodes.  If BACKWARD is non-nil, search backwards.
+
+Return the first matched node, or nil if none matches.
+
+For a tree like the below where START is marked 1, traverse as
+numbered:
+                16
+                |
+       3--------4-----------8
+       |        |           |
+  o--o-+--1  5--+--6    9---+-----12
+  |  |    |        |    |         |
+  o  o    2        7  +-+-+    +--+--+
+                      |   |    |  |  |
+                      10  11   13 14 15
+
+If UP is non-nil, only traverse to siblings and parents.  In that
+case, only 1 3 4 8 16 would be traversed.  */)
+  (Lisp_Object start, Lisp_Object predicate, Lisp_Object all,
+   Lisp_Object backward, Lisp_Object up)
+{
+  CHECK_TS_NODE (start);
+  CHECK_TYPE (STRINGP (predicate) || FUNCTIONP (predicate),
+	      list3 (Qor, Qstringp, Qfunctionp), predicate);
+  CHECK_SYMBOL (all);
+  CHECK_SYMBOL (backward);
+  CHECK_SYMBOL (up);
+
+  TSNode ts_start = XTS_NODE (start)->node;
+  Lisp_Object parser = XTS_NODE (start)->parser;
+  if (ts_search_forward
+      (&ts_start, predicate, parser, NILP (all),
+       NILP (backward), !NILP (up), true))
+    {
+      return make_ts_node (parser, ts_start);
+    }
+  else
+    return Qnil;
+}
+
+/* Recursively traverse the tree under CURSOR, and append the result
+   subtree to PARENT's cdr.  See more in `ts_build_sparse_tree'.  */
+static void
+ts_build_sparse_tree
+(TSTreeCursor *cursor, Lisp_Object parent, Lisp_Object pred,
+ Lisp_Object process_fn, ptrdiff_t limit,
+ bool no_limit, Lisp_Object parser)
+{
+
+  TSNode node = ts_tree_cursor_current_node (cursor);
+  bool match = ts_traverse_match_predicate (node, pred, parser);
+  if (match)
+    {
+      /* If this node matches pred, add a new node to the parent's
+	 children list.  */
+      Lisp_Object lisp_node = make_ts_node (parser, node);
+      if (!NILP (process_fn))
+	{
+	  lisp_node = CALLN (Ffuncall, process_fn, lisp_node);
+	}
+      Lisp_Object this = Fcons (lisp_node, Qnil);
+      Fsetcdr (parent, Fcons (this, Fcdr (parent)));
+      /* Now for children nodes, this is the new parent.  */
+      parent = this;
+    }
+  /* Go through each child.  */
+  if ((no_limit || limit > 0)
+      && ts_tree_cursor_goto_first_child (cursor))
+    {
+      do
+	{
+	  /* Make sure not to use node after the recursive funcall.
+	     Then C compilers should be smart enough not to copy NODE
+	     to stack.  */
+	  ts_build_sparse_tree
+	    (cursor, parent, pred, process_fn,
+	     limit - 1, no_limit, parser);
+	}
+      while (ts_tree_cursor_goto_next_sibling (cursor));
+      /* Don't forget to come back to this node.  */
+      ts_tree_cursor_goto_parent (cursor);
+    }
+  /* Before we go, reverse children in the sparse tree.  */
+  if (match)
+    {
+      /* When match == true, "parent" is actually the node we added in
+	 this layer (parent = this).  */
+      Fsetcdr (parent, Fnreverse (Fcdr (parent)));
+    }
+}
+
+DEFUN ("treesit-induce-sparse-tree",
+       Ftreesit_induce_sparse_tree,
+       Streesit_induce_sparse_tree, 2, 4, 0,
+       doc: /* Create a sparse tree of ROOT's subtree.
+
+Basically, take the subtree under ROOT, and comb it so only the nodes
+that match PREDICATE are left, like picking out grapes on the vine.
+PREDICATE is a regexp string that matches against each node's type.
+
+For a subtree on the left that consist of both numbers and letters, if
+PREDICATE is "is letter", the returned tree is the one on the right.
+
+	a                 a              a
+	|                 |              |
+    +---+---+         +---+---+      +---+---+
+    |   |   |         |   |   |      |   |   |
+    b   1   2         b   |   |      b   c   d
+	|   |     =>      |   |  =>      |
+	c   +--+          c   +          e
+	|   |  |          |   |
+     +--+   d  4       +--+   d
+     |  |              |
+     e  5              e
+
+If PROCESS-FN is non-nil, instead of returning the matched nodes, pass
+each node to PROCESS-FN use the return value instead.  If non-nil,
+LIMIT is the number of levels to go down from ROOT.
+
+Each node in the returned tree looks like (NODE . (CHILD ...)).  The
+root of this tree might be nil, if ROOT doesn't match PREDICATE.  If
+no node matches PRED, return nil.
+
+PREDICATE can also be a function that takes a node and returns
+nil/non-nil, but it is slower and more memory consuming than
+regexp.  */)
+  (Lisp_Object root, Lisp_Object predicate, Lisp_Object process_fn,
+   Lisp_Object limit)
+{
+  CHECK_TS_NODE (root);
+  CHECK_TYPE (STRINGP (predicate) || FUNCTIONP (predicate),
+	      list3 (Qor, Qstringp, Qfunctionp), predicate);
+
+  if (!NILP (process_fn))
+    CHECK_TYPE (FUNCTIONP (process_fn), Qfunctionp, process_fn);
+  ptrdiff_t the_limit = 0;
+  bool no_limit = false;
+  if (NILP (limit))
+      no_limit = true;
+  else
+    {
+      CHECK_FIXNUM (limit);
+      the_limit = XFIXNUM (limit);
+    }
+
+  TSTreeCursor cursor = ts_tree_cursor_new (XTS_NODE (root)->node);
+  Lisp_Object parser = XTS_NODE (root)->parser;
+  Lisp_Object parent = Fcons (Qnil, Qnil);
+  ts_build_sparse_tree
+    (&cursor, parent, predicate, process_fn,
+     the_limit, no_limit, parser);
+  if (NILP (Fcdr (parent)))
+    return Qnil;
+  else
+    return parent;
+}
+
 /*** Initialization */
 
 /* Initialize the tree-sitter routines.  */
@@ -1835,6 +2187,8 @@ syms_of_treesit (void)
 	  "user-emacs-directory");
   DEFSYM (Qtreesit_parser_deleted, "treesit-parser-deleted");
 
+  DEFSYM (Qor, "or");
+
   define_error (Qtreesit_error, "Generic tree-sitter error", Qerror);
   define_error (Qtreesit_query_error, "Query pattern is malformed",
 		Qtreesit_error);
@@ -1925,4 +2279,8 @@ syms_of_treesit (void)
   defsubr (&Streesit_query_expand);
   defsubr (&Streesit_query_compile);
   defsubr (&Streesit_query_capture);
+
+  defsubr (&Streesit_search_subtree);
+  defsubr (&Streesit_search_forward);
+  defsubr (&Streesit_induce_sparse_tree);
 }
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index fbf99ff087..6fa891a136 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -434,12 +434,17 @@ treesit-node-supplemental
     ;; `treesit-parent-while'
     ;; `treesit-node-children'
     ;; `treesit-node-field-name'
+    ;; `treesit-search-forward-goto'
     ))
 
 ;; TODO
 ;; - Functions in treesit.el
 ;; - treesit-load-name-override-list
+;; - treesit-search-subtree
 ;; - treesit-search-forward
+;; - treesit-induce-sparse-tree
+;; - treesit-search-forward
+
 
 (provide 'treesit-tests)
 ;;; treesit-tests.el ends here

commit c957832cbf3e87e5a25f7c2bdb70abd959391d98
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Sep 24 19:29:15 2022 -0700

    Remove treesit-traverse functions
    
    Remove before adding the replacements.
    
    * doc/lispref/parsing.texi (Retrieving Node): Remove relevant sections.
    * lisp/treesit.el (treesit-traverse-depth-first)
    (treesit--traverse-breadth-first-1)
    (treesit-traverse-breadth-first)
    (treesit-next-sibling-or-up)
    (treesit-traverse-forward)
    (treesit-search-forward)
    (treesit-search-beginning):
    (treesit-search-end): Remove functions.
    (treesit-defun-query): Remove variable.
    (treesit-beginning-of-defun)
    (treesit-end-of-defun): Remove functions.
    * test/src/treesit-tests.el: Remove comments.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index a83ad20281..0dbc70ce2d 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -580,34 +580,11 @@ Retrieving Node
 
 @heading Searching for node
 
-@defun treesit-search-beginning query arg &optional lang up-only
-This function searches for the next node that @var{query} captures,
-starting at point.  Use the parser in current buffer that has
-@var{lang} as its language, if @var{lang} is nil, use the first parser
-in current buffer’s buffer list.
-
-This function stops at the @var{arg}'th match.  If @var{arg} is
-negative, search backward.  If the search succeeds, stop at the
-beginning of the matched node and return the node.  Return nil if
-search failed.
-
-By default, this function searches by traversing the parse tree depth
-first, starting from the node at point.  If @var{up-only} is non-nil,
-this function only go to siblings and parents, but never go down into
-children nodes.
+
 @end defun
 
-@defun treesit-search-end query arg &optional lang up-only
-This function is like @code{treesit-search-beginning}, but stops at
-the end of the matched node.
 @end defun
 
-@defun treesit-search-forward pos-fn arg query &optional lang up-only
-This function is like @code{treesit-search-beginning} and
-@code{treesit-search-end}, but instead of stopping at the beginning or
-end of the matched node, it determines where to stop by @var{pos-fn},
-where @var{pos-fn} is a function that takes a node and returns a
-position
 @end defun
 
 @heading More convenient functions
@@ -634,73 +611,6 @@ Retrieving Node
 farthest parent that still satisfies @var{pred}.
 @end defun
 
-@cindex trees-sitter tree traversal
-@defun treesit-traverse-depth-first node pred &optional step depth
-Traverse the subtree of @var{node} depth-first. Traverse starting from
-@var{node} (i.e., @var{node} is passed to @var{pred}).  For each node
-traversed, we call @var{pred} with the node, and we stop and return
-the node if @var{pred} returns non-nil.  If no node satisfies
-@var{pred}, return nil.
-
-If @var{step} >= 0 or nil, go forward, if @var{step} < 0, go backward.
-(The quantity of @var{step} doesn't matter.)
-
-@var{depth} can be a positive integer or 0, meaning go @var{depth}
-levels deep, counting from @var{node}, or nil, meaning there is no
-limit.  For example, a value 0 means only traverse @var{node} itself,
-a value 1 means traverse @var{node} and its immediate children.
-@end defun
-
-@defun treesit-traverse-breadth-first node pred &optional step
-Traverse the subtree of @var{node} breadth-first.  Traverse starting
-from @var{node} (i.e., @var{node} is passed to @var{pred}).  For each
-node traversed, call @var{pred} with the node, stop and return the
-node if @var{pred} returns non-nil.  If no node satisfies @var{pred},
-return nil.
-
-If @var{step} >= 0 or nil, go forward, if @var{step} < 0, go backward.
-(The quantity of @var{step} doesn't matter.)
-@end defun
-
-@defun treesit-traverse-forward node pred &optional step depth
-Traverses the whole tree forward from NODE depth-first.  Traverse
-starting from @var{node} (i.e., @var{node} is passed to @var{pred}).
-For each node traversed, call @var{pred} with the node, stop and
-return the node if @var{pred} returns non-nil.  If no node satisfies
-@var{pred}, return nil.
-
-If @var{step} >= 0 or nil, go forward, if @var{step} < 0, go backward.
-(The quantity of @var{step} doesn't matter.)
-
-Traversing forward means that for a tree like the below where
-@var{node} is marked 1, traverse as numbered:
-
-@example
-@group
-                16
-                |
-       3--------4-----------8
-       |        |           |
-  o--o-+--1  5--+--6    9---+-----12
-  |  |    |        |    |         |
-  o  o    2        7  +-+-+    +--+--+
-                      |   |    |  |  |
-                      10  11   13 14 15
-@end group
-@end example
-
-@var{depth} can be a positive integer, 0, nil, or @code{'up}.  A
-positive integer or 0 means go @var{depth} deep counting from
-@var{node}.  A nil means no limit.  And a symbol @code{'up} means go
-upwards only: only traverse to sibling and parent, never go down to
-children.
-
-The difference between 0 and @code{'up} is subtle: in the above
-example, if given 0 as @var{depth}, node 1 3 4 5 6 8 9 12 16 are
-visited; if given @code{'up} as @var{depth}, only node 1 3 4 8 16 are
-visited.
-@end defun
-
 @node Accessing Node
 @section Accessing Node Information
 
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi
index 809ac207d2..7945232bf8 100644
--- a/doc/lispref/positions.texi
+++ b/doc/lispref/positions.texi
@@ -834,32 +834,6 @@ List Motion
 of using its normal method.
 @end defvar
 
-When tree-sitter support is available (@pxref{Parsing Program
-Source}), Emacs can find the beginning and end of a function according
-to the syntax tree.
-
-@defvar treesit-defun-query
-Set this variable to a tree-sitter query that matches defun
-definitions, then @code{treesit-beginning-of-defun} and
-@code{treesit-end-of-defun} can find the beginning and end of a defun.
-
-Make sure to use a compiled query for this variable, otherwise
-@code{treesit-beginning-of-defun} and @code{treesit-end-of-defun} will
-be very slow.
-@end defvar
-
-@defun treesit-beginning-of-defun &optional arg
-This function finds the beginning of a defun according to
-@var{treesit-defun-query}.  This function is suitable for the value of
-@var{beginning-of-defun-function}.
-@end defun
-
-@defun treesit-end-of-defun &optional arg
-This function finds the end of a defun according to
-@var{treesit-defun-query}.  This function is suitable for the value of
-@var{end-of-defun-function}.
-@end defun
-
 @node Skipping Characters
 @subsection Skipping Characters
 @cindex skipping characters
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 28a74657f9..2defd83dc6 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -203,130 +203,6 @@ treesit-parent-while
 
 (defalias 'treesit-traverse-parent #'treesit-parent-until)
 
-(defun treesit-traverse-depth-first (node pred &optional step depth)
-  "Traverse the subtree of NODE depth-first.
-
-Traverse starting from NODE (i.e., NODE is passed to PRED).  For
-each node traversed, call PRED with the node, stop and return the
-node if PRED returns non-nil.  If STEP >= 0 or nil, go forward,
-if STEP < 0, go backward.  If no node satisfies PRED, return
-nil.
-
-DEPTH can be a positive integer or 0, meaning go DEPTH deep
-counting from NODE; or nil, meaning there is no limit."
-  (if (and (numberp depth) (<= depth 0))
-      nil
-    (if (funcall pred node)
-        node
-      (cl-loop for child in (if (or (null step) (>= step 0))
-                                (treesit-node-children node)
-                              (nreverse (treesit-node-children node)))
-               if (treesit-traverse-depth-first
-                   child pred step (if (numberp depth) (1- depth) depth))
-               return child))))
-
-(defun treesit--traverse-breadth-first-1 (pred step queue tail)
-  "The work horse for `treesit-traverse-breadth-first'.
-PRED and STEP are the same as in
-`treesit-traverse-breadth-first'.  This function simply runes BFS
-on QUEUE: pops an element from QUEUE, append children to QUEUE,
-process the element, and next iteration.  TAIL is the pointer to
-the last cons in QUEUE, used for appending elements."
-  (cl-loop while queue
-           if (funcall pred (car queue)) return (car queue)
-           else do
-           (let ((children (if (or (null step) (>= step 0))
-                               (treesit-node-children (car queue))
-                             (nreverse (treesit-node-children (car queue))))))
-             ;; Append children to the end.
-             (setcdr tail children)
-             (setq tail (last tail))
-             ;; Pop the head off.
-             (setq queue (cdr queue)))
-           finally return nil))
-
-(defun treesit-traverse-breadth-first (node pred &optional step)
-  "Traverse the subtree of NODE breadth-first.
-
-Traverse starting from NODE (i.e., NODE is passed to PRED).  For
-each node traversed, call PRED with the node, stop and return the
-node if PRED returns non-nil.  If STEP >= 0 or nil, go forward,
-if STEP < 0, go backward.  If no node satisfies PRED, return
-nil."
-  ;; Traverse with a queue.
-  (let* ((queue (list node))
-         (tail (last queue)))
-    (treesit--traverse-breadth-first-1 pred step queue tail)))
-
-(defun treesit-next-sibling-or-up (node step)
-  "Return the next sibling of NODE.
-
-If there is no next sibling of NODE but NODE has a parent, return
-the parent.  If there is no parent, return nil.  If STEP >= 0 or
-nil, return the next sibling, if STEP < 0, return the previous
-one.
-
-Return either ('sibling node) or ('parent node)."
-  ;; First deplete siblings.
-  (if-let ((sibling (if (or (null step) (>= step 0))
-                        (treesit-node-next-sibling node)
-                      (treesit-node-prev-sibling node))))
-      (list 'sibling sibling)
-    ;; When siblings depleted, go up one level.
-    (when (treesit-node-parent node)
-      (list 'parent (treesit-node-parent node)))))
-
-(defun treesit-traverse-forward (node pred &optional step depth)
-  "Traverse the whole tree forward from NODE depth-first.
-
-Traverse starting from NODE (i.e., NODE is passed to PRED).  For
-each node traversed, call PRED with the node, stop and return the
-node if PRED returns non-nil.  If STEP >= 0 or nil, go forward,
-if STEP < 0, go backward.  If no node satisfies PRED, return
-nil.
-
-Traversing forward depth-first means that for a tree like the
-below where NODE is marked 1, traverse as numbered:
-
-                16
-                |
-       3--------4-----------8
-       |        |           |
-  o--o-+--1  5--+--6    9---+-----12
-  |  |    |        |    |         |
-  o  o    2        7  +-+-+    +--+--+
-                      |   |    |  |  |
-                      10  11   13 14 15
-DEPTH can be a positive integer, 0, nil, or \\='up.  A positive
-integer or 0 means go DEPTH deep counting from NODE.  A nil means
-no limit.  And a symbol \\='up means go upwards only: only traverse
-sibling and parent, never go down to children.
-
-The difference between 0 and \\='up is subtle: in the above example,
-if given 0 as DEPTH, node 1 3 4 5 6 8 9 12 16 are visited; if
-given \\='up as DEPTH, only node 1 3 4 8 16 are visited."
-  ;; First try NODE's subtree, but only under these conditions: if
-  ;; DEPTH is a number, it has to be greater than 0, if it's a symbol,
-  ;; it cannot be 'up.
-  (or (and (if (numberp depth) (> depth 0) (not (eq depth 'up)))
-           (treesit-traverse-depth-first node pred step depth))
-      ;; If no match, try the next node: next sibling, or parent if no
-      ;; next sibling exists.
-      (catch 'match
-        (let ((next (list nil node)))
-          ;; If NEXT is parent, call PRED on it and keep going.  We
-          ;; can always go to parent, regardless the value of DEPTH.
-          (while (and (setq next (treesit-next-sibling-or-up
-                                  (cadr next) step))
-                      (eq (car next) 'parent))
-            (when (numberp depth) (cl-incf depth))
-            (when (funcall pred (cadr next))
-              (throw 'match (cadr next))))
-          (when next
-            ;; If NEXT is non-nil, it must be ('sibling node).
-            (treesit-traverse-forward
-             (cadr next) pred step depth))))))
-
 (defun treesit-node-children (node &optional named)
   "Return a list of NODE's children.
 If NAMED is non-nil, collect named child only."
@@ -846,138 +722,9 @@ treesit-check-indent
 
 ;;; Search
 
-;; TODO: It might be more performant if we implement this in C.
-(defun treesit-search-forward (pos-fn arg query &optional lang up-only)
-  "Search forward for nodes that matches QUERY from current point.
-
-QUERY has to capture the node to match.  LANG specifies the
-language in which we search for nodes.  If LANG is nil, use the
-first parser in (`treesit-parser-list').
-
-Move forward/backward ARG times, positive ARG means go forward,
-negative ARG means go backward.
-
-POS-FN can be either `treesit-node-start' or `treesit-node-end',
-or any function that takes a node and returns a position.
-
-If the search succeeds, stop at the position returned by POS-FN and
-return the matched node.  Return nil if search failed.
-
-We search by traversing the parse tree, visiting every node
-that's after (or before) the smallest node at point (retrieved by
-`treesit-node-at').  If UP-ONLY is non-nil, only go to sibling or
-parent in the tree, never go down into children when traversing
-the tree."
-  (cl-loop for idx from 1 to (abs arg)
-           for parser = (if lang
-                            (treesit-parser-create lang)
-                          (car (treesit-parser-list)))
-           for node =
-           (if-let ((starting-point (point))
-                    (node (treesit-node-at (point) parser t)))
-               (treesit-traverse-forward
-                node
-                (lambda (node)
-                  (and (not (eq (funcall pos-fn node)
-                                starting-point))
-                       (cl-loop
-                        for cap-node in
-                        (mapcar
-                         #'cdr
-                         (treesit-query-capture node query))
-                        if (and (treesit-node-eq cap-node node)
-                                (if (> arg 0)
-                                    ;; Make sure we moved forward.
-                                    (> (funcall pos-fn node)
-                                       starting-point)
-                                  ;; Make sure we moved backward.
-                                  (< (funcall pos-fn node)
-                                     starting-point)))
-                        return t)))
-                ;; The AND form converts non-nil/nil into t/nil.
-                arg (and up-only t)))
-           for pos = (funcall pos-fn node)
-           ;; If we can find a match, jump to it.
-           if pos do (goto-char pos)
-           else return nil
-           ;; Return t to indicate that search is successful.
-           finally return node))
-
-(defun treesit-search-beginning (query arg &optional lang up-only)
-  "Search forward for nodes that matches QUERY.
-
-Stops at the beginning of matched node.
-
-QUERY has to capture the node to match.  LANG specifies the
-language in which we search for nodes.  If LANG is nil, use the
-first parser in current buffer's parser list.
-
-Move forward/backward ARG times, positive ARG means go forward,
-negative ARG means go backward.
-
-If the search succeeds, return the matched node.  Return nil if
-search failed.
-
-We search by traversing the parse tree, visiting every node
-that's after (or before) the smallest node at point (retrieved by
-`treesit-node-at').  If UP-ONLY is non-nil, only go to sibling or
-parent in the tree, never go down into children when traversing
-the tree."
-  (treesit-search-forward #'treesit-node-start arg query lang
-                          up-only))
-
-(defun treesit-search-end (query arg &optional lang up-only)
-  "Search forward for nodes that matches QUERY.
-
-Stops at the end of matched node.
-
-QUERY has to capture the node to match.  LANG specifies the
-language in which we search for nodes.  If LANG is nil, use the
-first parser in (`treesit-parser-list').
-
-Move forward/backward ARG times, positive ARG means go forward,
-negative ARG means go backward.
-
-If the search succeeds, return the matched node.  Return nil if
-search failed.
-
-We search by traversing the parse tree, visiting every node
-that's after (or before) the smallest node at point (retrieved by
-`treesit-node-at').  If UP-ONLY is non-nil, only go to sibling or
-parent in the tree, never go down into children when traversing
-the tree."
-  (treesit-search-forward #'treesit-node-end arg query lang
-                          up-only))
-
-;;; Navigation
-
-(defvar-local treesit-defun-query nil
-  "A tree-sitter query that matches function/class definitions.
-Capture names don't matter.  This variable is used by navigation
-functions like `treesit-beginning-of-defun'.
-
-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.
-
-With ARG, do it that many times.  Negative ARG means move forward
-to the ARGth following beginning of defun.  Defun is defined
-according to `treesit-defun-query'."
-  (unless treesit-defun-query
-    (error "Variable `treesit-defun-query' is unset"))
-  (treesit-search-beginning treesit-defun-query (- (or arg 1)) nil t))
-
-(defun treesit-end-of-defun (&optional arg)
-  "Move forward to the end of a defun.
-
-With ARG, do it that many times.  Negative ARG means move back to
-ARGth preceding end of defun.  Defun is defined according to
-`treesit-defun-query'."
-  (unless treesit-defun-query
-    (error "Variable `treesit-defun-query' is unset"))
-  (treesit-search-end treesit-defun-query (or arg 1) nil t))
+
+
+
 
 ;;; Debugging
 
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index aea417d47e..fbf99ff087 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -434,20 +434,12 @@ treesit-node-supplemental
     ;; `treesit-parent-while'
     ;; `treesit-node-children'
     ;; `treesit-node-field-name'
-    ;; `treesit-next-sibling-or-up'
-    ;; `treesit-traverse-depth-first'
-    ;; `treesit-traverse-breadth-first'
-    ;; `treesit-traverse-forward-depth-first'
     ))
 
 ;; TODO
 ;; - Functions in treesit.el
 ;; - treesit-load-name-override-list
 ;; - treesit-search-forward
-;; - treesit-search-beginning
-;; - treesit-search-end
-;; - treesit-beginning-of-defun
-;; - treesit-end-of-defun
 
 (provide 'treesit-tests)
 ;;; treesit-tests.el ends here

commit 1575ee2eeb1ebb5b73b4b76fc7dc7f5702748540
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Sep 24 19:24:06 2022 -0700

    Accept nil as NODE in treesit-node-text
    
    * lisp/treesit.el (treesit-node-text): Just wrap function body
    in (when ...).

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 9750ac7b7b..28a74657f9 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -172,14 +172,15 @@ treesit-filter-child
 (defun treesit-node-text (node &optional no-property)
   "Return the buffer (or string) content corresponding to NODE.
 If NO-PROPERTY is non-nil, remove text properties."
-  (with-current-buffer (treesit-node-buffer node)
-    (if no-property
-        (buffer-substring-no-properties
+  (when node
+    (with-current-buffer (treesit-node-buffer node)
+      (if no-property
+          (buffer-substring-no-properties
+           (treesit-node-start node)
+           (treesit-node-end node))
+        (buffer-substring
          (treesit-node-start node)
-         (treesit-node-end node))
-      (buffer-substring
-       (treesit-node-start node)
-       (treesit-node-end node)))))
+         (treesit-node-end node))))))
 
 (defun treesit-parent-until (node pred)
   "Return the closest parent of NODE that satisfies PRED.

commit 17422c2cfcbf1670ba4dbe3ecdf3c5ff719201cc
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Sep 24 19:23:21 2022 -0700

    ; * src/treesit.c (Ftreesit_node_field_name_for_child): Doc fix.

diff --git a/src/treesit.c b/src/treesit.c
index 625a7932ae..51261c34a2 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1147,7 +1147,7 @@ DEFUN ("treesit-node-field-name-for-child",
        Streesit_node_field_name_for_child, 2, 2, 0,
        doc: /* Return the field name of the Nth child of NODE.
 
-Return nil if there isn't any child or no field is found.
+Return nil if not any child or no field is found.
 If NODE is nil, return nil.  */)
   (Lisp_Object node, Lisp_Object n)
 {

commit b584569014abb1fe9f59decd86ea097a189d9bb5
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Sep 24 19:22:49 2022 -0700

    Change make_string to build_string in treesit.c
    
    * src/treesit.c (Ftreesit_node_string)
    (Ftreesit_node_field_name_for_child): Change make_string to
    build_string.

diff --git a/src/treesit.c b/src/treesit.c
index eb323e6360..625a7932ae 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1053,7 +1053,7 @@ DEFUN ("treesit-node-string",
   ts_check_node (node);
   TSNode ts_node = XTS_NODE (node)->node;
   char *string = ts_node_string (ts_node);
-  return make_string (string, strlen (string));
+  return build_string (string);
 }
 
 DEFUN ("treesit-node-parent",
@@ -1163,7 +1163,7 @@ DEFUN ("treesit-node-field-name-for-child",
   if (name == NULL)
     return Qnil;
 
-  return make_string (name, strlen (name));
+  return build_string (name);
 }
 
 DEFUN ("treesit-node-child-count",

commit 914f68da059d5aeed3459e3944769aa4370a4075
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Sep 24 19:20:59 2022 -0700

    ; Minor tree-sitter manual fix
    
    * doc/lispref/parsing.texi (Retrieving Node): Remove the quote.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index ac156d9996..a83ad20281 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -617,7 +617,7 @@ Retrieving Node
 
 Function @var{pred} takes the child node as the argument and should
 return non-nil to indicated keeping the child.  If @var{named}
-non-nil, this function only searches for named nodes."
+non-nil, this function only searches for named nodes.
 @end defun
 
 @defun treesit-parent-until node pred

commit c5147882a91e51b59c7da035e9ef38a4731b943d
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Sep 24 19:20:06 2022 -0700

    ; Minor manual fix for tree-sitter indent
    
    * doc/lispref/modes.texi (Parser-based Indentation): Change var to
    code.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 45a44acf54..2d80a9db2f 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -4694,7 +4694,7 @@ Parser-based Indentation
 and the engine takes care of the rest.
 
 To enable the indentation engine, set the value of
-@var{indent-line-function} to @code{treesit-indent}.
+@code{indent-line-function} to @code{treesit-indent}.
 
 @defvar treesit-indent-function
 This variable stores the actual function called by

commit 08a1c32d0bcaa9369a34e7f7d6d01c3885f62e21
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Sep 24 19:19:03 2022 -0700

    Improve printing treesit nodes
    
    * src/print.c (print_vectorlike): Instead of position, print the type
    of the node.

diff --git a/src/print.c b/src/print.c
index 12b5087435..4f41448d86 100644
--- a/src/print.c
+++ b/src/print.c
@@ -2024,12 +2024,15 @@ print_vectorlike (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag,
       printchar ('>', printcharfun);
       break;
     case PVEC_TS_NODE:
-      print_c_string ("#<treesit-node from ", printcharfun);
-      print_object (Ftreesit_node_start (obj),
-		    printcharfun, escapeflag);
-      print_c_string (" to ", printcharfun);
-      print_object (Ftreesit_node_end (obj),
-		    printcharfun, escapeflag);
+      /* Prints #<treesit-node (identifier) in #<buffer xxx>> or
+         #<treesit-node "keyword" in #<buffer xxx>>. */
+      print_c_string ("#<treesit-node ", printcharfun);
+      bool named = ts_node_is_named (XTS_NODE (obj)->node);
+      const char *delim1 = named ? "(" : "\"";
+      const char *delim2 = named ? ")" : "\"";
+      print_c_string (delim1, printcharfun);
+      print_string (Ftreesit_node_type (obj), printcharfun);
+      print_c_string (delim2, printcharfun);
       print_c_string (" in ", printcharfun);
       print_object (XTS_PARSER (XTS_NODE (obj)->parser)->buffer,
 		    printcharfun, escapeflag);

commit 013c7d6aaef5f90730b1cfe42a01534d891e895a
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Sep 20 18:01:15 2022 -0700

    Rename treesit-expand-query/pattern
    
    * src/treesit.c (treesit-expand-pattern): Rename to
    treesit-patter-expand.
    (treesit-expand-query): Rename to treesit-query-expand.
    (make_ts_query): Use new name.
    * test/src/treesit-tests.el (treesit-query-api): Fix name.

diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index ebfe650dc0..aea417d47e 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -163,11 +163,11 @@ treesit-query-api
                             (treesit-node-text
                              (cdr entry))))
                     (treesit-query-capture root-node query))))))
-      ;; Test `treesit-expand-query'.
+      ;; Test `treesit-query-expand'.
       (should
        (equal
         "(type field: (_) @capture .) ? * + \"return\""
-        (treesit-expand-query
+        (treesit-query-expand
          '((type field: (_) @capture :anchor)
            :? :* :+ "return")))))))
 

commit 1cdb24fe35a9ff2e4f92c5acc93a5a5b0e70d93f
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Sep 22 11:24:32 2022 -0700

    Utilize tree-sitter in python.el
    
    * lisp/progmodes/python.el (python-use-tree-sitter): New option.
    (python--treesit-keywords, python--treesit-builtins)
    (python--treesit-constants, python--treesit-operators)
    (python--treesit-special-attributes, python--treesit-exceptions): New
    variables.
    (python--treesit-fontify-string, python--treesit-settings)
    (python--imenu-treesit-create-index)
    (python--imenu-treesit-create-flat-index)
    (python-info-treesit-current-defun): New functions.
    (python-mode): Enable tree-sitter font-lock and which-func.

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index d3ffc2db2c..8368f4da51 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -245,7 +245,9 @@
 (require 'ansi-color)
 (require 'cl-lib)
 (require 'comint)
-(eval-when-compile (require 'subr-x))   ;For `string-empty-p'.
+(eval-when-compile (require 'subr-x))   ;For `string-empty-p' and `string-join'.
+(require 'treesit)
+(require 'pcase)
 
 ;; Avoid compiler warnings
 (defvar compilation-error-regexp-alist)
@@ -265,6 +267,11 @@ python
   :version "24.3"
   :link '(emacs-commentary-link "python"))
 
+(defcustom python-use-tree-sitter nil
+  "If non-nil, `python-mode' tries to use tree-sitter.
+Currently `python-mode' uses tree-sitter for font-locking, imenu,
+and movement functions."
+  :type 'boolean)
 
 
 ;;; Bindings
@@ -899,6 +906,136 @@ python-dotty-syntax-table
   "Dotty syntax table for Python files.
 It makes underscores and dots word constituent chars.")
 
+;;; Tree-sitter font-lock
+
+;; NOTE: Tree-sitter and font-lock works differently so this can't
+;; merge with `python-font-lock-keywords-level-2'.
+
+(defvar python--treesit-keywords
+  '("as" "assert" "async" "await" "break" "class" "continue" "def"
+    "del" "elif" "else" "except" "exec" "finally" "for" "from"
+    "global" "if" "import" "lambda" "nonlocal" "pass" "print"
+    "raise" "return" "try" "while" "with" "yield"))
+
+(defvar python--treesit-builtins
+  '("abs" "all" "any" "ascii" "bin" "bool" "breakpoint" "bytearray"
+    "bytes" "callable" "chr" "classmethod" "compile" "complex"
+    "delattr" "dict" "dir" "divmod" "enumerate" "eval" "exec"
+    "filter" "float" "format" "frozenset" "getattr" "globals"
+    "hasattr" "hash" "help" "hex" "id" "input" "int" "isinstance"
+    "issubclass" "iter" "len" "list" "locals" "map" "max"
+    "memoryview" "min" "next" "object" "oct" "open" "ord" "pow"
+    "print" "property" "range" "repr" "reversed" "round" "set"
+    "setattr" "slice" "sorted" "staticmethod" "str" "sum" "super"
+    "tuple" "type" "vars" "zip" "__import__"))
+
+(defvar python--treesit-constants
+  '("Ellipsis" "False" "None" "NotImplemented" "True" "__debug__"
+    "copyright" "credits" "exit" "license" "quit"))
+
+(defvar python--treesit-operators
+  '("-" "-=" "!=" "*" "**" "**=" "*=" "/" "//" "//=" "/=" "&" "%" "%="
+    "^" "+" "+=" "<" "<<" "<=" "<>" "=" "==" ">" ">=" ">>" "|" "~"
+    "and" "in" "is" "not" "or"))
+
+(defvar python--treesit-special-attributes
+  '("__annotations__" "__closure__" "__code__"
+    "__defaults__" "__dict__" "__doc__" "__globals__"
+    "__kwdefaults__" "__name__" "__module__" "__package__"
+    "__qualname__" "__all__"))
+
+(defvar python--treesit-exceptions
+  '(;; Python 2 and 3:
+    "ArithmeticError" "AssertionError" "AttributeError" "BaseException"
+    "BufferError" "BytesWarning" "DeprecationWarning" "EOFError"
+    "EnvironmentError" "Exception" "FloatingPointError" "FutureWarning"
+    "GeneratorExit" "IOError" "ImportError" "ImportWarning"
+    "IndentationError" "IndexError" "KeyError" "KeyboardInterrupt"
+    "LookupError" "MemoryError" "NameError" "NotImplementedError"
+    "OSError" "OverflowError" "PendingDeprecationWarning"
+    "ReferenceError" "RuntimeError" "RuntimeWarning" "StopIteration"
+    "SyntaxError" "SyntaxWarning" "SystemError" "SystemExit" "TabError"
+    "TypeError" "UnboundLocalError" "UnicodeDecodeError"
+    "UnicodeEncodeError" "UnicodeError" "UnicodeTranslateError"
+    "UnicodeWarning" "UserWarning" "ValueError" "Warning"
+    "ZeroDivisionError"
+    ;; Python 2:
+    "StandardError"
+    ;; Python 3:
+    "BlockingIOError" "BrokenPipeError" "ChildProcessError"
+    "ConnectionAbortedError" "ConnectionError" "ConnectionRefusedError"
+    "ConnectionResetError" "FileExistsError" "FileNotFoundError"
+    "InterruptedError" "IsADirectoryError" "NotADirectoryError"
+    "PermissionError" "ProcessLookupError" "RecursionError"
+    "ResourceWarning" "StopAsyncIteration" "TimeoutError"
+    ;; OS specific
+    "VMSError" "WindowsError"
+    ))
+
+(defun python--treesit-fontify-string (beg end _)
+  "Fontify string between BEG and END.
+Do not fontify the initial f for f-strings."
+  (let ((beg (if (eq (char-after beg) ?f)
+                 (1+ beg) beg)))
+    (put-text-property beg end 'face 'font-lock-string-face)))
+
+(defvar python--treesit-settings
+  (treesit-font-lock-rules
+   :language 'python
+   `(;; Queries for def and class.
+     (function_definition
+      name: (identifier) @font-lock-function-name-face)
+
+     (class_definition
+      name: (identifier) @font-lock-type-face)
+
+     ;; Comment and string.
+     (comment) @font-lock-comment-face
+
+     (string) @python--treesit-fontify-string
+     ((string) @font-lock-doc-face
+      (:match "^\"\"\"" @font-lock-doc-face))
+     (interpolation (identifier) @font-lock-variable-name-face)
+
+     ;; Keywords, builtins, and constants.
+     [,@python--treesit-keywords] @font-lock-keyword-face
+
+     ((identifier) @font-lock-keyword-face
+      (:match "^self$" @font-lock-keyword-face))
+
+     ((identifier) @font-lock-builtin-face
+      (:match ,(rx-to-string
+                `(seq bol
+                      (or ,@python--treesit-builtins
+                          ,@python--treesit-special-attributes)
+                      eol))
+              @font-lock-builtin-face))
+
+     [(true) (false) (none)] @font-lock-constant-face
+
+     ;; Escape sequences
+     (escape_sequence) @font-lock-constant-face
+
+     ;; Variable names.
+     (assignment left: (identifier)
+                 @font-lock-variable-name-face)
+     (pattern_list (identifier)
+                   @font-lock-variable-name-face)
+     (tuple_pattern (identifier)
+                    @font-lock-variable-name-face)
+     (list_pattern (identifier)
+                   @font-lock-variable-name-face)
+     (list_splat_pattern (identifier)
+                         @font-lock-variable-name-face)
+
+     ;; Types and decorators.
+     (decorator) @font-lock-type-face
+     ((identifier) @font-lock-type-face
+      (:match ,(rx-to-string
+                `(seq bol (or ,@python--treesit-exceptions)
+                      eol))
+              @font-lock-type-face))
+     (type (identifier) @font-lock-type-face))))
 
 ;;; Indentation
 
@@ -5106,6 +5243,73 @@ python-imenu-create-flat-index
               (python-imenu-format-parent-item-jump-label-function fn))
           (python-imenu-create-index))))))
 
+;;; Tree-sitter imenu
+;;
+;; This works, but is slower than the native functions, presumably
+;; because traversing the parser tree is slower than scanning the
+;; text.  Also I'm sure this consumes more memory as we allocate
+;; memory for every node in the tree.
+
+(defun python--imenu-treesit-create-index (&optional node)
+  "Return tree Imenu alist for the current Python buffer.
+
+Change `python-imenu-format-item-label-function',
+`python-imenu-format-parent-item-label-function',
+`python-imenu-format-parent-item-jump-label-function' to
+customize how labels are formatted.
+
+NODE is the root node of the subtree you want to build an index
+of.  If nil, use the root node of the whole parse tree.
+
+Similar to `python-imenu-create-index' but use tree-sitter."
+  (let* ((node (or node (treesit-buffer-root-node 'python)))
+         (children (treesit-node-children node t))
+         (subtrees (mapcan #'python--imenu-treesit-create-index
+                           children))
+         (type (pcase (treesit-node-type node)
+                ("function_definition" 'def)
+                ("class_definition" 'class)
+                (_ nil)))
+         (name (when type
+                 (treesit-node-text
+                  (treesit-node-child-by-field-name
+                   node "name") t))))
+    (cond
+     ;; 1. This node is a function/class and doesn't have children.
+     ((and type (not subtrees))
+      (let ((label
+             (funcall python-imenu-format-item-label-function
+                           type name)))
+        (list (cons label
+                    (set-marker (make-marker)
+                                (treesit-node-start node))))))
+     ;; 2. This node is a function/class and has children.
+     ((and type subtrees)
+      (let ((parent-label
+             (funcall python-imenu-format-parent-item-label-function
+                      type name))
+            (jump-label
+             (funcall python-imenu-format-parent-item-jump-label-function
+                      type name)))
+        `((,parent-label
+           ,(cons jump-label (set-marker (make-marker)
+                                         (treesit-node-start node)))
+           ,@subtrees))))
+     ;; 3. This node is not a function/class.
+     ((not type) subtrees))))
+
+(defun python--imenu-treesit-create-flat-index ()
+  "Return flat outline of the current Python buffer for Imenu.
+
+Change `python-imenu-format-item-label-function',
+`python-imenu-format-parent-item-label-function',
+`python-imenu-format-parent-item-jump-label-function' to
+customize how labels are formatted.
+
+Similar to `python-imenu-create-flat-index' but use
+tree-sitter."
+  (python-imenu-create-flat-index
+   (python--imenu-treesit-create-index)))
 
 ;;; Misc helpers
 
@@ -5171,6 +5375,29 @@ python-info-current-defun
              (concat (and type (format "%s " type))
                      (mapconcat #'identity names ".")))))))
 
+(defun python-info-treesit-current-defun (&optional include-type)
+  "Identical to `python-info-current-defun' but use tree-sitter.
+For INCLUDE-TYPE see `python-info-current-defun'."
+  (let ((node (treesit-node-at (point)))
+        (name-list ())
+        (type 'def))
+    (cl-loop while node
+             if (pcase (treesit-node-type node)
+                  ("function_definition"
+                   (setq type 'def))
+                  ("class_definition"
+                   (setq type 'class))
+                  (_ nil))
+             do (push (treesit-node-text
+                       (treesit-node-child-by-field-name node "name")
+                       t)
+                      name-list)
+             do (setq node (treesit-node-parent node))
+             finally return (concat (if include-type
+                                        (format "%s " type)
+                                      "")
+                                    (string-join name-list ".")))))
+
 (defun python-info-current-symbol (&optional replace-self)
   "Return current symbol using dotty syntax.
 With optional argument REPLACE-SELF convert \"self\" to current
@@ -5851,13 +6078,20 @@ python-mode
 
   (setq-local forward-sexp-function python-forward-sexp-function)
 
-  (setq-local font-lock-defaults
+  (if (and python-use-tree-sitter
+           (treesit-can-enable-p))
+      (progn
+        (setq-local font-lock-defaults '(nil t))
+        (setq-local treesit-font-lock-settings
+                    python--treesit-settings)
+        (treesit-font-lock-enable))
+    (setq-local font-lock-defaults
               `(,python-font-lock-keywords
                 nil nil nil nil
                 (font-lock-syntactic-face-function
                  . python-font-lock-syntactic-face-function)
                 (font-lock-extend-after-change-region-function
-                 . python-font-lock-extend-region)))
+                 . python-font-lock-extend-region))))
 
   (setq-local syntax-propertize-function
               python-syntax-propertize-function)
@@ -5892,7 +6126,11 @@ python-mode
   (setq-local add-log-current-defun-function
               #'python-info-current-defun)
 
-  (add-hook 'which-func-functions #'python-info-current-defun nil t)
+  (if (and python-use-tree-sitter
+             (treesit-can-enable-p))
+      (add-hook 'which-func-functions
+                #'python-info-treesit-current-defun nil t)
+    (add-hook 'which-func-functions #'python-info-current-defun nil t))
 
   (setq-local skeleton-further-elements
               '((abbrev-mode nil)

commit 361eaae71e30d9554bb78d9ccaeddf3e006115c0
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Sep 20 18:10:01 2022 -0700

    Improve treesit-query-capture
    
    * src/treesit.c (Ftreesit_query_capture): Add a suggestion in the
    signal message.

diff --git a/src/treesit.c b/src/treesit.c
index 775f823fb3..eb323e6360 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1727,10 +1727,11 @@ DEFUN ("treesit-query-capture",
 				  &error_offset, &error_type);
       if (lisp_query == NULL)
 	{
-	  xsignal2 (Qtreesit_query_error,
+	  xsignal3 (Qtreesit_query_error,
 		    build_string
 		    (ts_query_error_to_string (error_type)),
-		    make_fixnum (error_offset + 1));
+		    make_fixnum (error_offset + 1),
+		    build_pure_c_string("Debug the query with `treesit-query-validate'"));
 	}
       /* We don't need need to free TS_QUERY and CURSOR, they are stored
 	 in a lisp object, which is tracked by gc.  */

commit cb0464bf4248a8c48e3da2dd0c502091e4ec489a
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Sep 20 18:02:16 2022 -0700

    Fix treesit-query-validate
    
    * lisp/treesit.el (treesit-query-validate): Add a call to
    treesit-query-expand so this function works on both sexp and string
    query, as expected.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 709f826f32..9750ac7b7b 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1079,7 +1079,7 @@ treesit-query-validate
                   (message (nth 0 data))
                   (start (nth 1 data)))
              (erase-buffer)
-             (insert query)
+             (insert (treesit-query-expand query))
              (goto-char start)
              (search-forward " " nil t)
              (put-text-property start (point) 'face 'error)

commit 55e01229dafad75affbe49446f2aef3fbca2f3a8
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Sep 20 18:01:15 2022 -0700

    Rename treesit-expand-query/pattern
    
    * src/treesit.c (treesit-expand-pattern): Rename to
    treesit-patter-expand.
    (treesit-expand-query): Rename to treesit-query-expand.
    (make_ts_query): Use new name.

diff --git a/src/treesit.c b/src/treesit.c
index 2b3ab643fa..775f823fb3 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -627,7 +627,7 @@ make_ts_query (Lisp_Object query, const TSLanguage *language,
 	       uint32_t *error_offset, TSQueryError *error_type)
 {
   if (CONSP (query))
-    query = Ftreesit_expand_query (query);
+    query = Ftreesit_query_expand (query);
   char *source = SSDATA (query);
 
   TSQuery *ts_query = ts_query_new (language, source, strlen (source),
@@ -1360,11 +1360,9 @@ DEFUN ("treesit-node-eq",
 
 /*** Query functions */
 
-/* If we decide to pre-load tree-sitter.el, maybe we can implement
-   this function in Lisp.  */
-DEFUN ("treesit-expand-pattern",
-       Ftreesit_expand_pattern,
-       Streesit_expand_pattern, 1, 1, 0,
+DEFUN ("treesit-pattern-expand",
+       Ftreesit_pattern_expand,
+       Streesit_pattern_expand, 1, 1, 0,
        doc: /* Expand PATTERN to its string form.
 
 PATTERN can be
@@ -1406,16 +1404,16 @@ DEFUN ("treesit-expand-pattern",
   if (VECTORP (pattern) || CONSP (pattern))
     return concat3 (opening_delimeter,
 		    Fmapconcat (intern_c_string
-				("treesit-expand-pattern"),
+				("treesit-pattern-expand"),
 				pattern,
 				build_pure_c_string (" ")),
 		    closing_delimiter);
   return CALLN (Fformat, build_pure_c_string("%S"), pattern);
 }
 
-DEFUN ("treesit-expand-query",
-       Ftreesit_expand_query,
-       Streesit_expand_query, 1, 1, 0,
+DEFUN ("treesit-query-expand",
+       Ftreesit_query_expand,
+       Streesit_query_expand, 1, 1, 0,
        doc: /* Expand sexp QUERY to its string form.
 
 A PATTERN in QUERY can be
@@ -1438,7 +1436,7 @@ DEFUN ("treesit-expand-query",
 explanation.  */)
   (Lisp_Object query)
 {
-  return Fmapconcat (intern_c_string ("treesit-expand-pattern"),
+  return Fmapconcat (intern_c_string ("treesit-pattern-expand"),
 		     query, build_pure_c_string (" "));
 }
 
@@ -1922,8 +1920,8 @@ syms_of_treesit (void)
   defsubr (&Streesit_node_descendant_for_range);
   defsubr (&Streesit_node_eq);
 
-  defsubr (&Streesit_expand_pattern);
-  defsubr (&Streesit_expand_query);
+  defsubr (&Streesit_pattern_expand);
+  defsubr (&Streesit_query_expand);
   defsubr (&Streesit_query_compile);
   defsubr (&Streesit_query_capture);
 }

commit 1d3234988a32d32570729b4dfcc00712636ec450
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Sep 8 12:52:25 2022 -0700

    Add node-only parameter to treesit-query-capture
    
    * doc/lispref/parsing.texi (Pattern Matching): Mention the new
    parameter.
    * lisp/treesit.el (treesit-query-in): Add node-only.
    * src/treesit.c (Ftreesit_query_capture): Add node-only.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 0a025bd249..ac156d9996 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -874,15 +874,17 @@ Pattern Matching
 
 Now we can introduce the query functions.
 
-@defun treesit-query-capture node query &optional beg end
+@defun treesit-query-capture node query &optional beg end node-only
 This function matches patterns in @var{query} in @var{node}.  Argument
 @var{query} can be either a string, a s-expression, or a compiled
 query object.  For now, we focus on the string syntax; s-expression
 syntax and compiled query are described at the end of the section.
 
 The function returns all captured nodes in a list of
-@code{(@var{capture_name} . @var{node})}.  If @var{beg} and @var{end}
-are both non-nil, it only pattern matches nodes in that range.
+@code{(@var{capture_name} . @var{node})}.  If @var{node-only} is
+non-nil, a list of node is returned instead.  If @var{beg} and
+@var{end} are both non-nil, this function only pattern matches nodes
+in that range.
 
 @vindex treesit-query-error
 This function raise a @var{treesit-query-error} if @var{query} is
@@ -890,11 +892,12 @@ Pattern Matching
 error.  You can use @code{treesit-query-validate} to debug the query.
 @end defun
 
-@defun treesit-query-in source query &optional beg end
+@defun treesit-query-in source query &optional beg end node-only
 This function matches patterns in @var{query} in @var{source}, and
 returns all captured nodes in a list of @code{(@var{capture_name}
-. @var{node})}.  If @var{beg} and @var{end} are both non-nil, it only
-pattern match nodes in that range.
+. @var{node})}.  If @var{node-only} is non-nil, a list of node is
+returned instead.  If @var{beg} and @var{end} are both non-nil, it
+only pattern match nodes in that range.
 
 Argument @var{source} designates a node, it can be a language symbol,
 a parser, or simply a node.  If a language symbol, @var{source}
diff --git a/lisp/treesit.el b/lisp/treesit.el
index a374ceda6d..709f826f32 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -350,7 +350,7 @@ treesit-node-field-name
 
 ;;; Query API supplement
 
-(defun treesit-query-in (source query &optional beg end)
+(defun treesit-query-in (source query &optional beg end node-only)
   "Query the current buffer with QUERY.
 
 SOURCE can be a language symbol, a parser, or a node.  If a
@@ -366,7 +366,7 @@ treesit-query-in
 used over and over.
 
 BEG and END, if _both_ non-nil, specifies the range in which the query
-is executed.
+is executed.  If NODE-ONLY non-nil, return a list of nodes.
 
 Raise an treesit-query-error if QUERY is malformed."
   (treesit-query-capture
@@ -375,7 +375,7 @@ treesit-query-in
           (treesit-parser-root-node source))
          ((treesit-node-p source) source))
    query
-   beg end))
+   beg end node-only))
 
 (defun treesit-query-string (string query language)
   "Query STRING with QUERY in LANGUAGE.
diff --git a/src/treesit.c b/src/treesit.c
index 48de9436d2..2b3ab643fa 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1678,7 +1678,7 @@ DEFUN ("treesit-query-compile",
 
 DEFUN ("treesit-query-capture",
        Ftreesit_query_capture,
-       Streesit_query_capture, 2, 4, 0,
+       Streesit_query_capture, 2, 5, 0,
        doc: /* Query NODE with patterns in QUERY.
 
 Return a list of (CAPTURE_NAME . NODE).  CAPTURE_NAME is the name
@@ -1691,13 +1691,13 @@ DEFUN ("treesit-query-capture",
 compile your queries if it will be used over and over.
 
 BEG and END, if both non-nil, specifies the range in which the query
-is executed.
+is executed.  If NODE-ONLY is non-nil, return a list of nodes.
 
 Signals treesit-query-error if QUERY is malformed or something else
 goes wrong.  You can use `treesit-query-validate' to debug the
 query.  */)
   (Lisp_Object node, Lisp_Object query,
-   Lisp_Object beg, Lisp_Object end)
+   Lisp_Object beg, Lisp_Object end, Lisp_Object node_only)
 {
   ts_check_node (node);
   if (!NILP (beg))
@@ -1775,11 +1775,20 @@ DEFUN ("treesit-query-capture",
 	  TSQueryCapture capture = captures[idx];
 	  Lisp_Object captured_node =
 	    make_ts_node(lisp_parser, capture.node);
-	  const char *capture_name = ts_query_capture_name_for_id
-	    (ts_query, capture.index, &capture_name_len);
-	  Lisp_Object cap =
-	    Fcons (intern_c_string_1 (capture_name, capture_name_len),
-		   captured_node);
+
+	  Lisp_Object cap;
+	  if (NILP (node_only))
+	    {
+	      const char *capture_name = ts_query_capture_name_for_id
+		(ts_query, capture.index, &capture_name_len);
+	      cap =
+		Fcons (intern_c_string_1 (capture_name, capture_name_len),
+		       captured_node);
+	    }
+	  else
+	    {
+	      cap = captured_node;
+	    }
 	  result = Fcons (cap, result);
 	}
       /* Get predicates.  */

commit 56dbb5db3b10d031826f02d3cf77449d81a2b682
Author: Yuan Fu <casouri@gmail.com>
Date:   Thu Sep 8 12:50:47 2022 -0700

    * lisp/treesit.el (treesit-can-enable-p): Minor fix.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 83d80ac6da..a374ceda6d 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -48,7 +48,7 @@ treesit-can-enable-p
 Currently this function checks whether tree-sitter is available
 and the buffer size."
   (and (treesit-available-p)
-       (< (buffer-size) treesit-maximum-size)))
+       (< (buffer-size) treesit-max-buffer-size)))
 
 ;;; Parser API supplement
 

commit c2a9fe0c1dfa6e36514d4c02e4134b84d9cceb46
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Sep 7 16:15:01 2022 -0700

    Fix tree-sitter manual entry for treesit-should-enable-p
    
    * doc/lispref/parsing.texi: Move two entries in the front to "Using
    Parser" section, replacing the old entry.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 7777ce9360..0a025bd249 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -26,18 +26,6 @@ Parsing Program Source
 for this Emacs instance.
 @end defun
 
-@defvar treesit-max-buffer-size
-This variable contains the maximum size of buffers in which
-tree-sitter can be activated.  Major modes should check this value
-when deciding whether to enable tree-sitter features.
-@end defvar
-
-@defun treesit-can-enable-p
-This function checks whether the current buffer is suitable for
-activating tree-sitter features.  It basically checks
-@code{treesit-available-p} and @var{treesit-max-buffer-size}.
-@end defun
-
 For tree-sitter integration with existing Emacs features,
 @pxref{Parser-based Font Lock}, @ref{Parser-based Indentation}, and
 @ref{List Motion}.
@@ -334,25 +322,18 @@ Using Parser
 buffer.  As we edit the buffer, the associated parser is automatically
 kept up-to-date.
 
-@defvar treesit-maximum-size
-If users want to turn off tree-sitter for buffers larger than a
-particular size (because tree-sitter consumes memory ~10 times the
-buffer size for storing the syntax tree), they set this variable to
-that size.
+@defvar treesit-max-buffer-size
+This variable contains the maximum size of buffers in which
+tree-sitter can be activated.  Major modes should check this value
+when deciding whether to enable tree-sitter features.
 @end defvar
 
-@defun treesit-should-enable-p &optional mode
-This function returns non-nil if @var{mode} (default to the current
-major mode) should activate tree-sitter features.  The result depends
-on the value of @var{treesit-disabled-modes} and
-@var{treesit-maximum-size} described above.  The result also
-depends on, of course, the result of @code{treesit-avaliabe-p}.
-
-Writer of major modes or other packages are responsible for calling
-this function and determine whether to activate tree-sitter features.
+@defun treesit-can-enable-p
+This function checks whether the current buffer is suitable for
+activating tree-sitter features.  It basically checks
+@code{treesit-available-p} and @var{treesit-max-buffer-size}.
 @end defun
 
-
 @cindex Creating tree-sitter parsers
 @defun treesit-parser-create language &optional buffer no-reuse
 To create a parser, we provide a @var{buffer} to keep track of and the

commit a23aec59b3a6ed2e96a89dab18f51a6310f1ac7c
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Sep 7 13:20:37 2022 -0700

    Remove treesit-disabled-modes and change treesit-should-enable-p
    
    Per emacs-devel discussion, remove treesit-disabled-modes and let
    major modes to provide tree-sitter switches.  I also decided to add
    treesit-max-buffer-size to elisp manual despite it being a user
    option.  Though we should still add it to the user manual.
    
    * doc/lispref/parsing.texi (Parsing Program Source): Update manual to
    remove entries for treesit-diabled-modes and add
    treesit-max-buffer-size.  Also update treesit-should-enable-p.
    * lisp/treesit.el (treesit-disabled-modes): Remove user option.
    (treesit-maximum-size): Change to treesit-max-buffer-size.
    (treesit-should-enable-p): Change to treesit-can-enable-p and remove
    checks of treesit-disabled-modes.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 6d5c7b8dc2..7777ce9360 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -26,8 +26,21 @@ Parsing Program Source
 for this Emacs instance.
 @end defun
 
-For using tree-sitter features in font-lock and indentation,
-@pxref{Parser-based Font Lock}, @pxref{Parser-based Indentation}.
+@defvar treesit-max-buffer-size
+This variable contains the maximum size of buffers in which
+tree-sitter can be activated.  Major modes should check this value
+when deciding whether to enable tree-sitter features.
+@end defvar
+
+@defun treesit-can-enable-p
+This function checks whether the current buffer is suitable for
+activating tree-sitter features.  It basically checks
+@code{treesit-available-p} and @var{treesit-max-buffer-size}.
+@end defun
+
+For tree-sitter integration with existing Emacs features,
+@pxref{Parser-based Font Lock}, @ref{Parser-based Indentation}, and
+@ref{List Motion}.
 
 To access the syntax tree of the text in a buffer, we need to first
 load a language definition and create a parser with it.  Next, we can
@@ -321,13 +334,6 @@ Using Parser
 buffer.  As we edit the buffer, the associated parser is automatically
 kept up-to-date.
 
-@defvar treesit-disabled-modes
-Before creating a parser, it is perhaps good to check whether we
-should use tree-sitter at all.  Sometimes a user don't want to use
-tree-sitter features for a major mode.  To turn-off tree-sitter for a
-mode, they add that mode to this variable.
-@end defvar
-
 @defvar treesit-maximum-size
 If users want to turn off tree-sitter for buffers larger than a
 particular size (because tree-sitter consumes memory ~10 times the
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 9c66f32ec2..83d80ac6da 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -35,11 +35,7 @@ treesit
   "Tree-sitter is an incremental parser."
   :group 'tools)
 
-(defcustom treesit-disabled-modes nil
-  "A list of major-modes for which tree-sitter support is disabled."
-  :type '(list symbol))
-
-(defcustom treesit-maximum-size (* 4 1024 1024)
+(defcustom treesit-max-buffer-size (* 4 1024 1024)
   "Maximum buffer size for enabling tree-sitter parsing."
   :type 'integer)
 
@@ -47,21 +43,12 @@ treesit-available-p
   "Return non-nil if tree-sitter features are available."
   (fboundp 'treesit-parser-create))
 
-(defun treesit-should-enable-p (&optional mode)
-  "Return non-nil if MODE should activate tree-sitter support.
-MODE defaults to the value of `major-mode'.  The result depends
-on the value of `treesit-disabled-modes',
-`treesit-maximum-size', and of course, whether tree-sitter is
-available on the system at all."
-  (let* ((mode (or mode major-mode))
-         (disabled (cl-loop
-                    for disabled-mode in treesit-disabled-modes
-                    if (provided-mode-derived-p mode disabled-mode)
-                    return t
-                    finally return nil)))
-    (and (treesit-available-p)
-         (not disabled)
-         (< (buffer-size) treesit-maximum-size))))
+(defun treesit-can-enable-p ()
+  "Return non-nil if current buffer can activate tree-sitter.
+Currently this function checks whether tree-sitter is available
+and the buffer size."
+  (and (treesit-available-p)
+       (< (buffer-size) treesit-maximum-size)))
 
 ;;; Parser API supplement
 

commit 31ad906bd00a3c624ce024f7caa62e9f0b381b37
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Sep 7 11:52:13 2022 -0700

    Add manual entry for tree-sitter search functions
    
    * doc/lispref/parsing.texi (Retrieving Node): New subsection
    "Searching for node".
    * doc/lispref/positions.texi (List Motion): Add entries for
    treesit-defun-query, treesit-beginning-of-defun, treesit-end-of-defun.
    * lisp/treesit.el (treesit-search-forward, treesit-search-beginning)
    (treesit-search-end): Minor docstring fix-up.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 917779f78a..6d5c7b8dc2 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -591,6 +591,38 @@ Retrieving Node
 for named child (@pxref{tree-sitter named node, named node}).
 @end defun
 
+@heading Searching for node
+
+@defun treesit-search-beginning query arg &optional lang up-only
+This function searches for the next node that @var{query} captures,
+starting at point.  Use the parser in current buffer that has
+@var{lang} as its language, if @var{lang} is nil, use the first parser
+in current buffer’s buffer list.
+
+This function stops at the @var{arg}'th match.  If @var{arg} is
+negative, search backward.  If the search succeeds, stop at the
+beginning of the matched node and return the node.  Return nil if
+search failed.
+
+By default, this function searches by traversing the parse tree depth
+first, starting from the node at point.  If @var{up-only} is non-nil,
+this function only go to siblings and parents, but never go down into
+children nodes.
+@end defun
+
+@defun treesit-search-end query arg &optional lang up-only
+This function is like @code{treesit-search-beginning}, but stops at
+the end of the matched node.
+@end defun
+
+@defun treesit-search-forward pos-fn arg query &optional lang up-only
+This function is like @code{treesit-search-beginning} and
+@code{treesit-search-end}, but instead of stopping at the beginning or
+end of the matched node, it determines where to stop by @var{pos-fn},
+where @var{pos-fn} is a function that takes a node and returns a
+position
+@end defun
+
 @heading More convenient functions
 
 @defun treesit-filter-child node pred &optional named
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi
index 7945232bf8..809ac207d2 100644
--- a/doc/lispref/positions.texi
+++ b/doc/lispref/positions.texi
@@ -834,6 +834,32 @@ List Motion
 of using its normal method.
 @end defvar
 
+When tree-sitter support is available (@pxref{Parsing Program
+Source}), Emacs can find the beginning and end of a function according
+to the syntax tree.
+
+@defvar treesit-defun-query
+Set this variable to a tree-sitter query that matches defun
+definitions, then @code{treesit-beginning-of-defun} and
+@code{treesit-end-of-defun} can find the beginning and end of a defun.
+
+Make sure to use a compiled query for this variable, otherwise
+@code{treesit-beginning-of-defun} and @code{treesit-end-of-defun} will
+be very slow.
+@end defvar
+
+@defun treesit-beginning-of-defun &optional arg
+This function finds the beginning of a defun according to
+@var{treesit-defun-query}.  This function is suitable for the value of
+@var{beginning-of-defun-function}.
+@end defun
+
+@defun treesit-end-of-defun &optional arg
+This function finds the end of a defun according to
+@var{treesit-defun-query}.  This function is suitable for the value of
+@var{end-of-defun-function}.
+@end defun
+
 @node Skipping Characters
 @subsection Skipping Characters
 @cindex skipping characters
diff --git a/lisp/treesit.el b/lisp/treesit.el
index b969f18514..9c66f32ec2 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -862,9 +862,6 @@ treesit-check-indent
 (defun treesit-search-forward (pos-fn arg query &optional lang up-only)
   "Search forward for nodes that matches QUERY from current point.
 
-This is a more primitive function, you might want to use
-`treesit-search-beginning' or `treesit-search-end' instead.
-
 QUERY has to capture the node to match.  LANG specifies the
 language in which we search for nodes.  If LANG is nil, use the
 first parser in (`treesit-parser-list').
@@ -875,7 +872,7 @@ treesit-search-forward
 POS-FN can be either `treesit-node-start' or `treesit-node-end',
 or any function that takes a node and returns a position.
 
-If search succeeds, stop at the position returned by POS-FN and
+If the search succeeds, stop at the position returned by POS-FN and
 return the matched node.  Return nil if search failed.
 
 We search by traversing the parse tree, visiting every node
@@ -925,12 +922,12 @@ treesit-search-beginning
 
 QUERY has to capture the node to match.  LANG specifies the
 language in which we search for nodes.  If LANG is nil, use the
-first parser in (`treesit-parser-list').
+first parser in current buffer's parser list.
 
 Move forward/backward ARG times, positive ARG means go forward,
 negative ARG means go backward.
 
-If search succeeds, return the matched node.  Return nil if
+If the search succeeds, return the matched node.  Return nil if
 search failed.
 
 We search by traversing the parse tree, visiting every node
@@ -953,7 +950,7 @@ treesit-search-end
 Move forward/backward ARG times, positive ARG means go forward,
 negative ARG means go backward.
 
-If search succeeds, return the matched node.  Return nil if
+If the search succeeds, return the matched node.  Return nil if
 search failed.
 
 We search by traversing the parse tree, visiting every node

commit 47a6c23751ba2eb097f0d4d61976eefa19425ba1
Author: Yuan Fu <casouri@gmail.com>
Date:   Wed Sep 7 11:46:07 2022 -0700

    Add tree-sitter font-lock settings helper function/macro
    
    1. Add treesit-font-lock-rules that helps with settings
    treesit-font-lock-settings.
    2. Remove treesit-font-lock-defaults and with it, decoration levels.
    
    Now major modes should set treesit-font-lock-settings with the output
    of treesit-font-lock-rules rather than setting
    treesit-font-lock-defaults.
    
    * lisp/treesit.el (treesit-font-lock-settings): Update docstring.
    (treesit-font-lock-rules): New function.
    (treesit-font-lock-defaults): Remove variable.
    (treesit-font-lock-enable): Remove code that interacts
    treesit-font-lock-defaults.
    * doc/lispref/modes.texi: Update manual for
    treesit-font-lock-settings, treesit-font-lock-rules,
    treesit-font-lock-defaults.

diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index ba8b548554..45a44acf54 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3883,12 +3883,12 @@ Parser-based Font Lock
 @c if in the future more parser are supported, feel free to reorganize
 @c and rewrite this node to describe multiple parsers in parallel.
 
-Besides simple syntactic font lock and search-based font lock, Emacs
+Besides simple syntactic font lock and regexp-based font lock, Emacs
 also provides complete syntactic font lock with the help of a parser,
 currently provided by the tree-sitter library (@pxref{Parsing Program
 Source}).  Because it is an optional feature, parser-based font lock
 is less integrated with Emacs.  Most variables introduced in previous
-sections only apply to search-based font lock, except for
+sections only apply to regexp-based font lock, except for
 @var{font-lock-maximum-decoration}.
 
 @defun treesit-font-lock-enable
@@ -3897,29 +3897,34 @@ Parser-based Font Lock
 
 Parser-based font lock and other font lock mechanism are not mutually
 exclusive.  By default, if enabled, parser-based font lock runs first,
-then the simple syntactic font lock (if enabled), then search-based
+then the simple syntactic font lock (if enabled), then regexp-based
 font lock.
 
 Although parser-based font lock doesn't share the same customization
-variables with search-based font lock, parser-based font lock uses
-similar customization schemes.  Just like @var{font-lock-keywords} and
-@var{font-lock-defaults}, parser-based font lock has
-@var{treesit-font-lock-settings} and
-@var{treesit-font-lock-defaults}.
+variables with regexp-based font lock, parser-based font lock uses
+similar customization schemes.  The tree-sitter counterpart of
+@var{font-lock-keywords} is @var{treesit-font-lock-settings}.
 
-@defvar treesit-font-lock-settings
-A list of @var{setting}s for tree-sitter font lock.
-
-Each @var{setting} should look like
+@defun treesit-font-lock-rules :keyword value query...
+This function is used to set @var{treesit-font-lock-settings}.  It
+takes care of compiling queries and other post-processing and outputs
+a value that @var{treesit-font-lock-settings} accepts.  An example:
 
 @example
-(@var{language} @var{query})
+@group
+(treesit-font-lock-rules
+ :language 'javascript
+ '((true) @@font-lock-constant-face
+   (false) @@font-lock-constant-face)
+ :language 'html
+ "(script_element) @@font-lock-builtin-face")
+@end group
 @end example
 
-Each @var{setting} controls one parser (often of different language).
-And @var{language} is the language symbol (@pxref{Language
-Definitions}); @var{query} is either a string query or a sexp query
-(@pxref{Pattern Matching}).
+This function takes a list of text or s-exp queries.  Before each
+query, there are @var{:keyword} and @var{value} pairs that configures
+that query.  The @var{:lang} keyword sets the query’s language, and is
+currently the only recognized keyword.
 
 Capture names in @var{query} should be face names like
 @code{font-lock-keyword-face}.  The captured node will be fontified
@@ -3927,32 +3932,24 @@ Parser-based Font Lock
 case the function is called with (@var{start} @var{end} @var{node}),
 where @var{start} and @var{end} are the start and end position of the
 node in buffer, and @var{node} is the tree-sitter node object.  If a
-capture name is both a face and a function, face takes priority.
+capture name is both a face and a function, the face takes priority.
+@end defun
 
-Generally, major modes should set @var{treesit-font-lock-defaults},
-and let Emacs automatically populate this variable.
-@end defvar
+@defvar treesit-font-lock-settings
+A list of @var{setting}s for tree-sitter font lock.  The exact format
+of this variable is considered internal.  One should always use
+@code{treesit-font-lock-rules} to set this variable.
 
-@defvar treesit-font-lock-defaults
-This variable stores defaults for tree-sitter font Lock.  It is a list
-of
+Each @var{setting} is of form
 
 @example
-(@var{default} @var{:keyword} @var{value}...)
+(@var{language} @var{query})
 @end example
 
-A @var{default} may be a symbol or a list of symbols (for different
-levels of fontification).  The symbol(s) can be a variable or a
-function.  If a symbol is both a variable and a function, it is used
-as a function.  Different levels of fontification can be controlled by
-@var{font-lock-maximum-decoration}.
-
-The symbol(s) in @var{default} should contain or return a
-@var{setting} as described in @var{treesit-font-lock-settings}.
-
-The rest @var{keyword}s and @var{value}s are additional settings that
-could be used to alter the fontification behavior.  Currently there
-aren't any.
+Each @var{setting} controls one parser (often of different language).
+And @var{language} is the language symbol (@pxref{Language
+Definitions}); @var{query} is either a string query or a sexp query
+(@pxref{Pattern Matching}).
 @end defvar
 
 Multi-language major modes should provide range functions in
diff --git a/lisp/treesit.el b/lisp/treesit.el
index cf5001eebc..b969f18514 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -442,7 +442,10 @@ treesit-update-ranges
 (defvar-local treesit-font-lock-settings nil
   "A list of SETTINGs for treesit-based fontification.
 
-Each SETTING should look like
+The exact format of this variable is considered internal.  One
+should always use `treesit-font-lock-rules' to set this variable.
+
+Each SETTING is of form
 
     (LANGUAGE QUERY)
 
@@ -455,7 +458,28 @@ treesit-font-lock-settings
 a query in either string or s-expression form.  When using
 repeatedly, a compiled query is much faster than a string or sexp
 one, so it is recommend to compile your queries if it will be
-used over and over.
+used over and over.")
+
+(defun treesit-font-lock-rules (&rest args)
+  "Return a value suitable for `treesit-font-lock-settings'.
+
+Take a series of QUERIES in either string, s-expression or
+compiled form.  Same as in `treesit-font-lock-settings', for each
+query, captured nodes are highlighted with the capture name as
+its face.
+
+Before each QUERY there could be :KEYWORD VALUE pairs that
+configure the query (and only that query).  For example,
+
+    (treesit-font-lock-rules
+     :language 'javascript
+     '((true) @font-lock-constant-face
+       (false) @font-lock-constant-face)
+     :language 'html
+     \"(script_element) @font-lock-builtin-face\")
+
+For each QUERY, a :language keyword is required.  Currently the
+only recognized keyword is :language.
 
 Capture names in QUERY should be face names like
 `font-lock-keyword-face'.  The captured node will be fontified
@@ -463,39 +487,36 @@ treesit-font-lock-settings
 which case the function is called with (START END NODE), where
 START and END are the start and end position of the node in
 buffer, and NODE is the tree-sitter node object.  If a capture
-name is both a face and a function, face takes priority.
-
-Generally, major modes should set
-`treesit-font-lock-defaults', and let Emacs automatically
-populate this variable.")
-
-(defvar-local treesit-font-lock-defaults nil
-  "Defaults for tree-sitter Font Lock specified by the major mode.
-
-This variable should be a list of
-
-    (DEFAULT :KEYWORD VALUE...)
-
-A DEFAULT may be a symbol or a list of symbols (specifying
-different levels of fontification).  The symbol(s) can be of a
-variable or a function.  If a symbol is both a variable and a
-function, it is used as a function.  Different levels of
-fontification can be controlled by
-`font-lock-maximum-decoration'.
-
-The symbol(s) in DEFAULT should contain or return a SETTING as
-explained in `treesit-font-lock-settings', which looks like
-
-    (LANGUAGE QUERY)
-
-KEYWORD and VALUE are additional settings could be used to alter
-fontification behavior.  Currently there aren't any.
-
-Multi-language major-modes should provide a range function for
-eacn language it supports in `treesit-range-functions', and
-Emacs will set the ranges accordingly before fontifing a region.
-See Info node `(elisp)Multiple Languages' for what does it mean
-to set ranges for a parser.")
+name is both a face and a function, the face takes priority.
+
+\(fn :KEYWORD VALUE QUERY...)"
+  (let (;; Tracks the current language that following queries will
+        ;; apply to.
+        (current-language nil)
+        ;; The list this function returns.
+        (result nil))
+    (while args
+      (let ((token (pop args)))
+        (pcase token
+          (:language
+           (let ((lang (pop args)))
+             (when (or (not (symbolp lang)) (null lang))
+               (signal 'wrong-type-argument `(symbolp ,lang)))
+             (setq current-language lang)))
+          ((pred treesit-query-p)
+           (when (null current-language)
+             (signal 'treesit-error
+                     `("Language unspecified, use :language keyword to specify a language for this query" ,token)))
+           (if (treesit-compiled-query-p token)
+               (push `(,current-language token) result)
+             (push `(,current-language
+                     ,(treesit-query-compile current-language token))
+                   result))
+           ;; Clears any configurations set for this query.
+           (setq current-language nil))
+          (_ (signal 'treesit-error
+                     `("Unexpected value" token))))))
+    (nreverse result)))
 
 (defun treesit-font-lock-fontify-region (start end &optional loudly)
   "Fontify the region between START and END.
@@ -535,15 +556,6 @@ treesit-font-lock-fontify-region
 
 (defun treesit-font-lock-enable ()
   "Enable tree-sitter font-locking for the current buffer."
-  (let ((default (car treesit-font-lock-defaults))
-        (attributes (cdr treesit-font-lock-defaults)))
-    (ignore attributes)
-    (setq-local treesit-font-lock-settings
-                (font-lock-eval-keywords
-                 (font-lock-choose-keywords
-                  default
-	          (font-lock-value-in-major-mode
-                   font-lock-maximum-decoration)))))
   (setq-local font-lock-fontify-region-function
               #'treesit-font-lock-fontify-region)
   ;; If we don't set `font-lock-defaults' to some non-nil value,

commit 77d5a0cf9fc4a6dc44f0c6ee5e3295e0eea08273
Merge: e98b4715bb df2f6fb7fc
Author: Yuan Fu <yuan@debian-BULLSEYE-live-builder-AMD64>
Date:   Mon Aug 29 11:41:10 2022 -0700

    Merge remote-tracking branch 'origin/master' into feature/tree-sitter

commit e98b4715bb986524bde9356b62429af9786ae716
Author: Yuan Fu <yuan@debian-BULLSEYE-live-builder-AMD64>
Date:   Fri Aug 19 00:33:27 2022 -0700

    ; * doc/lispref/parsing.texi: Minor touch-up.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 8df14b12b7..917779f78a 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -388,7 +388,7 @@ Using Parser
 with signal data being the buffer size.
 
 Once a parser is created, Emacs automatically adds it to the
-buffer-local parser list.  Every time a change is made to the buffer,
+internal parser list.  Every time a change is made to the buffer,
 Emacs updates parsers in this list so they can update their syntax
 tree incrementally.
 
@@ -412,8 +412,9 @@ Using Parser
 which a parser should operate in.  @xref{Multiple Languages}.
 
 Because a parser parses lazily, when we narrow the buffer, the parser
-doesn't act immediately; as long as we don't query for a node while
-the buffer is narrowed, narrowing does not affect the parser.
+is not affected immediately; as long as we don't query for a node
+while the buffer is narrowed, the parser is oblivious of the
+narrowing.
 
 @cindex tree-sitter parse string
 @defun treesit-parse-string string language

commit 11379ef2369c09c719fecc66cf3b1287d9ad1f3a
Author: Yuan Fu <yuan@debian-BULLSEYE-live-builder-AMD64>
Date:   Fri Aug 19 00:25:10 2022 -0700

    Remove treesit manual entries for deleted functions
    
    * doc/lispref/parsing.texi: Remove documentation for
    treesit-get-parser-create and treesit-get-parser.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 27755e0caa..8df14b12b7 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -348,34 +348,14 @@ Using Parser
 
 
 @cindex Creating tree-sitter parsers
-To create a parser, we provide a buffer to parse and the language to
-use (@pxref{Language Definitions}).  Emacs provides several creation
-functions for different use cases.
-
-@defun treesit-get-parser-create language
-This function is the most convenient one.  It gives you a parser that
-recognizes @var{language} for the current buffer.  The function
-checks if there already exists a parser suiting the need, and only
-creates a new one when it can't find one.
-
-@example
-@group
-;; Create a parser for C programming language.
-(treesit-get-parser-create 'c)
-    @c @result{} #<treesit-parser for c in *scratch*>
-@end group
-@end example
-@end defun
-
-@defun treesit-get-parser language
-This function is like @code{treesit-get-parser-create}, but it
-always creates a new parser.
-@end defun
-
-@defun treesit-parser-create buffer language
-This function is the most primitive, requiring both the buffer to
-associate to, and the language to use.  If @var{buffer} is nil, the
-current buffer is used.
+@defun treesit-parser-create language &optional buffer no-reuse
+To create a parser, we provide a @var{buffer} to keep track of and the
+@var{language} to use (@pxref{Language Definitions}).  If @var{buffer}
+is nil, the current buffer is used.
+
+By default, this function reuses a parser if one already exists for
+@var{language} in @var{buffer}, if @var{no-reuse} is non-nil, this
+function always creates a new parser.
 @end defun
 
 Given a parser, we can query information about it:

commit f543a1ca0ef25fa86eee747423aef28bd98e731b
Author: Yuan Fu <yuan@debian-BULLSEYE-live-builder-AMD64>
Date:   Thu Aug 18 01:44:39 2022 -0700

    Add treesit-parser-delete
    
    * src/treesit.c (ts_record_change): Replace CHECK_TS_PARSER with
    ts_check_parser.
    (make_ts_parser): Initialize deleted field.
    (Ftreesit_parser_delete): Replace CHECK_TS_PARSER with
    ts_check_parser. Set deleted field.
    (Ftreesit_parser_buffer, Ftreesit_parser_language): Replace
    CHECK_TS_PARSER with ts_check_parser.
    (ts_check_parser): New function.
    (Ftreesit_parser_root_node, Ftreesit_parser_set_included_ranges)
    (Ftreesit_parser_included_ranges): Replace CHECK_TS_PARSER with
    ts_check_parser.
    (Qtreesit_parser_deleted): New symbol.
    (Qtreesit_parser_deleted): New error.
    * src/treesit.h (Lisp_TS_Parser): New field 'deleted'.

diff --git a/src/treesit.c b/src/treesit.c
index 1917179d09..48de9436d2 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -318,6 +318,14 @@ DEFUN ("treesit-language-available-p",
 
 /*** Parsing functions */
 
+static void
+ts_check_parser (Lisp_Object obj)
+{
+  CHECK_TS_PARSER (obj);
+  if (XTS_PARSER (obj)->deleted)
+    xsignal1 (Qtreesit_parser_deleted, obj);
+}
+
 /* An auxiliary function that saves a few lines of code.  Assumes TREE
    is not NULL.  */
 static inline void
@@ -349,7 +357,7 @@ ts_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
     {
       CHECK_CONS (parser_list);
       Lisp_Object lisp_parser = XCAR (parser_list);
-      CHECK_TS_PARSER (lisp_parser);
+      ts_check_parser (lisp_parser);
       TSTree *tree = XTS_PARSER (lisp_parser)->tree;
       if (tree != NULL)
 	{
@@ -595,6 +603,7 @@ make_ts_parser (Lisp_Object buffer, TSParser *parser,
   lisp_parser->visible_beg = BUF_BEGV (XBUFFER (buffer));
   lisp_parser->visible_end = BUF_ZV (XBUFFER (buffer));
   lisp_parser->timestamp = 0;
+  lisp_parser->deleted = false;
   eassert (lisp_parser->visible_beg <= lisp_parser->visible_end);
   return make_lisp_ptr (lisp_parser, Lisp_Vectorlike);
 }
@@ -748,11 +757,14 @@ DEFUN ("treesit-parser-delete",
        doc: /* Delete PARSER from its buffer.  */)
   (Lisp_Object parser)
 {
-  CHECK_TS_PARSER (parser);
+  ts_check_parser (parser);
+
   Lisp_Object buffer = XTS_PARSER (parser)->buffer;
   struct buffer *buf = XBUFFER (buffer);
   BVAR (buf, ts_parser_list)
     = Fdelete (parser, BVAR (buf, ts_parser_list));
+
+  XTS_PARSER (parser)->deleted = true;
   return Qnil;
 }
 
@@ -789,7 +801,7 @@ DEFUN ("treesit-parser-buffer",
        doc: /* Return the buffer of PARSER.  */)
   (Lisp_Object parser)
 {
-  CHECK_TS_PARSER (parser);
+  ts_check_parser (parser);
   Lisp_Object buf;
   XSETBUFFER (buf, XBUFFER (XTS_PARSER (parser)->buffer));
   return buf;
@@ -802,7 +814,7 @@ DEFUN ("treesit-parser-language",
 This symbol is the one used to create the parser.  */)
   (Lisp_Object parser)
 {
-  CHECK_TS_PARSER (parser);
+  ts_check_parser (parser);
   return XTS_PARSER (parser)->language_symbol;
 }
 
@@ -814,7 +826,7 @@ DEFUN ("treesit-parser-root-node",
        doc: /* Return the root node of PARSER.  */)
   (Lisp_Object parser)
 {
-  CHECK_TS_PARSER (parser);
+  ts_check_parser (parser);
   ts_ensure_parsed (parser);
   TSNode root_node = ts_tree_root_node (XTS_PARSER (parser)->tree);
   return make_ts_node (parser, root_node);
@@ -862,7 +874,7 @@ DEFUN ("treesit-parser-set-included-ranges",
 is nil, set PARSER to parse the whole buffer.  */)
   (Lisp_Object parser, Lisp_Object ranges)
 {
-  CHECK_TS_PARSER (parser);
+  ts_check_parser (parser);
   CHECK_CONS (ranges);
   ts_check_range_argument (ranges);
 
@@ -927,7 +939,7 @@ DEFUN ("treesit-parser-included-ranges",
 nil.  */)
   (Lisp_Object parser)
 {
-  CHECK_TS_PARSER (parser);
+  ts_check_parser (parser);
   uint32_t len;
   const TSRange *ranges = ts_parser_included_ranges
     (XTS_PARSER (parser)->parser, &len);
@@ -1813,6 +1825,7 @@ syms_of_treesit (void)
 	  "treesit-node-outdated");
   DEFSYM (Quser_emacs_directory,
 	  "user-emacs-directory");
+  DEFSYM (Qtreesit_parser_deleted, "treesit-parser-deleted");
 
   define_error (Qtreesit_error, "Generic tree-sitter error", Qerror);
   define_error (Qtreesit_query_error, "Query pattern is malformed",
@@ -1831,6 +1844,9 @@ syms_of_treesit (void)
   define_error (Qtreesit_node_outdated,
 		"This node is outdated, please retrieve a new one",
 		Qtreesit_error);
+  define_error (Qtreesit_parser_deleted,
+		"This parser is deleted and cannot be used",
+		Qtreesit_error);
 
   DEFVAR_LISP ("treesit-load-name-override-list",
 	       Vtreesit_load_name_override_list,
diff --git a/src/treesit.h b/src/treesit.h
index cb00fee111..0c043f7d25 100644
--- a/src/treesit.h
+++ b/src/treesit.h
@@ -62,6 +62,9 @@ #define EMACS_TREESIT_H
      inherits this timestamp.  This way we can make sure the node is
      not outdated when we access its information.  */
   ptrdiff_t timestamp;
+  /* If this field is true, parser functions raises
+     treesit-parser-deleted signal.  */
+  bool deleted;
 };
 
 /* A wrapper around a tree-sitter node.  */

commit ac4cafd66e2c3a07a6721201a33e8a03e8880bac
Author: Yuan Fu <yuan@debian-BULLSEYE-live-builder-AMD64>
Date:   Sun Jun 19 19:06:56 2022 -0700

    * src/treesit.c (make_ts_parser): Initialize timestamp field.

diff --git a/src/treesit.c b/src/treesit.c
index 64593898dc..1917179d09 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -594,6 +594,7 @@ make_ts_parser (Lisp_Object buffer, TSParser *parser,
   lisp_parser->need_reparse = true;
   lisp_parser->visible_beg = BUF_BEGV (XBUFFER (buffer));
   lisp_parser->visible_end = BUF_ZV (XBUFFER (buffer));
+  lisp_parser->timestamp = 0;
   eassert (lisp_parser->visible_beg <= lisp_parser->visible_end);
   return make_lisp_ptr (lisp_parser, Lisp_Vectorlike);
 }

commit c8eeaa4ae4aea05ccf66f415be20842d8447bad7
Author: Yuan Fu <yuan@debian-BULLSEYE-live-builder-AMD64>
Date:   Sat Jun 18 16:57:50 2022 -0700

    ; * lisp/treesit.el (treesit-traverse-forward): Fix docstring.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 3cfafd0d15..cf5001eebc 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -309,15 +309,14 @@ treesit-traverse-forward
   o  o    2        7  +-+-+    +--+--+
                       |   |    |  |  |
                       10  11   13 14 15
-
-DEPTH can be a positive integer, 0, nil, or 'up.  A positive
+DEPTH can be a positive integer, 0, nil, or \\='up.  A positive
 integer or 0 means go DEPTH deep counting from NODE.  A nil means
-no limit.  And a symbol 'up means go upwards only: only traverse
+no limit.  And a symbol \\='up means go upwards only: only traverse
 sibling and parent, never go down to children.
 
-The difference between 0 and 'up is subtle: in the above example,
+The difference between 0 and \\='up is subtle: in the above example,
 if given 0 as DEPTH, node 1 3 4 5 6 8 9 12 16 are visited; if
-given 'up as DEPTH, only node 1 3 4 8 16 are visited."
+given \\='up as DEPTH, only node 1 3 4 8 16 are visited."
   ;; First try NODE's subtree, but only under these conditions: if
   ;; DEPTH is a number, it has to be greater than 0, if it's a symbol,
   ;; it cannot be 'up.

commit 7544e9ab5d20a773db15ae3538f1c4a3a9167760
Author: Yuan Fu <yuan@debian-BULLSEYE-live-builder-AMD64>
Date:   Fri Jun 17 17:04:00 2022 -0700

    Fix double-free in treesit.c
    
    * src/treesit.c (Ftreesit_query_capture): Remove free at the end.

diff --git a/src/treesit.c b/src/treesit.c
index be0955805c..64593898dc 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1706,16 +1706,10 @@ DEFUN ("treesit-query-capture",
 
   /* Initialize query objects, and execute query.  */
   struct Lisp_TS_Query *lisp_query;
-  /* If the lisp query is temporary, we need to free it after use. */
-  bool lisp_query_temp_p;
   if (TS_COMPILED_QUERY_P (query))
-    {
-      lisp_query_temp_p = false;
       lisp_query = XTS_COMPILED_QUERY (query);
-    }
   else
     {
-      lisp_query_temp_p = true;
       uint32_t error_offset;
       TSQueryError error_type;
       lisp_query = make_ts_query (query, lang,
@@ -1727,6 +1721,8 @@ DEFUN ("treesit-query-capture",
 		    (ts_query_error_to_string (error_type)),
 		    make_fixnum (error_offset + 1));
 	}
+      /* We don't need need to free TS_QUERY and CURSOR, they are stored
+	 in a lisp object, which is tracked by gc.  */
     }
   TSQuery *ts_query = lisp_query->query;
   TSQueryCursor *cursor = lisp_query->cursor;
@@ -1785,11 +1781,6 @@ DEFUN ("treesit-query-capture",
 	  result = prev_result;
 	}
     }
-  if (lisp_query_temp_p)
-    {
-      ts_query_delete (ts_query);
-      ts_query_cursor_delete (cursor);
-    }
   return Fnreverse (result);
 }
 

commit 246dbb540a32fd5e68ae0665527717943ebb69b1
Author: Yuan Fu <yuan@debian-BULLSEYE-live-builder-AMD64>
Date:   Thu Jun 16 17:55:07 2022 -0700

    Change treesit-parser-list from variable to function
    
    Effectively making the list internal.  Now Emacs user cannot shoot
    themselves in the foot by removing a parser from the list, make
    chaanges to buffer and add that parser back to the list.
    
    * doc/lispref/parsing.texi (Language Definitions, Using Parser)
    (Retrieving Node, Multiple Languages): Change variable to function.
    * lisp/treesit.el (treesit-language-at, treesit-node-on)
    (treesit-buffer-root-node, treesit-indent, treesit-check-indent)
    (treesit-search-forward, treesit-search-beginning)
    (treesit-end-of-defun, treesit-inspect-mode): Change variable to
    function.
    * src/buffer.c (bset_ts_parser_list, reset_buffer, init_buffer_once):
    Add ts_parser_list.
    * src/buffer.h (struct buffer): Add ts_parser_list.
    * src/treesit.c (ts_record_change, Ftreesit_parser_create): Use the
    buffer field instead of the old buffer local variable.
    (Ftreesit_parser_delete, Ftreesit_parser_list): New functions.
    (syms_of_treesit): Remove treesit-parser-list.
    * test/src/treesit-tests.el (treesit-basic-parsing): Use the new
    function.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index b077f55743..27755e0caa 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -184,7 +184,7 @@ Language Definitions
 spans point, and its immediate parent.
 
 This minor mode doesn't create parsers on its own.  It simply uses the
-first parser in @var{treesit-parser-list} (@pxref{Using Parser}).
+first parser in @code{(treesit-parser-list)} (@pxref{Using Parser}).
 @end deffn
 
 @heading Reading the grammar definition
@@ -407,15 +407,19 @@ Using Parser
 size exceeds that, Emacs signals @var{treesit-buffer-too-large}
 with signal data being the buffer size.
 
-@vindex treesit-parser-list
 Once a parser is created, Emacs automatically adds it to the
-buffer-local variable @var{treesit-parser-list}.  Every time a
-change is made to the buffer, Emacs updates parsers in this list so
-they can update their syntax tree incrementally.  Therefore, one must
-not remove parsers from this list and put the parser back in: if any
-change is made when that parser is absent, the parser will be
-permanently out-of-sync with the buffer content, and shouldn't be used
-anymore.
+buffer-local parser list.  Every time a change is made to the buffer,
+Emacs updates parsers in this list so they can update their syntax
+tree incrementally.
+
+@defun treesit-parser-list &optional buffer
+This function returns the parser list of @var{buffer}.  And
+@var{buffer} defaults to the current buffer.
+@end defun
+
+@defun treesit-parser-delete parser
+This function deletes @var{parser}.
+@end defun
 
 @cindex tree-sitter narrowing
 @anchor{tree-sitter narrowing} Normally, a parser ``sees'' the whole
@@ -477,10 +481,10 @@ Retrieving Node
 greater than @var{point}.
 
 When @var{parser-or-lang} is nil, this function uses the first parser
-in @var{treesit-parser-list} in the current buffer.  If
+in @code{(treesit-parser-list)} in the current buffer.  If
 @var{parser-or-lang} is a parser object, it use that parser; if
 @var{parser-or-lang} is a language, it finds the first parser using
-that language in @var{treesit-parser-list} and use that.
+that language in @code{(treesit-parser-list)} and use that.
 
 If @var{named} is non-nil, this function looks for a named node
 instead (@pxref{tree-sitter named node, named node}).
@@ -507,10 +511,10 @@ Retrieving Node
 @code{treesit-node-at} instead.
 
 When @var{parser-or-lang} is nil, this function uses the first parser
-in @var{treesit-parser-list} in the current buffer.  If
+in @code{(treesit-parser-list)} in the current buffer.  If
 @var{parser-or-lang} is a parser object, it use that parser; if
 @var{parser-or-lang} is a language, it finds the first parser using
-that language in @var{treesit-parser-list} and use that.
+that language in @code{(treesit-parser-list)} and use that.
 
 If @var{named} is non-nil, this function looks for a named node
 instead (@pxref{tree-sitter named node, named node}).
@@ -523,7 +527,7 @@ Retrieving Node
 
 @defun treesit-buffer-root-node &optional language
 This function finds the first parser that uses @var{language} in
-@var{treesit-parser-list} in the current buffer, and returns the
+@code{(treesit-parser-list)} in the current buffer, and returns the
 root node of that buffer.  If it cannot find an appropriate parser, it
 returns nil.
 @end defun
@@ -1267,7 +1271,7 @@ Multiple Languages
 the ranges of @var{parser-or-lang} to @var{ranges}.  Conveniently,
 @var{parser-or-lang} could be either a parser or a language.  If it is
 a language, this function looks for the first parser in
-@var{treesit-parser-list} for that language in the current buffer,
+@code{(treesit-parser-list)} for that language in the current buffer,
 and set range for it.
 @end defun
 
@@ -1301,7 +1305,7 @@ Multiple Languages
 @defun treesit-language-at point
 This function tries to figure out which language is responsible for
 the text at @var{point}.  It goes over each parser in
-@var{treesit-parser-list} and see if that parser's range covers
+@code{(treesit-parser-list)} and see if that parser's range covers
 @var{point}.
 @end defun
 
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 5b65e00e07..3cfafd0d15 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -75,7 +75,7 @@ treesit-parse-string
 
 (defun treesit-language-at (point)
   "Return the language used at POINT."
-  (cl-loop for parser in treesit-parser-list
+  (cl-loop for parser in (treesit-parser-list)
            if (treesit-node-on point point parser)
            return (treesit-parser-language parser)))
 
@@ -122,7 +122,7 @@ treesit-node-at
 non-nil, only look for named node.
 
 If PARSER-OR-LANG is nil, use the first parser in
-`treesit-parser-list'; if PARSER-OR-LANG is a parser, use
+(`treesit-parser-list'); if PARSER-OR-LANG is a parser, use
 that parser; if PARSER-OR-LANG is a language, find a parser using
 that language in the current buffer, and use that."
   (let ((node (if (treesit-parser-p parser-or-lang)
@@ -150,7 +150,7 @@ treesit-node-on
 node.
 
 If PARSER-OR-LANG is nil, use the first parser in
-`treesit-parser-list'; if PARSER-OR-LANG is a parser, use
+(`treesit-parser-list'); if PARSER-OR-LANG is a parser, use
 that parser; if PARSER-OR-LANG is a language, find a parser using
 that language in the current buffer, and use that."
   (let ((root (if (treesit-parser-p parser-or-lang)
@@ -160,13 +160,13 @@ treesit-node-on
 
 (defun treesit-buffer-root-node (&optional language)
   "Return the root node of the current buffer.
-Use the first parser in `treesit-parser-list', if LANGUAGE is
+Use the first parser in (`treesit-parser-list'), if LANGUAGE is
 non-nil, use the first parser for LANGUAGE."
   (if-let ((parser
             (or (if language
                     (or (treesit-parser-create language)
                         (error "Cannot find a parser for %s" language))
-                  (or (car treesit-parser-list)
+                  (or (car (treesit-parser-list))
                       (error "Buffer has no parser"))))))
       (treesit-parser-root-node parser)))
 
@@ -770,7 +770,7 @@ treesit-indent
                 (skip-chars-forward " \t")
                 (point)))
          (smallest-node
-          (cl-loop for parser in treesit-parser-list
+          (cl-loop for parser in (treesit-parser-list)
                    for node = (treesit-node-at bol parser)
                    if node return node))
          (node (treesit-parent-while
@@ -856,7 +856,7 @@ treesit-search-forward
 
 QUERY has to capture the node to match.  LANG specifies the
 language in which we search for nodes.  If LANG is nil, use the
-first parser in `treesit-parser-list'.
+first parser in (`treesit-parser-list').
 
 Move forward/backward ARG times, positive ARG means go forward,
 negative ARG means go backward.
@@ -875,7 +875,7 @@ treesit-search-forward
   (cl-loop for idx from 1 to (abs arg)
            for parser = (if lang
                             (treesit-parser-create lang)
-                          (car treesit-parser-list))
+                          (car (treesit-parser-list)))
            for node =
            (if-let ((starting-point (point))
                     (node (treesit-node-at (point) parser t)))
@@ -914,7 +914,7 @@ treesit-search-beginning
 
 QUERY has to capture the node to match.  LANG specifies the
 language in which we search for nodes.  If LANG is nil, use the
-first parser in `treesit-parser-list'.
+first parser in (`treesit-parser-list').
 
 Move forward/backward ARG times, positive ARG means go forward,
 negative ARG means go backward.
@@ -937,7 +937,7 @@ treesit-search-end
 
 QUERY has to capture the node to match.  LANG specifies the
 language in which we search for nodes.  If LANG is nil, use the
-first parser in `treesit-parser-list'.
+first parser in (`treesit-parser-list').
 
 Move forward/backward ARG times, positive ARG means go forward,
 negative ARG means go backward.
@@ -993,7 +993,7 @@ treesit-inspect-node-at-point
 If called interactively, show in echo area, otherwise set
 `treesit--inspect-name' (which will appear in the mode-line
 if `treesit-inspect-mode' is enabled).  Uses the first parser
-in `treesit-parser-list'."
+in (`treesit-parser-list')."
   (interactive "p")
   ;; NODE-LIST contains all the node that starts at point.
   (let* ((node-list
@@ -1053,7 +1053,7 @@ treesit-inspect-mode
 its immediate parent.
 
 This minor mode doesn't create parsers on its own.  It simply
-uses the first parser in `treesit-parser-list'."
+uses the first parser in (`treesit-parser-list')."
   :lighter nil
   (if treesit-inspect-mode
       (progn
diff --git a/src/buffer.c b/src/buffer.c
index a0761f5b59..97e9e22738 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -231,6 +231,13 @@ bset_extra_line_spacing (struct buffer *b, Lisp_Object val)
 {
   b->extra_line_spacing_ = val;
 }
+#ifdef HAVE_TREE_SITTER
+static void
+bset_ts_parser_list (struct buffer *b, Lisp_Object val)
+{
+  b->ts_parser_list_ = val;
+}
+#endif
 static void
 bset_file_format (struct buffer *b, Lisp_Object val)
 {
@@ -1004,6 +1011,9 @@ reset_buffer (register struct buffer *b)
     (b, BVAR (&buffer_defaults, enable_multibyte_characters));
   bset_cursor_type (b, BVAR (&buffer_defaults, cursor_type));
   bset_extra_line_spacing (b, BVAR (&buffer_defaults, extra_line_spacing));
+#ifdef HAVE_TREE_SITTER
+  bset_ts_parser_list (b, Qnil);
+#endif
 
   b->display_error_modiff = 0;
 }
@@ -5273,6 +5283,9 @@ init_buffer_once (void)
   XSETFASTINT (BVAR (&buffer_local_flags, tab_line_format), idx); ++idx;
   XSETFASTINT (BVAR (&buffer_local_flags, cursor_type), idx); ++idx;
   XSETFASTINT (BVAR (&buffer_local_flags, extra_line_spacing), idx); ++idx;
+#ifdef HAVE_TREE_SITTER
+  XSETFASTINT (BVAR (&buffer_local_flags, ts_parser_list), idx); ++idx;
+#endif
   XSETFASTINT (BVAR (&buffer_local_flags, cursor_in_non_selected_windows), idx); ++idx;
 
   /* buffer_local_flags contains no pointers, so it's safe to treat it
@@ -5343,6 +5356,9 @@ init_buffer_once (void)
   bset_bidi_paragraph_separate_re (&buffer_defaults, Qnil);
   bset_cursor_type (&buffer_defaults, Qt);
   bset_extra_line_spacing (&buffer_defaults, Qnil);
+#ifdef HAVE_TREE_SITTER
+  bset_ts_parser_list (&buffer_defaults, Qnil);
+#endif
   bset_cursor_in_non_selected_windows (&buffer_defaults, Qt);
 
   bset_enable_multibyte_characters (&buffer_defaults, Qt);
diff --git a/src/buffer.h b/src/buffer.h
index 135eaf72d3..bc07a63b53 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -561,6 +561,10 @@ #define BVAR(buf, field) ((buf)->field ## _)
      in the display of this buffer.  */
   Lisp_Object extra_line_spacing_;
 
+#ifdef HAVE_TREE_SITTER
+  /* A list of tree-sitter parsers for this buffer.  */
+  Lisp_Object ts_parser_list_;
+#endif
   /* Cursor type to display in non-selected windows.
      t means to use hollow box cursor.
      See `cursor-type' for other values.  */
diff --git a/src/treesit.c b/src/treesit.c
index fcb333b8ec..be0955805c 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -342,8 +342,8 @@ ts_tree_edit_1 (TSTree *tree, ptrdiff_t start_byte,
 ts_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
 		  ptrdiff_t new_end_byte)
 {
-  for (Lisp_Object parser_list =
-	 Fsymbol_value (Qtreesit_parser_list);
+  for (Lisp_Object parser_list
+	 = BVAR (current_buffer, ts_parser_list);
        !NILP (parser_list);
        parser_list = XCDR (parser_list))
     {
@@ -704,23 +704,24 @@ DEFUN ("treesit-parser-create",
   ts_initialize ();
 
   CHECK_SYMBOL (language);
-  struct buffer *old_buffer = current_buffer;
-  if (!NILP (buffer))
+  struct buffer *buf;
+  if (NILP (buffer))
+    buf = current_buffer;
+  else
     {
       CHECK_BUFFER (buffer);
-      set_buffer_internal (XBUFFER (buffer));
+      buf = XBUFFER (buffer);
     }
-  ts_check_buffer_size (current_buffer);
+  ts_check_buffer_size (buf);
 
   /* See if we can reuse a parser.  */
-  for (Lisp_Object tail = Fsymbol_value (Qtreesit_parser_list);
+  for (Lisp_Object tail = BVAR (buf, ts_parser_list);
        NILP (no_reuse) && !NILP (tail);
        tail = XCDR (tail))
     {
       struct Lisp_TS_Parser *parser = XTS_PARSER (XCAR (tail));
       if (EQ (parser->language_symbol, language))
 	{
-	  set_buffer_internal (old_buffer);
 	  return XCAR (tail);
 	}
     }
@@ -734,13 +735,53 @@ DEFUN ("treesit-parser-create",
   Lisp_Object lisp_parser
     = make_ts_parser (Fcurrent_buffer (), parser, NULL, language);
 
-  Fset (Qtreesit_parser_list,
-	Fcons (lisp_parser, Fsymbol_value (Qtreesit_parser_list)));
+  BVAR (buf, ts_parser_list)
+    = Fcons (lisp_parser, BVAR (buf, ts_parser_list));
 
-  set_buffer_internal (old_buffer);
   return lisp_parser;
 }
 
+DEFUN ("treesit-parser-delete",
+       Ftreesit_parser_delete, Streesit_parser_delete,
+       1, 1, 0,
+       doc: /* Delete PARSER from its buffer.  */)
+  (Lisp_Object parser)
+{
+  CHECK_TS_PARSER (parser);
+  Lisp_Object buffer = XTS_PARSER (parser)->buffer;
+  struct buffer *buf = XBUFFER (buffer);
+  BVAR (buf, ts_parser_list)
+    = Fdelete (parser, BVAR (buf, ts_parser_list));
+  return Qnil;
+}
+
+DEFUN ("treesit-parser-list",
+       Ftreesit_parser_list, Streesit_parser_list,
+       0, 1, 0,
+       doc: /* Return BUFFER's parser list.
+BUFFER defaults to the current buffer.  */)
+  (Lisp_Object buffer)
+{
+  struct buffer *buf;
+  if (NILP (buffer))
+    buf = current_buffer;
+  else
+    {
+      CHECK_BUFFER (buffer);
+      buf = XBUFFER (buffer);
+    }
+  /* Return a fresh list so messing with that list doesn't affect our
+     internal data.  */
+  Lisp_Object return_list = Qnil;
+  for (Lisp_Object tail = BVAR (buf, ts_parser_list);
+       !NILP (tail);
+       tail = XCDR (tail))
+    {
+      return_list = Fcons (XCAR (tail), return_list);
+    }
+  return Freverse (return_list);
+}
+
 DEFUN ("treesit-parser-buffer",
        Ftreesit_parser_buffer, Streesit_parser_buffer,
        1, 1, 0,
@@ -1799,17 +1840,6 @@ syms_of_treesit (void)
 		"This node is outdated, please retrieve a new one",
 		Qtreesit_error);
 
-  DEFSYM (Qtreesit_parser_list, "treesit-parser-list");
-  DEFVAR_LISP ("treesit-parser-list", Vtreesit_parser_list,
-	       doc: /* A list of tree-sitter parsers.
-
-If you removed a parser from this list, do not put it back in.  Emacs
-keeps the parser in this list updated with any change in the buffer.
-If removed and put back in, there is no guarantee that the parser is in
-sync with the buffer's content.  */);
-  Vtreesit_parser_list = Qnil;
-  Fmake_variable_buffer_local (Qtreesit_parser_list);
-
   DEFVAR_LISP ("treesit-load-name-override-list",
 	       Vtreesit_load_name_override_list,
 	       doc:
@@ -1848,6 +1878,8 @@ syms_of_treesit (void)
   defsubr (&Streesit_node_parser);
 
   defsubr (&Streesit_parser_create);
+  defsubr (&Streesit_parser_delete);
+  defsubr (&Streesit_parser_list);
   defsubr (&Streesit_parser_buffer);
   defsubr (&Streesit_parser_language);
 
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index 416329d94d..ebfe650dc0 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -27,7 +27,7 @@ treesit-basic-parsing
   (with-temp-buffer
     (let ((parser (treesit-parser-create 'json)))
       (should
-       (eq parser (car treesit-parser-list)))
+       (eq parser (car (treesit-parser-list))))
       (should
        (equal (treesit-node-string
                (treesit-parser-root-node parser))

commit 33f7e10a29dad475f7872d6af87ecefaccdb55fc
Author: Yuan Fu <yuan@debian-BULLSEYE-live-builder-AMD64>
Date:   Thu Jun 16 11:25:08 2022 -0700

    Add treesit test for previous change
    
    * test/src/treesit-tests.el (treesit-cross-boundary): New test.

diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index 32971fbacb..416329d94d 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -223,6 +223,89 @@ treesit-narrow
                (treesit-parser-root-node parser))
               "(document (array (number)))")))))
 
+(ert-deftest treesit-cross-boundary ()
+  "Tests for cross-boundary edits.
+Cross-boundary means crossing visible_beg and visible_end.  We
+don't test if parser parses correctly, instead we just check
+edits like this don't produce assertion errors.  (I inserted a
+bunch of assertions that checks e.g. visible_beg <=
+visible_end.)"
+  (with-temp-buffer
+    (let (parser root-node pattern doc-node object-node pair-node)
+      (progn
+        (insert "xxx[1,{\"name\": \"Bob\"},2,3]xxx")
+        (narrow-to-region (+ (point-min) 3) (- (point-max) 3))
+        (setq parser (treesit-parser-create 'json))
+        ;; Now visible_beg/end = visible boundary.
+        (setq root-node (treesit-parser-root-node parser)))
+      ;; Now parser knows the content of the visible region.
+      (widen)
+      ;; Now visible_beg/end don't change, but visible region expanded.
+      (delete-region 1 7)
+      ;; (1) This change is across visible_beg.  I expect
+      ;; ts_record_change to receive (start=1, old_end=7, new_end=1).
+      (treesit-parser-root-node parser)
+      ;; Above form forces a parse which calls
+      ;; `ts_ensure_position_synced'. Now visible_beg/end matches the
+      ;; visible region (whole buffer).  We want to test that this
+      ;; doesn't cause assertion error.
+
+      (should (equal "{\"name\": \"Bob\"},2,3]xxx" (buffer-string)))
+      (narrow-to-region 1 16)
+      (should (equal "{\"name\": \"Bob\"}" (buffer-string)))
+      (treesit-parser-root-node parser)
+      ;; Call `ts_ensure_position_synced' again to update visible_beg/end.
+      (widen)
+      (goto-char 14)
+      (insert "by")
+      ;; (2) This change is inside [visible_beg, visible_end].
+      (should (equal "{\"name\": \"Bobby\"},2,3]xxx" (buffer-string)))
+      (delete-region 14 23)
+      ;; This delete is across visible_end.
+      (should (equal "{\"name\": \"Bobxxx" (buffer-string)))
+      (treesit-parser-root-node parser)
+      ;; visible_beg/end synced.
+
+      (narrow-to-region 3 7)
+      (should (equal "name" (buffer-string)))
+      (treesit-parser-root-node parser)
+      ;; visible_beg/end synced.
+      (widen)
+      (goto-char (point-min))
+      (insert "zzz")
+      (should (equal "zzz{\"name\": \"Bobxxx" (buffer-string)))
+      ;; (3) Test inserting before visible_beg.
+      (treesit-parser-root-node parser)
+      ;; visible_beg/end synced.
+
+      (narrow-to-region 4 11)
+      (should (equal "{\"name\"" (buffer-string)))
+      (treesit-parser-root-node parser)
+      ;; visible_beg/end synced.
+      (widen)
+      (goto-char (point-max))
+      (insert "yyy")
+      ;; (4) This change is after visible_end.
+      (treesit-parser-root-node parser)
+      ;; Sync up visible_beg/end.
+      (should (equal "zzz{\"name\": \"Bobxxxyyy" (buffer-string)))
+
+      (narrow-to-region 1 17)
+      (should (equal "zzz{\"name\": \"Bob" (buffer-string)))
+      (treesit-parser-root-node parser)
+      ;; Sync up visible_beg/end.
+      (widen)
+      (delete-region 13 (point-max))
+      (treesit-parser-root-node parser)
+      ;; Sync up visible_beg/end.
+      (should (equal "zzz{\"name\": " (buffer-string)))
+      ;; Ideally we want to also test the case where we delete and
+      ;; insert simultaneously, but the only such use is in
+      ;; `casify_region', all others either only inserts or only
+      ;; deletes.  I'll leave it to someone to try to write a test
+      ;; that calls that.
+      )))
+
 (ert-deftest treesit-range ()
   "Tests if range works."
   (with-temp-buffer

commit dd65d1c396da2e024468196c4d5bcb72198f524a
Author: Yuan Fu <yuan@debian-BULLSEYE-live-builder-AMD64>
Date:   Thu Jun 16 01:11:09 2022 -0700

    Consolidate treesit parser create functions
    
    Merge treesit-parser-create, treesit-get-parser,
    treesit-get-parser-create into one: treesit-parser-create.
    
    * src/treesit.c (Ftreesit_parser_language): make BUFFER parameter
    optional, add new parameter NO-REUSE.  Optionally reuse parser.
    * test/src/treesit-tests.el: Change all parser creation to use
    treesit-parser-create.  Remove tests for the removed functions.
    * lisp/treesit.el (treesit-get-parser, treesit-get-parser-create):
    Remove.
    * lisp/treesit.el (treesit-set-ranges, treesit-get-ranges)
    (treesit-buffer-root-node, treesit-query-string)
    (treesit-font-lock-fontify-region, treesit-search-forward)
    (treesit-query-validate): Change to use treesit-parser-create.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 100ca23316..5b65e00e07 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -65,27 +65,13 @@ treesit-should-enable-p
 
 ;;; Parser API supplement
 
-(defun treesit-get-parser (language)
-  "Find the first parser using LANGUAGE in `treesit-parser-list'."
-  (catch 'found
-    (dolist (parser treesit-parser-list)
-      (when (eq language (treesit-parser-language parser))
-        (throw 'found parser)))))
-
-(defun treesit-get-parser-create (language)
-  "Find the first parser using LANGUAGE in `treesit-parser-list'.
-If none exists, create one and return it."
-  (or (treesit-get-parser language)
-      (treesit-parser-create
-       (current-buffer) language)))
-
 (defun treesit-parse-string (string language)
   "Parse STRING using a parser for LANGUAGE.
 Return the root node of the syntax tree."
   (with-temp-buffer
     (insert string)
     (treesit-parser-root-node
-     (treesit-parser-create (current-buffer) language))))
+     (treesit-parser-create language))))
 
 (defun treesit-language-at (point)
   "Return the language used at POINT."
@@ -97,7 +83,7 @@ treesit-set-ranges
   "Set the ranges of PARSER-OR-LANG to RANGES."
   (treesit-parser-set-included-ranges
    (cond ((symbolp parser-or-lang)
-          (or (treesit-get-parser parser-or-lang)
+          (or (treesit-parser-create parser-or-lang)
               (error "Cannot find a parser for %s" parser-or-lang)))
          ((treesit-parser-p parser-or-lang)
           parser-or-lang)
@@ -109,7 +95,7 @@ treesit-get-ranges
   "Get the ranges of PARSER-OR-LANG."
   (treesit-parser-included-ranges
    (cond ((symbolp parser-or-lang)
-          (or (treesit-get-parser parser-or-lang)
+          (or (treesit-parser-create parser-or-lang)
               (error "Cannot find a parser for %s" parser-or-lang)))
          ((treesit-parser-p parser-or-lang)
           parser-or-lang)
@@ -178,7 +164,7 @@ treesit-buffer-root-node
 non-nil, use the first parser for LANGUAGE."
   (if-let ((parser
             (or (if language
-                    (or (treesit-get-parser language)
+                    (or (treesit-parser-create language)
                         (error "Cannot find a parser for %s" language))
                   (or (car treesit-parser-list)
                       (error "Buffer has no parser"))))))
@@ -410,7 +396,7 @@ treesit-query-string
 See `treesit-query-capture' for QUERY."
   (with-temp-buffer
     (insert string)
-    (let ((parser (treesit-parser-create (current-buffer) language)))
+    (let ((parser (treesit-parser-create language)))
       (treesit-query-capture
        (treesit-parser-root-node parser)
        query))))
@@ -520,7 +506,7 @@ treesit-font-lock-fontify-region
   (dolist (setting treesit-font-lock-settings)
     (when-let* ((language (nth 0 setting))
                 (match-pattern (nth 1 setting))
-                (parser (treesit-get-parser-create language)))
+                (parser (treesit-parser-create language)))
       (when-let ((node (treesit-node-on start end parser)))
         (let ((captures (treesit-query-capture
                          node match-pattern
@@ -888,7 +874,7 @@ treesit-search-forward
 the tree."
   (cl-loop for idx from 1 to (abs arg)
            for parser = (if lang
-                            (treesit-get-parser-create lang)
+                            (treesit-parser-create lang)
                           (car treesit-parser-list))
            for node =
            (if-let ((starting-point (point))
@@ -1088,7 +1074,7 @@ treesit-query-validate
   (cl-assert (or (consp query) (stringp query)))
   (let ((buf (get-buffer-create "*tree-sitter check query*")))
     (with-temp-buffer
-      (treesit-get-parser-create language)
+      (treesit-parser-create language)
       (condition-case err
           (progn (treesit-query-in language query)
                  (message "QUERY is valid"))
diff --git a/src/treesit.c b/src/treesit.c
index 5a53b09675..fcb333b8ec 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -692,23 +692,38 @@ DEFUN ("treesit-node-parser",
 
 DEFUN ("treesit-parser-create",
        Ftreesit_parser_create, Streesit_parser_create,
-       2, 2, 0,
+       1, 3, 0,
        doc: /* Create and return a parser in BUFFER for LANGUAGE.
 
-The parser is automatically added to BUFFER's
-`treesit-parser-list'.  LANGUAGE should be the symbol of a
-function provided by a tree-sitter language dynamic module, e.g.,
-'treesit-json.  If BUFFER is nil, use the current buffer.  */)
-  (Lisp_Object buffer, Lisp_Object language)
+The parser is automatically added to BUFFER's `treesit-parser-list'.
+LANGUAGE is a language symbol.  If BUFFER is nil, use the current
+buffer.  If BUFFER already has a parser for LANGUAGE, return that
+parser.  If NO-REUSE is non-nil, always create a new parser.  */)
+  (Lisp_Object language, Lisp_Object buffer, Lisp_Object no_reuse)
 {
-  if (NILP (buffer))
-    buffer = Fcurrent_buffer ();
+  ts_initialize ();
 
-  CHECK_BUFFER (buffer);
   CHECK_SYMBOL (language);
-  ts_check_buffer_size (XBUFFER (buffer));
+  struct buffer *old_buffer = current_buffer;
+  if (!NILP (buffer))
+    {
+      CHECK_BUFFER (buffer);
+      set_buffer_internal (XBUFFER (buffer));
+    }
+  ts_check_buffer_size (current_buffer);
 
-  ts_initialize ();
+  /* See if we can reuse a parser.  */
+  for (Lisp_Object tail = Fsymbol_value (Qtreesit_parser_list);
+       NILP (no_reuse) && !NILP (tail);
+       tail = XCDR (tail))
+    {
+      struct Lisp_TS_Parser *parser = XTS_PARSER (XCAR (tail));
+      if (EQ (parser->language_symbol, language))
+	{
+	  set_buffer_internal (old_buffer);
+	  return XCAR (tail);
+	}
+    }
 
   TSParser *parser = ts_parser_new ();
   TSLanguage *lang = ts_load_language (language, true);
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index c6d5f25472..32971fbacb 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -25,8 +25,7 @@
 (ert-deftest treesit-basic-parsing ()
   "Test basic parsing routines."
   (with-temp-buffer
-    (let ((parser (treesit-parser-create
-                   (current-buffer) 'json)))
+    (let ((parser (treesit-parser-create 'json)))
       (should
        (eq parser (car treesit-parser-list)))
       (should
@@ -55,8 +54,7 @@ treesit-node-api
     (let (parser root-node doc-node object-node pair-node)
       (progn
         (insert "[1,2,{\"name\": \"Bob\"},3]")
-        (setq parser (treesit-parser-create
-                      (current-buffer) 'json))
+        (setq parser (treesit-parser-create 'json))
         (setq root-node (treesit-parser-root-node
                          parser)))
       ;; `treesit-node-type'.
@@ -129,8 +127,7 @@ treesit-query-api
     (let (parser root-node pattern doc-node object-node pair-node)
       (progn
         (insert "[1,2,{\"name\": \"Bob\"},3]")
-        (setq parser (treesit-parser-create
-                      (current-buffer) 'json))
+        (setq parser (treesit-parser-create 'json))
         (setq root-node (treesit-parser-root-node
                          parser)))
 
@@ -181,8 +178,7 @@ treesit-narrow
       (progn
         (insert "xxx[1,{\"name\": \"Bob\"},2,3]xxx")
         (narrow-to-region (+ (point-min) 3) (- (point-max) 3))
-        (setq parser (treesit-parser-create
-                      (current-buffer) 'json))
+        (setq parser (treesit-parser-create 'json))
         (setq root-node (treesit-parser-root-node
                          parser)))
       ;; This test is from the basic test.
@@ -233,8 +229,7 @@ treesit-range
     (let (parser root-node pattern doc-node object-node pair-node)
       (progn
         (insert "[[1],oooxxx[1,2,3],xxx[1,2]]")
-        (setq parser (treesit-parser-create
-                      (current-buffer) 'json))
+        (setq parser (treesit-parser-create 'json))
         (setq root-node (treesit-parser-root-node
                          parser)))
       (should-error
@@ -258,9 +253,9 @@ treesit-multi-lang
     (let (html css js html-range css-range js-range)
       (progn
         (insert "<html><script>1</script><style>body {}</style></html>")
-        (setq html (treesit-get-parser-create 'html))
-        (setq css (treesit-get-parser-create 'css))
-        (setq js (treesit-get-parser-create 'javascript)))
+        (setq html (treesit-parser-create 'html))
+        (setq css (treesit-parser-create 'css))
+        (setq js (treesit-parser-create 'javascript)))
       ;; JavaScript.
       (setq js-range
             (treesit-query-range
@@ -287,13 +282,6 @@ treesit-multi-lang
 
 (ert-deftest treesit-parser-supplemental ()
   "Supplemental node functions."
-  ;; `treesit-get-parser'.
-  (with-temp-buffer
-    (should (equal (treesit-get-parser 'json) nil)))
-  ;; `treesit-get-parser-create'.
-  (with-temp-buffer
-    (should (not (equal (treesit-get-parser-create 'json)
-                        nil))))
   ;; `treesit-parse-string'.
   (should (equal (treesit-node-string
                   (treesit-parse-string
@@ -304,14 +292,10 @@ treesit-parser-supplemental
     (let (parser root-node doc-node object-node pair-node)
       (progn
         (insert "[1,2,{\"name\": \"Bob\"},3]")
-        (setq parser (treesit-parser-create
-                      (current-buffer) 'json))
+        (setq parser (treesit-parser-create 'json))
         (setq root-node (treesit-parser-root-node
                          parser))
         (setq doc-node (treesit-node-child root-node 0)))
-      ;; `treesit-get-parser'.
-      (should (not (equal (treesit-get-parser 'json)
-                          nil)))
       ;; `treesit-language-at'.
       (should (equal (treesit-language-at (point))
                      'json))
@@ -326,8 +310,7 @@ treesit-node-supplemental
   (let (parser root-node doc-node array-node)
     (progn
       (insert "[1,2,{\"name\": \"Bob\"},3]")
-      (setq parser (treesit-parser-create
-                    (current-buffer) 'json))
+      (setq parser (treesit-parser-create 'json))
       (setq root-node (treesit-parser-root-node
                        parser))
       (setq doc-node (treesit-node-child root-node 0)))

commit 7cee82a91d287e42e6596960cbee17157cde4b29
Author: Yuan Fu <yuan@debian-BULLSEYE-live-builder-AMD64>
Date:   Wed Jun 15 21:53:15 2022 -0700

    Fix treesit function ts_record_change and friends
    
    In ts_record_change, the way we calculate tree-sitter change was
    wrong:
    
        ptrdiff_t affected_start =
          max (visible_beg, start_byte) - visible_beg;
        ptrdiff_t affected_old_end =
          min (visible_end, affected_start + bytes_del);
        ptrdiff_t affected_new_end =
          affected_start + bytes_ins;
    
    I changed it to below (also renamed variables)
    
        ptrdiff_t start_offset =
          min (visible_end,
               max (visible_beg, start_byte)) - visible_beg;
        ptrdiff_t old_end_offset =
          min (visible_end,
               max (visible_beg, old_end_byte)) - visible_beg;
        ptrdiff_t new_end_offset =
          min (visible_end,
               max (visible_beg, new_end_byte)) - visible_beg;
    
    Also previously only visible_end is changed (in a wrong way)
    
        XTS_PARSER (lisp_parser)->visible_end = affected_new_end;
    
    Now we have a whole new bunch of code that makes the right change.
    
    * src/treesit.c (ts_tree_edit_1): Add assertion.
    (ts_record_change): See above.
    (ts_ensure_position_synced): Add assertion.
    (ts_ensure_parsed): Only free if non-NULL.
    (make_ts_parser): Add assertion.
    (Ftreesit_parser_set_included_ranges): Ensure parsed before setting ranges.
    (Ftreesit_parser_included_ranges): Add assertion.

diff --git a/src/treesit.c b/src/treesit.c
index 585683aa1b..5a53b09675 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -324,6 +324,9 @@ DEFUN ("treesit-language-available-p",
 ts_tree_edit_1 (TSTree *tree, ptrdiff_t start_byte,
 		ptrdiff_t old_end_byte, ptrdiff_t new_end_byte)
 {
+  eassert (start_byte >= 0);
+  eassert (start_byte <= old_end_byte);
+  eassert (start_byte <= new_end_byte);
   TSPoint dummy_point = {0, 0};
   TSInputEdit edit = {(uint32_t) start_byte,
 		      (uint32_t) old_end_byte,
@@ -356,24 +359,56 @@ ts_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
 	     insert, and think of them as moving unchanged text back
 	     and forth.  After all, the whole point of updating the
 	     tree is to update the position of unchanged text.  */
-	  ptrdiff_t bytes_del = old_end_byte - start_byte;
-	  ptrdiff_t bytes_ins = new_end_byte - start_byte;
-
 	  ptrdiff_t visible_beg = XTS_PARSER (lisp_parser)->visible_beg;
 	  ptrdiff_t visible_end = XTS_PARSER (lisp_parser)->visible_end;
-
-	  ptrdiff_t affected_start =
-	    max (visible_beg, start_byte) - visible_beg;
-	  ptrdiff_t affected_old_end =
-	    min (visible_end, affected_start + bytes_del);
-	  ptrdiff_t affected_new_end =
-	    affected_start + bytes_ins;
-
-	  ts_tree_edit_1 (tree, affected_start, affected_old_end,
-			  affected_new_end);
-	  XTS_PARSER (lisp_parser)->visible_end = affected_new_end;
+	  eassert (visible_beg >= 0);
+	  eassert (visible_beg <= visible_end);
+
+	  /* AFFECTED_START/OLD_END/NEW_END are (0-based) offsets from
+	     VISIBLE_BEG.  min(visi_end, max(visi_beg, value)) clips
+	     value into [visi_beg, visi_end], and subtracting visi_beg
+	     gives the offset from visi_beg.  */
+	  ptrdiff_t start_offset =
+	    min (visible_end,
+		 max (visible_beg, start_byte)) - visible_beg;
+	  ptrdiff_t old_end_offset =
+	    min (visible_end,
+		 max (visible_beg, old_end_byte)) - visible_beg;
+	  ptrdiff_t new_end_offset =
+	    min (visible_end,
+		 max (visible_beg, new_end_byte)) - visible_beg;
+	  eassert (start_offset <= old_end_offset);
+	  eassert (start_offset <= new_end_offset);
+
+	  ts_tree_edit_1 (tree, start_offset, old_end_offset,
+			  new_end_offset);
 	  XTS_PARSER (lisp_parser)->need_reparse = true;
 	  XTS_PARSER (lisp_parser)->timestamp++;
+
+	  /* VISIBLE_BEG/END records tree-sitter's range of view in
+	     the buffer.  Ee need to adjust them when tree-sitter's
+	     view changes.  */
+	  ptrdiff_t visi_beg_delta;
+	  if (old_end_byte > new_end_byte)
+	    {
+	      /* Move backward.  */
+	      visi_beg_delta = min (visible_beg, new_end_byte)
+		- min (visible_beg, old_end_byte);
+	    }
+	  else
+	    {
+	      /* Move forward.  */
+	      visi_beg_delta = old_end_byte < visible_beg
+		? new_end_byte - old_end_byte : 0;
+	    }
+	  XTS_PARSER (lisp_parser)->visible_beg
+	    = visible_beg + visi_beg_delta;
+	  XTS_PARSER (lisp_parser)->visible_end
+	    = visible_end + visi_beg_delta
+	    + (new_end_offset - old_end_offset);
+	  eassert (XTS_PARSER (lisp_parser)->visible_beg >= 0);
+	  eassert (XTS_PARSER (lisp_parser)->visible_beg
+		   <= XTS_PARSER (lisp_parser)->visible_end);
 	}
     }
 }
@@ -389,6 +424,9 @@ ts_ensure_position_synced (Lisp_Object parser)
   struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
   ptrdiff_t visible_beg = XTS_PARSER (parser)->visible_beg;
   ptrdiff_t visible_end = XTS_PARSER (parser)->visible_end;
+  eassert (0 <= visible_beg);
+  eassert (visible_beg <= visible_end);
+
   /* Before we parse or set ranges, catch up with the narrowing
      situation.  We change visible_beg and visible_end to match
      BUF_BEGV_BYTE and BUF_ZV_BYTE, and inform tree-sitter of the
@@ -403,6 +441,7 @@ ts_ensure_position_synced (Lisp_Object parser)
       /* Tree-sitter sees: insert at the beginning. */
       ts_tree_edit_1 (tree, 0, 0, visible_beg - BUF_BEGV_BYTE (buffer));
       visible_beg = BUF_BEGV_BYTE (buffer);
+      eassert (visible_beg <= visible_end);
     }
   /* 2. Make sure visible_end = BUF_ZV_BYTE.  */
   if (visible_end < BUF_ZV_BYTE (buffer))
@@ -412,6 +451,7 @@ ts_ensure_position_synced (Lisp_Object parser)
 		      visible_end - visible_beg,
 		      BUF_ZV_BYTE (buffer) - visible_beg);
       visible_end = BUF_ZV_BYTE (buffer);
+      eassert (visible_beg <= visible_end);
     }
   else if (visible_end > BUF_ZV_BYTE (buffer))
     {
@@ -420,6 +460,7 @@ ts_ensure_position_synced (Lisp_Object parser)
 		      visible_end - visible_beg,
 		      BUF_ZV_BYTE (buffer) - visible_beg);
       visible_end = BUF_ZV_BYTE (buffer);
+      eassert (visible_beg <= visible_end);
     }
   /* 3. Make sure visible_beg = BUF_BEGV_BYTE.  */
   if (visible_beg < BUF_BEGV_BYTE (buffer))
@@ -427,6 +468,7 @@ ts_ensure_position_synced (Lisp_Object parser)
       /* Tree-sitter sees: delete at the beginning.  */
       ts_tree_edit_1 (tree, 0, BUF_BEGV_BYTE (buffer) - visible_beg, 0);
       visible_beg = BUF_BEGV_BYTE (buffer);
+      eassert (visible_beg <= visible_end);
     }
   eassert (0 <= visible_beg);
   eassert (visible_beg <= visible_end);
@@ -477,7 +519,8 @@ ts_ensure_parsed (Lisp_Object parser)
       xsignal1 (Qtreesit_parse_error, buf);
     }
 
-  ts_tree_delete (tree);
+  if (tree != NULL)
+    ts_tree_delete (tree);
   XTS_PARSER (parser)->tree = new_tree;
   XTS_PARSER (parser)->need_reparse = false;
 }
@@ -551,6 +594,7 @@ make_ts_parser (Lisp_Object buffer, TSParser *parser,
   lisp_parser->need_reparse = true;
   lisp_parser->visible_beg = BUF_BEGV (XBUFFER (buffer));
   lisp_parser->visible_end = BUF_ZV (XBUFFER (buffer));
+  eassert (lisp_parser->visible_beg <= lisp_parser->visible_end);
   return make_lisp_ptr (lisp_parser, Lisp_Vectorlike);
 }
 
@@ -673,10 +717,7 @@ DEFUN ("treesit-parser-create",
   ts_parser_set_language (parser, lang);
 
   Lisp_Object lisp_parser
-    = make_ts_parser (buffer, parser, NULL, language);
-
-  struct buffer *old_buffer = current_buffer;
-  set_buffer_internal (XBUFFER (buffer));
+    = make_ts_parser (Fcurrent_buffer (), parser, NULL, language);
 
   Fset (Qtreesit_parser_list,
 	Fcons (lisp_parser, Fsymbol_value (Qtreesit_parser_list)));
@@ -835,6 +876,11 @@ DEFUN ("treesit-parser-included-ranges",
     (XTS_PARSER (parser)->parser, &len);
   if (len == 0)
     return Qnil;
+
+  /* Our return value depends on the buffer state (BUF_BEGV_BYTE,
+     etc), so we need to sync up.  */
+  ts_ensure_position_synced (parser);
+
   struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
 
   Lisp_Object list = Qnil;
@@ -843,6 +889,9 @@ DEFUN ("treesit-parser-included-ranges",
       TSRange range = ranges[idx];
       uint32_t beg_byte = range.start_byte + BUF_BEGV_BYTE (buffer);
       uint32_t end_byte = range.end_byte + BUF_BEGV_BYTE (buffer);
+      eassert (BUF_BEGV_BYTE (buffer) <= beg_byte);
+      eassert (beg_byte <= end_byte);
+      eassert (end_byte <= BUF_ZV_BYTE (buffer));
 
       Lisp_Object lisp_range =
 	Fcons (make_fixnum (buf_bytepos_to_charpos (buffer, beg_byte)) ,

commit bd1b27b7c7bbd969cf76409499bb84a83600c42a
Author: Yuan Fu <yuan@debian-BULLSEYE-live-builder-AMD64>
Date:   Wed Jun 15 12:17:10 2022 -0700

    ; Minor optimization in treesit range function
    
    * src/treesit.c (Ftreesit_parser_set_included_ranges): Lift
    assignment out of the loop.

diff --git a/src/treesit.c b/src/treesit.c
index 88d5ea9122..585683aa1b 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -786,12 +786,11 @@ DEFUN ("treesit-parser-set-included-ranges",
       /* Set ranges for PARSER.  */
       ptrdiff_t len = list_length (ranges);
       TSRange *ts_ranges = malloc (sizeof(TSRange) * len);
+      struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
 
       for (int idx=0; !NILP (ranges); idx++, ranges = XCDR (ranges))
 	{
 	  Lisp_Object range = XCAR (ranges);
-	  struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
-
 	  EMACS_INT beg_byte = buf_charpos_to_bytepos
 	    (buffer, XFIXNUM (XCAR (range)));
 	  EMACS_INT end_byte = buf_charpos_to_bytepos

commit a4d7bcccba5ffaafb769d8f517c159d64b0887bc
Author: Yuan Fu <yuan@debian-BULLSEYE-live-builder-AMD64>
Date:   Wed Jun 15 12:15:24 2022 -0700

    ; * src/treesit.c: Add comment to explain design decisions.

diff --git a/src/treesit.c b/src/treesit.c
index 8d0f2e517a..88d5ea9122 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -89,6 +89,14 @@ Copyright (C) 2021-2022 Free Software Foundation, Inc.
    - lisp/emacs-lisp/cl-preloaded.el & data.c & lisp.h for parser and
      node type.
 
+   We don't parse at every keystroke.  Instead we only record the
+   changes at each keystroke, and only parse when requested.  It is
+   possible that lazy parsing is worse: instead of dispersed little
+   pauses, now you have less frequent but larger pauses.  I doubt
+   there will be any perceived difference, as the lazy parsing is
+   going to be pretty frequent anyway.  Also this (lazy parsing) is
+   what the mailing list guys wanted.
+
    Because it is pretty slow (comparing to other tree-sitter
    operations) for tree-sitter to parse the query and produce a query
    object, it is very wasteful to reparse the query every time

commit 0332b8e2c5f2909b108ae4b63641b38a42c27fd3
Author: Yuan Fu <yuan@debian-BULLSEYE-live-builder-AMD64>
Date:   Wed Jun 15 12:14:54 2022 -0700

    ; * src/treesit.c (ts_check_buffer_size): Improve error message.

diff --git a/src/treesit.c b/src/treesit.c
index 9e510a921e..8d0f2e517a 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -434,7 +434,7 @@ ts_check_buffer_size (struct buffer *buffer)
     (BUF_Z (buffer) - BUF_BEG (buffer));
   if (buffer_size > UINT32_MAX)
     xsignal2 (Qtreesit_buffer_too_large,
-	      build_pure_c_string ("Buffer size too large, size:"),
+	      build_pure_c_string ("Buffer size larger than 4GB, size:"),
 	      make_fixnum (buffer_size));
 }
 

commit d6b00f7ed96f91d64df9dc3523c9dd36a5ecec57
Author: Yuan Fu <yuan@debian-BULLSEYE-live-builder-AMD64>
Date:   Wed Jun 15 12:14:26 2022 -0700

    ; * src/treesit.c (ts_read_buffer): Clarify comments.

diff --git a/src/treesit.c b/src/treesit.c
index 92692f550f..9e510a921e 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -501,7 +501,7 @@ ts_read_buffer (void *parser, uint32_t byte_index,
   /* This function could run from a user command, so it is better to
      do nothing instead of raising an error. (It was a pain in the a**
      to decrypt mega-if-conditions in Emacs source, so I wrote the two
-     branches separately.)  */
+     branches separately, you are welcome.)  */
   if (!BUFFER_LIVE_P (buffer))
     {
       beg = NULL;

commit d729e3e3fcad4270f6da358b12ab8e4a52fdc204
Author: Yuan Fu <yuan@debian-BULLSEYE-live-builder-AMD64>
Date:   Wed Jun 15 11:33:35 2022 -0700

    * src/treesit.c (ts_check_range_argument): Check for point-min/max.

diff --git a/src/treesit.c b/src/treesit.c
index dc64aef425..92692f550f 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -719,7 +719,11 @@ DEFUN ("treesit-parser-root-node",
 static void
 ts_check_range_argument (Lisp_Object ranges)
 {
-  EMACS_INT last_point = 1;
+  struct buffer *buffer = current_buffer;
+  ptrdiff_t point_min = BUF_BEGV (buffer);
+  ptrdiff_t point_max = BUF_ZV (buffer);
+  EMACS_INT last_point = point_min;
+
   for (Lisp_Object tail = ranges;
        !NILP (tail); tail = XCDR (tail))
     {
@@ -730,11 +734,10 @@ ts_check_range_argument (Lisp_Object ranges)
       CHECK_FIXNUM (XCDR (range));
       EMACS_INT beg = XFIXNUM (XCAR (range));
       EMACS_INT end = XFIXNUM (XCDR (range));
-      /* TODO: Maybe we should check for point-min/max, too?  */
-      if (!(last_point <= beg && beg <= end))
+      if (!(last_point <= beg && beg <= end && end <= point_max))
 	xsignal2 (Qtreesit_range_invalid,
 		  build_pure_c_string
-		  ("RANGE is either overlapping or out-of-order"),
+		  ("RANGE is either overlapping or out-of-order or out-of-range"),
 		  ranges);
       last_point = end;
     }

commit b162faba0bc04b8584af6f536bef8d0525076a28
Author: Yuan Fu <yuan@debian-BULLSEYE-live-builder-AMD64>
Date:   Tue Jun 14 21:04:52 2022 -0700

    Fix compile warnings and errors in treesit.c
    
    * src/treesit.c (ts_initialize): Fix.
    (Ftreesit_parser_set_included_ranges): Fix.
    (Ftreesit_query_compile): Fix.

diff --git a/src/treesit.c b/src/treesit.c
index df8c992bb5..dc64aef425 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -123,7 +123,7 @@ ts_calloc_wrapper (size_t n, size_t size)
 }
 
 static void
-ts_initialize ()
+ts_initialize (void)
 {
   if (!ts_initialized)
     {
@@ -766,7 +766,7 @@ DEFUN ("treesit-parser-set-included-ranges",
       /* If RANGES is nil, make parser to parse the whole document.
 	 To do that we give tree-sitter a 0 length, the range is a
 	 dummy.  */
-      TSRange ts_range = {0, 0, 0, 0};
+      TSRange ts_range = {{0, 0}, {0, 0}, 0, 0};
       success = ts_parser_set_included_ranges
 	(XTS_PARSER (parser)->parser, &ts_range , 0);
     }
@@ -1527,7 +1527,7 @@ DEFUN ("treesit-query-compile",
 query.  */)
   (Lisp_Object language, Lisp_Object query)
 {
-  if (!Ftreesit_query_p (query))
+  if (NILP (Ftreesit_query_p (query)))
     wrong_type_argument (Qtreesit_query_p, query);
   CHECK_SYMBOL (language);
   if (TS_COMPILED_QUERY_P (query))

commit 98bfb240818bae14cd87a1ffeb8fae7cb7846e05
Merge: 184d212042 787c4ad8b0
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Jun 14 15:59:46 2022 -0700

    Merge remote-tracking branch 'savannah/master' into feature/tree-sitter

commit 184d212042ffa5a4f02c92085d9b6e8346d66e99
Merge: a7288594f4 316bdc334c
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Jun 14 15:52:01 2022 -0700

    Merge branch 'feature/tree-sitter-depth-control' into feature/tree-sitter

commit 316bdc334ca4f3b7101ac6879e84041646852488
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Jun 14 15:49:44 2022 -0700

    Add manual for treesit-traverse-forward and friends
    
    * doc/lispref/parsing.texi (Retrieving Node): Add manual entry for
    treesit-traverse-depth-first, treesit-traverse-breadth-first,
    treesit-traverse-forward.
    * lisp/treesit.el (treesit-traverse-forward): Fix docstring.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 72be91877b..cadddf0c00 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -630,6 +630,73 @@ Retrieving Node
 farthest parent that still satisfies @var{pred}.
 @end defun
 
+@cindex trees-sitter tree traversal
+@defun treesit-traverse-depth-first node pred &optional step depth
+Traverse the subtree of @var{node} depth-first. Traverse starting from
+@var{node} (i.e., @var{node} is passed to @var{pred}).  For each node
+traversed, we call @var{pred} with the node, and we stop and return
+the node if @var{pred} returns non-nil.  If no node satisfies
+@var{pred}, return nil.
+
+If @var{step} >= 0 or nil, go forward, if @var{step} < 0, go backward.
+(The quantity of @var{step} doesn't matter.)
+
+@var{depth} can be a positive integer or 0, meaning go @var{depth}
+levels deep, counting from @var{node}, or nil, meaning there is no
+limit.  For example, a value 0 means only traverse @var{node} itself,
+a value 1 means traverse @var{node} and its immediate children.
+@end defun
+
+@defun treesit-traverse-breadth-first node pred &optional step
+Traverse the subtree of @var{node} breadth-first.  Traverse starting
+from @var{node} (i.e., @var{node} is passed to @var{pred}).  For each
+node traversed, call @var{pred} with the node, stop and return the
+node if @var{pred} returns non-nil.  If no node satisfies @var{pred},
+return nil.
+
+If @var{step} >= 0 or nil, go forward, if @var{step} < 0, go backward.
+(The quantity of @var{step} doesn't matter.)
+@end defun
+
+@defun treesit-traverse-forward node pred &optional step depth
+Traverses the whole tree forward from NODE depth-first.  Traverse
+starting from @var{node} (i.e., @var{node} is passed to @var{pred}).
+For each node traversed, call @var{pred} with the node, stop and
+return the node if @var{pred} returns non-nil.  If no node satisfies
+@var{pred}, return nil.
+
+If @var{step} >= 0 or nil, go forward, if @var{step} < 0, go backward.
+(The quantity of @var{step} doesn't matter.)
+
+Traversing forward means that for a tree like the below where
+@var{node} is marked 1, traverse as numbered:
+
+@example
+@group
+                16
+                |
+       3--------4-----------8
+       |        |           |
+  o--o-+--1  5--+--6    9---+-----12
+  |  |    |        |    |         |
+  o  o    2        7  +-+-+    +--+--+
+                      |   |    |  |  |
+                      10  11   13 14 15
+@end group
+@end example
+
+@var{depth} can be a positive integer, 0, nil, or @code{'up}.  A
+positive integer or 0 means go @var{depth} deep counting from
+@var{node}.  A nil means no limit.  And a symbol @code{'up} means go
+upwards only: only traverse to sibling and parent, never go down to
+children.
+
+The difference between 0 and @code{'up} is subtle: in the above
+example, if given 0 as @var{depth}, node 1 3 4 5 6 8 9 12 16 are
+visited; if given @code{'up} as @var{depth}, only node 1 3 4 8 16 are
+visited.
+@end defun
+
 @node Accessing Node
 @section Accessing Node Information
 
diff --git a/lisp/treesit.el b/lisp/treesit.el
index d6d092ee6a..4e35a46650 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -311,8 +311,8 @@ treesit-traverse-forward
 if STEP < 0, go backward.  If no node satisfies PRED, return
 nil.
 
-Traversing forward depth-first means, for a tree like the below
-where NODE is marked 1, traverse as numbered:
+Traversing forward depth-first means that for a tree like the
+below where NODE is marked 1, traverse as numbered:
 
                 16
                 |
@@ -326,11 +326,12 @@ treesit-traverse-forward
 
 DEPTH can be a positive integer, 0, nil, or 'up.  A positive
 integer or 0 means go DEPTH deep counting from NODE.  A nil means
-no limit.  And a symbol 'up means upward only: only traverse
-sibling and parent, never go down.  The difference between 0 and
-'up is subtle: in the above example, if given 0 as DEPTH, node 1
-3 4 5 6 8 9 12 16 are visited; if given t as DEPTH, only node 1 3
-4 8 16 are visited."
+no limit.  And a symbol 'up means go upwards only: only traverse
+sibling and parent, never go down to children.
+
+The difference between 0 and 'up is subtle: in the above example,
+if given 0 as DEPTH, node 1 3 4 5 6 8 9 12 16 are visited; if
+given 'up as DEPTH, only node 1 3 4 8 16 are visited."
   ;; First try NODE's subtree, but only under these conditions: if
   ;; DEPTH is a number, it has to be greater than 0, if it's a symbol,
   ;; it cannot be 'up.

commit a7288594f493a20664f1934a9fc760537caadcc3
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Jun 14 14:30:39 2022 -0700

    Change treesit-check-query and mention it in documentation
    
    * doc/lispref/parsing.texi (Pattern Matching): Mention it.
    * lisp/treesit.el (treesit-check-query): Rename to
    treesit-query-validate.
    * src/treesit.c (Ftreesit_query_capture, Ftreesit_query_compile):
    Mention it.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 1c4a7805a3..36c03364e3 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -816,7 +816,7 @@ Pattern Matching
 @vindex treesit-query-error
 This function raise a @var{treesit-query-error} if @var{query} is
 malformed.  The signal data contains a description of the specific
-error.
+error.  You can use @code{treesit-query-validate} to debug the query.
 @end defun
 
 @defun treesit-query-in source query &optional beg end
@@ -1111,6 +1111,10 @@ Pattern Matching
 @defun treesit-query-compile language query
 This function compiles @var{query} for @var{language} into a compiled
 query object and returns it.
+
+This function raise a @var{treesit-query-error} if @var{query} is
+malformed.  The signal data contains a description of the specific
+error.  You can use @code{treesit-query-validate} to debug the query.
 @end defun
 
 @defun treesit-expand-query query
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 09f750f9d5..ad90d9f9f0 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -1038,10 +1038,11 @@ treesit-inspect-mode
           (remove '(:eval treesit--inspect-name)
                   mode-line-misc-info))))
 
-(defun treesit-check-query (query language)
+(defun treesit-query-validate (language query)
   "Check if QUERY is valid for LANGUAGE.
 If QUERY is invalid, display the query in a popup buffer, jumps
 to the offending pattern and highlight the pattern."
+  (cl-assert (or (consp query) (stringp query)))
   (let ((buf (get-buffer-create "*tree-sitter check query*")))
     (with-temp-buffer
       (treesit-get-parser-create language)
diff --git a/src/treesit.c b/src/treesit.c
index 5b344a2ea1..df8c992bb5 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1522,8 +1522,9 @@ DEFUN ("treesit-query-compile",
 Querying a compiled query is much faster than an uncompiled one.
 LANGUAGE is the language this query is for.
 
-Signals treesit-query-error if QUERY is malformed or something
-else goes wrong.  */)
+Signals treesit-query-error if QUERY is malformed or something else
+goes wrong.  You can use `treesit-query-validate' to debug the
+query.  */)
   (Lisp_Object language, Lisp_Object query)
 {
   if (!Ftreesit_query_p (query))
@@ -1564,8 +1565,9 @@ DEFUN ("treesit-query-capture",
 BEG and END, if both non-nil, specifies the range in which the query
 is executed.
 
-Raise an treesit-query-error if QUERY is malformed, or something
-else goes wrong.  */)
+Signals treesit-query-error if QUERY is malformed or something else
+goes wrong.  You can use `treesit-query-validate' to debug the
+query.  */)
   (Lisp_Object node, Lisp_Object query,
    Lisp_Object beg, Lisp_Object end)
 {

commit 296900184d2959f8b85dbf2d92c1b627b25cd3f6
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Jun 14 14:17:17 2022 -0700

    Add treesit-query-compile to manual
    
    * doc/lispref/parsing.texi: Add treesit-query-compile.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index c6909da002..1c4a7805a3 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -804,10 +804,10 @@ Pattern Matching
 Now we can introduce the query functions.
 
 @defun treesit-query-capture node query &optional beg end
-This function matches patterns in @var{query} in @var{node}.
-Argument @var{query} can be a either string or a s-expression.  For
-now, we focus on the string syntax; s-expression syntax is described
-at the end of the section.
+This function matches patterns in @var{query} in @var{node}.  Argument
+@var{query} can be either a string, a s-expression, or a compiled
+query object.  For now, we focus on the string syntax; s-expression
+syntax and compiled query are described at the end of the section.
 
 The function returns all captured nodes in a list of
 @code{(@var{capture_name} . @var{node})}.  If @var{beg} and @var{end}
@@ -1101,10 +1101,26 @@ Pattern Matching
 @end group
 @end example
 
+@heading Compiling queries
+
+If a query will be used repeatedly, especially in tight loops, it is
+important to compile that query, because a compiled query is much
+faster than an uncompiled one.  A compiled query can be used anywhere
+a query is accepted.
+
+@defun treesit-query-compile language query
+This function compiles @var{query} for @var{language} into a compiled
+query object and returns it.
+@end defun
+
 @defun treesit-expand-query query
 This function expands the s-expression @var{query} into a string
-query.  It is usually a good idea to expand the s-expression patterns
-into strings for font-lock queries since they are called repeatedly.
+query.
+@end defun
+
+@defun treesit-expand-pattern pattern
+This function expands the s-expression @var{pattern} into a string
+pattern.
 @end defun
 
 Finally, tree-sitter project's documentation about

commit 016e4ca7a74b47979d6180672b13d02e2269baed
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Jun 14 14:16:11 2022 -0700

    ; * doc/lispref/parsing.texi: Minor fix-up.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index 72be91877b..c6909da002 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -93,7 +93,7 @@ Language Definitions
 @var{library-base-name} is the base filename for the dynamic library
 (conventionally @code{libtree-sitter-@var{language}}), and
 @var{function-name} is the function provided by the library
-(conventionally @code{tree_sitter_@var{language}). For example,
+(conventionally @code{tree_sitter_@var{language}}). For example,
 
 @example
 (cool-lang "libtree-sitter-coool" "tree_sitter_cooool")
@@ -763,7 +763,7 @@ Pattern Matching
 
 @cindex Tree-sitter query syntax
 @cindex Tree-sitter query pattern
-A @dfn{query} consists of multiple @dfn{patterns}, each pattern is an
+A @dfn{query} consists of multiple @dfn{patterns}.  Each pattern is an
 s-expression that matches a certain node in the syntax node.  A
 pattern has the following shape:
 
@@ -1107,8 +1107,8 @@ Pattern Matching
 into strings for font-lock queries since they are called repeatedly.
 @end defun
 
-Tree-sitter project's documentation about pattern-matching can be
-found at
+Finally, tree-sitter project's documentation about
+pattern-matching can be found at
 @uref{https://tree-sitter.github.io/tree-sitter/using-parsers#pattern-matching-with-queries}.
 
 @node Multiple Languages

commit 57b52504744d16b7b1ddf9225bb7c4d2b92510e3
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Jun 14 13:32:14 2022 -0700

    Add test for treesit-query-compile
    
    * test/src/treesit-tests.el (treesit-query-api): Rename pattern to
    query, and add treesit-query-compile into the mix.

diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index 1b20b86bc9..c6d5f25472 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -134,37 +134,45 @@ treesit-query-api
         (setq root-node (treesit-parser-root-node
                          parser)))
 
-      (dolist (pattern
+      ;; Test `treesit-query-capture' on string, sexp and compiled
+      ;; queries.
+      (dolist (query1
+               ;; String query.
                '("(string) @string
 (pair key: (_) @keyword)
 ((_) @bob (#match \"^B.b$\" @bob))
 (number) @number
 ((number) @n3 (#equal \"3\" @n3)) "
+                 ;; Sexp query.
                  ((string) @string
                   (pair key: (_) @keyword)
                   ((_) @bob (:match "^B.b$" @bob))
                   (number) @number
                   ((number) @n3 (:equal "3" @n3)))))
-        (should
-         (equal
-          '((number . "1") (number . "2")
-            (keyword . "\"name\"")
-            (string . "\"name\"")
-            (string . "\"Bob\"")
-            (bob . "Bob")
-            (number . "3")
-            (n3 . "3"))
-          (mapcar (lambda (entry)
-                    (cons (car entry)
-                          (treesit-node-text
-                           (cdr entry))))
-                  (treesit-query-capture root-node pattern))))
-        (should
-         (equal
-          "(type field: (_) @capture .) ? * + \"return\""
-          (treesit-expand-query
-           '((type field: (_) @capture :anchor)
-             :? :* :+ "return"))))))))
+        ;; Test `treesit-query-compile'.
+        (dolist (query (list query1
+                             (treesit-query-compile 'json query1)))
+          (should
+           (equal
+            '((number . "1") (number . "2")
+              (keyword . "\"name\"")
+              (string . "\"name\"")
+              (string . "\"Bob\"")
+              (bob . "Bob")
+              (number . "3")
+              (n3 . "3"))
+            (mapcar (lambda (entry)
+                      (cons (car entry)
+                            (treesit-node-text
+                             (cdr entry))))
+                    (treesit-query-capture root-node query))))))
+      ;; Test `treesit-expand-query'.
+      (should
+       (equal
+        "(type field: (_) @capture .) ? * + \"return\""
+        (treesit-expand-query
+         '((type field: (_) @capture :anchor)
+           :? :* :+ "return")))))))
 
 (ert-deftest treesit-narrow ()
   "Tests if narrowing works."

commit e171ef933feefd67d7f1b3b3693ce730111660e9
Author: Yuan Fu <casouri@gmail.com>
Date:   Tue Jun 14 11:36:22 2022 -0700

    Support compiled queries in treesit-query-capture
    
    Last commit added this new type, this commit adds functionalities.
    treesit.el only has documentation changes.
    
    * lisp/treesit.el (treesit-query-in, treesit-font-lock-settings,
    treesit-defun-query): Update docstring.
    * src/treesit.c (make_ts_query): New function.
    (Ftreesit_query_compile): New function.
    (Ftreesit_query_capture): Remove code that creates a query object and
    instead either use make_ts_query or use the give compiled query.  Free
    the query object conditonally.
    (syms_of_treesit): New symbol.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 78dfcae7e5..09f750f9d5 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -366,9 +366,12 @@ treesit-query-in
 language; if a parser, use the root node of that parser; if a
 node, use that node.
 
-QUERY is either a string query or a sexp query.  See Info node
-`(elisp)Pattern Matching' for how to write a query pattern in either
-string or s-expression form.
+QUERY is either a string query, a sexp query, or a compiled
+query.  See Info node `(elisp)Pattern Matching' for how to write
+a query in either string or s-expression form.  When using
+repeatedly, a compiled query is much faster than a string or sexp
+one, so it is recommend to compile your queries if it will be
+used over and over.
 
 BEG and END, if _both_ non-nil, specifies the range in which the query
 is executed.
@@ -442,8 +445,12 @@ treesit-font-lock-settings
 LANGUAGE is the language symbol.  See Info node `(elisp)Language
 Definitions'.
 
-QUERY is either a string query or a sexp query.
-See Info node `(elisp)Pattern Matching' for writing queries.
+QUERY is either a string query, a sexp query, or a compiled
+query.  See Info node `(elisp)Pattern Matching' for how to write
+a query in either string or s-expression form.  When using
+repeatedly, a compiled query is much faster than a string or sexp
+one, so it is recommend to compile your queries if it will be
+used over and over.
 
 Capture names in QUERY should be face names like
 `font-lock-keyword-face'.  The captured node will be fontified
@@ -923,7 +930,9 @@ treesit-search-end
 (defvar-local treesit-defun-query nil
   "A tree-sitter query that matches function/class definitions.
 Capture names don't matter.  This variable is used by navigation
-functions like `treesit-beginning-of-defun'.")
+functions like `treesit-beginning-of-defun'.
+
+It is recommended to use compiled query for this variable.")
 
 (defun treesit-beginning-of-defun (&optional arg)
   "Move backward to the beginning of a defun.
diff --git a/src/treesit.c b/src/treesit.c
index 3c8edc9213..5b344a2ea1 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -88,6 +88,28 @@ Copyright (C) 2021-2022 Free Software Foundation, Inc.
      parser of buffer changes.
    - lisp/emacs-lisp/cl-preloaded.el & data.c & lisp.h for parser and
      node type.
+
+   Because it is pretty slow (comparing to other tree-sitter
+   operations) for tree-sitter to parse the query and produce a query
+   object, it is very wasteful to reparse the query every time
+   treesit-query-capture is called, and it completely kills the
+   performance of querying in a loop for a moderate amount of times
+   (hundreds of queries takes seconds rather than milliseconds to
+   complete).  Therefore we want some caching. We can either use a
+   search.c style transparent caching, or simply expose a new type,
+   compiled-ts-query and let the user to manually compile AOT.  I
+   believe AOT compiling gives users more control, makes the
+   performance stable and easy to understand (compiled -> fast,
+   uncompiled -> slow), and avoids some edge cases transparent cache
+   could have (see below).  So I implemented the AOT compilation.
+
+   Problems a transparent cache could have: Suppose we store cache
+   entries in a fixed-length linked-list, and compare with EQ.  1)
+   One-off query could kick out useful cache.  2) if the user messed
+   up and the query doesn't EQ to the cache anymore, the performance
+   mysteriously drops.  3) what if a user uses so many stuff that the
+   default cache size (20) is not enough and we end up thrashing?
+   These are all imagined scenarios but they are not impossible :-)
  */
 
 /*** Initialization */
@@ -536,6 +558,31 @@ make_ts_node (Lisp_Object parser, TSNode node)
   return make_lisp_ptr (lisp_node, Lisp_Vectorlike);
 }
 
+/* Make a compiled query struct.  Return NULL if error occurs.  QUERY
+   has to be either a cons or a string.  */
+static struct Lisp_TS_Query *
+make_ts_query (Lisp_Object query, const TSLanguage *language,
+	       uint32_t *error_offset, TSQueryError *error_type)
+{
+  if (CONSP (query))
+    query = Ftreesit_expand_query (query);
+  char *source = SSDATA (query);
+
+  TSQuery *ts_query = ts_query_new (language, source, strlen (source),
+				    error_offset, error_type);
+  TSQueryCursor *ts_cursor = ts_query_cursor_new ();
+
+  if (ts_query == NULL)
+    return NULL;
+
+  struct Lisp_TS_Query *lisp_query
+    = ALLOCATE_PLAIN_PSEUDOVECTOR (struct Lisp_TS_Query,
+				   PVEC_TS_COMPILED_QUERY);
+  lisp_query->query = ts_query;
+  lisp_query->cursor = ts_cursor;
+  return lisp_query;
+}
+
 DEFUN ("treesit-parser-p",
        Ftreesit_parser_p, Streesit_parser_p, 1, 1, 0,
        doc: /* Return t if OBJECT is a tree-sitter parser.  */)
@@ -1467,6 +1514,39 @@ ts_query_error_to_string (TSQueryError error)
   return pass;
 }
 
+DEFUN ("treesit-query-compile",
+       Ftreesit_query_compile,
+       Streesit_query_compile, 2, 2, 0,
+       doc: /* Compile QUERY to a compiled query.
+
+Querying a compiled query is much faster than an uncompiled one.
+LANGUAGE is the language this query is for.
+
+Signals treesit-query-error if QUERY is malformed or something
+else goes wrong.  */)
+  (Lisp_Object language, Lisp_Object query)
+{
+  if (!Ftreesit_query_p (query))
+    wrong_type_argument (Qtreesit_query_p, query);
+  CHECK_SYMBOL (language);
+  if (TS_COMPILED_QUERY_P (query))
+    return query;
+
+  TSLanguage *ts_lang = ts_load_language (language, true);
+  uint32_t error_offset;
+  TSQueryError error_type;
+
+  struct Lisp_TS_Query *lisp_query
+    = make_ts_query (query, ts_lang, &error_offset, &error_type);
+
+  if (lisp_query == NULL)
+    xsignal2 (Qtreesit_query_error,
+	      build_string (ts_query_error_to_string (error_type)),
+	      make_fixnum (error_offset + 1));
+
+  return make_lisp_ptr (lisp_query, Lisp_Vectorlike);
+}
+
 DEFUN ("treesit-query-capture",
        Ftreesit_query_capture,
        Streesit_query_capture, 2, 4, 0,
@@ -1475,9 +1555,11 @@ DEFUN ("treesit-query-capture",
 Return a list of (CAPTURE_NAME . NODE).  CAPTURE_NAME is the name
 assigned to the node in PATTERN.  NODE is the captured node.
 
-QUERY is either a string query or a sexp query.  See Info node
-`(elisp)Pattern Matching' for how to write a query in either string or
-s-expression form.
+QUERY is either a string query, a sexp query, or a compiled query.
+See Info node `(elisp)Pattern Matching' for how to write a query in
+either string or s-expression form.  When using repeatedly, a compiled
+query is much faster than a string or sexp one, so it is recommend to
+compile your queries if it will be used over and over.
 
 BEG and END, if both non-nil, specifies the range in which the query
 is executed.
@@ -1493,10 +1575,9 @@ DEFUN ("treesit-query-capture",
   if (!NILP (end))
     CHECK_INTEGER (end);
 
-  if (CONSP (query))
-    query = Ftreesit_expand_query (query);
-  else
-    CHECK_STRING (query);
+  if (!(TS_COMPILED_QUERY_P (query)
+	|| CONSP (query) || STRINGP (query)))
+    wrong_type_argument (Qtreesit_query_p, query);
 
   /* Extract C values from Lisp objects.  */
   TSNode ts_node = XTS_NODE (node)->node;
@@ -1505,25 +1586,34 @@ DEFUN ("treesit-query-capture",
     XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
   const TSLanguage *lang = ts_parser_language
     (XTS_PARSER (lisp_parser)->parser);
-  char *source = SSDATA (query);
 
   /* Initialize query objects, and execute query.  */
-  uint32_t error_offset;
-  TSQueryError error_type;
-  /* TODO: We could cache the query object, so that repeatedly
-     querying with the same query can reuse the query object.  It also
-     saves us from expanding the sexp query into a string.  I don't
-     know how much time that could save though.  */
-  TSQuery *ts_query = ts_query_new (lang, source, strlen (source),
-				    &error_offset, &error_type);
-  TSQueryCursor *cursor = ts_query_cursor_new ();
-
-  if (ts_query == NULL)
+  struct Lisp_TS_Query *lisp_query;
+  /* If the lisp query is temporary, we need to free it after use. */
+  bool lisp_query_temp_p;
+  if (TS_COMPILED_QUERY_P (query))
     {
-      xsignal2 (Qtreesit_query_error,
-		build_string (ts_query_error_to_string (error_type)),
-		make_fixnum (error_offset + 1));
+      lisp_query_temp_p = false;
+      lisp_query = XTS_COMPILED_QUERY (query);
     }
+  else
+    {
+      lisp_query_temp_p = true;
+      uint32_t error_offset;
+      TSQueryError error_type;
+      lisp_query = make_ts_query (query, lang,
+				  &error_offset, &error_type);
+      if (lisp_query == NULL)
+	{
+	  xsignal2 (Qtreesit_query_error,
+		    build_string
+		    (ts_query_error_to_string (error_type)),
+		    make_fixnum (error_offset + 1));
+	}
+    }
+  TSQuery *ts_query = lisp_query->query;
+  TSQueryCursor *cursor = lisp_query->cursor;
+
   if (!NILP (beg) && !NILP (end))
     {
       EMACS_INT beg_byte = XFIXNUM (beg);
@@ -1578,8 +1668,11 @@ DEFUN ("treesit-query-capture",
 	  result = prev_result;
 	}
     }
-  ts_query_delete (ts_query);
-  ts_query_cursor_delete (cursor);
+  if (lisp_query_temp_p)
+    {
+      ts_query_delete (ts_query);
+      ts_query_cursor_delete (cursor);
+    }
   return Fnreverse (result);
 }
 
@@ -1592,6 +1685,7 @@ syms_of_treesit (void)
   DEFSYM (Qtreesit_parser_p, "treesit-parser-p");
   DEFSYM (Qtreesit_node_p, "treesit-node-p");
   DEFSYM (Qtreesit_compiled_query_p, "treesit-compiled-query-p");
+  DEFSYM (Qtreesit_query_p, "treesit-query-p");
   DEFSYM (Qnamed, "named");
   DEFSYM (Qmissing, "missing");
   DEFSYM (Qextra, "extra");
@@ -1705,5 +1799,6 @@ syms_of_treesit (void)
 
   defsubr (&Streesit_expand_pattern);
   defsubr (&Streesit_expand_query);
+  defsubr (&Streesit_query_compile);
   defsubr (&Streesit_query_capture);
 }

commit a8428b917da3f81feb1aad052a81a3ddfdebec28
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Jun 13 23:07:19 2022 -0700

    * src/treesit.c (Ftreesit_query_p): New function.

diff --git a/src/treesit.c b/src/treesit.c
index 19f8343765..3c8edc9213 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -569,6 +569,18 @@ DEFUN ("treesit-compiled-query-p",
     return Qnil;
 }
 
+DEFUN ("treesit-query-p",
+       Ftreesit_query_p, Streesit_query_p, 1, 1, 0,
+       doc: /* Return t if OBJECT is a generic tree-sitter query.  */)
+  (Lisp_Object object)
+{
+  if (TS_COMPILED_QUERY_P (object)
+      || CONSP (object) || STRINGP (object))
+    return Qt;
+  else
+    return Qnil;
+}
+
 DEFUN ("treesit-node-parser",
        Ftreesit_node_parser, Streesit_node_parser,
        1, 1, 0,
@@ -1661,6 +1673,7 @@ syms_of_treesit (void)
   defsubr (&Streesit_parser_p);
   defsubr (&Streesit_node_p);
   defsubr (&Streesit_compiled_query_p);
+  defsubr (&Streesit_query_p);
 
   defsubr (&Streesit_node_parser);
 

commit 8f3b872e30cc1055b1c5d35acfcf1ef7d483b01e
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Jun 13 23:01:04 2022 -0700

    Add new type treesit-compiled-query
    
    No intergration/interaction with the new type, just adding it.
    
    * lisp/emacs-lisp/cl-preloaded.el (cl--typeof-types): Add new type.
    * src/alloc.c (cleanup_vector): Add gc for the new type.
    * src/data.c (Ftype_of): Add switch case for the new type.
    (syms_of_data): Add symbols for the new type.
    * src/lisp.h (DEFINE_GDB_SYMBOL_BEGIN): Add new type.
    * src/treesit.c (Ftreesit_compiled_query_p): New function.
    (syms_of_treesit): Add symbol for the new type.
    * src/treesit.h (struct Lisp_TS_Query): New struct.
    (TS_COMPILED_QUERY_P, XTS_COMPILED_QUERY, CHECK_TS_COMPILED_QUERY):
    New macros.
    * src/print.c (print_vectorlike): Add printing for the new type.

diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el
index 46f5ab35ff..812d0af86b 100644
--- a/lisp/emacs-lisp/cl-preloaded.el
+++ b/lisp/emacs-lisp/cl-preloaded.el
@@ -80,6 +80,7 @@ cl--typeof-types
     (user-ptr atom)
     (tree-sitter-parser atom)
     (tree-sitter-node atom)
+    (tree-sitter-compiled-query atom)
     ;; Plus, really hand made:
     (null symbol list sequence atom))
   "Alist of supertypes.
diff --git a/src/alloc.c b/src/alloc.c
index 40a3e235ea..3c622d05ff 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3174,6 +3174,13 @@ cleanup_vector (struct Lisp_Vector *vector)
       ts_tree_delete(lisp_parser->tree);
       ts_parser_delete(lisp_parser->parser);
     }
+  else if (PSEUDOVECTOR_TYPEP (&vector->header, PVEC_TS_COMPILED_QUERY))
+    {
+      struct Lisp_TS_Query *lisp_query
+	= PSEUDOVEC_STRUCT (vector, Lisp_TS_Query);
+      ts_query_delete (lisp_query->query);
+      ts_query_cursor_delete (lisp_query->cursor);
+    }
 #endif
 #ifdef HAVE_MODULES
   else if (PSEUDOVECTOR_TYPEP (&vector->header, PVEC_MODULE_FUNCTION))
diff --git a/src/data.c b/src/data.c
index a28bf41414..8dbb2902a7 100644
--- a/src/data.c
+++ b/src/data.c
@@ -265,6 +265,8 @@ DEFUN ("type-of", Ftype_of, Stype_of, 1, 1, 0,
 	  return Qtreesit_parser;
 	case PVEC_TS_NODE:
 	  return Qtreesit_node;
+	case PVEC_TS_COMPILED_QUERY:
+	  return Qtreesit_compiled_query;
         case PVEC_SQLITE:
           return Qsqlite;
         /* "Impossible" cases.  */
@@ -4264,6 +4266,7 @@ #define PUT_ERROR(sym, tail, msg)			\
   DEFSYM (Qxwidget_view, "xwidget-view");
   DEFSYM (Qtreesit_parser, "treesit-parser");
   DEFSYM (Qtreesit_node, "treesit-node");
+  DEFSYM (Qtreesit_compiled_query, "treesit-compiled-query");
 
   DEFSYM (Qdefun, "defun");
 
diff --git a/src/lisp.h b/src/lisp.h
index eb1f1ec2c2..8832e76b44 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1060,6 +1060,7 @@ DEFINE_GDB_SYMBOL_END (PSEUDOVECTOR_FLAG)
   PVEC_NATIVE_COMP_UNIT,
   PVEC_TS_PARSER,
   PVEC_TS_NODE,
+  PVEC_TS_COMPILED_QUERY,
   PVEC_SQLITE,
 
   /* These should be last, for internal_equal and sxhash_obj.  */
diff --git a/src/print.c b/src/print.c
index d8b8513f31..81b524d79f 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1982,6 +1982,9 @@ print_vectorlike (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag,
 		    printcharfun, escapeflag);
       printchar ('>', printcharfun);
       break;
+    case PVEC_TS_COMPILED_QUERY:
+      print_c_string ("#<treesit-compiled-query>", printcharfun);
+      break;
 #endif
 
     case PVEC_SQLITE:
diff --git a/src/treesit.c b/src/treesit.c
index 91114b06f1..19f8343765 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -558,6 +558,17 @@ DEFUN ("treesit-node-p",
     return Qnil;
 }
 
+DEFUN ("treesit-compiled-query-p",
+       Ftreesit_compiled_query_p, Streesit_compiled_query_p, 1, 1, 0,
+       doc: /* Return t if OBJECT is a compiled tree-sitter query.  */)
+  (Lisp_Object object)
+{
+  if (TS_COMPILED_QUERY_P (object))
+    return Qt;
+  else
+    return Qnil;
+}
+
 DEFUN ("treesit-node-parser",
        Ftreesit_node_parser, Streesit_node_parser,
        1, 1, 0,
@@ -1568,6 +1579,7 @@ syms_of_treesit (void)
 {
   DEFSYM (Qtreesit_parser_p, "treesit-parser-p");
   DEFSYM (Qtreesit_node_p, "treesit-node-p");
+  DEFSYM (Qtreesit_compiled_query_p, "treesit-compiled-query-p");
   DEFSYM (Qnamed, "named");
   DEFSYM (Qmissing, "missing");
   DEFSYM (Qextra, "extra");
@@ -1648,6 +1660,7 @@ syms_of_treesit (void)
 
   defsubr (&Streesit_parser_p);
   defsubr (&Streesit_node_p);
+  defsubr (&Streesit_compiled_query_p);
 
   defsubr (&Streesit_node_parser);
 
diff --git a/src/treesit.h b/src/treesit.h
index 639c4eedc5..cb00fee111 100644
--- a/src/treesit.h
+++ b/src/treesit.h
@@ -81,6 +81,17 @@ #define EMACS_TREESIT_H
   ptrdiff_t timestamp;
 };
 
+/* A compiled tree-sitter query.  */
+struct Lisp_TS_Query
+{
+  union vectorlike_header header;
+  /* Pointer to the query object.  */
+  TSQuery *query;
+  /* Pointer to a cursor.  If we are storing the query object, we
+     might as well store a cursor, too.  */
+  TSQueryCursor *cursor;
+};
+
 INLINE bool
 TS_PARSERP (Lisp_Object x)
 {
@@ -107,6 +118,19 @@ XTS_NODE (Lisp_Object a)
   return XUNTAG (a, Lisp_Vectorlike, struct Lisp_TS_Node);
 }
 
+INLINE bool
+TS_COMPILED_QUERY_P (Lisp_Object x)
+{
+  return PSEUDOVECTORP (x, PVEC_TS_COMPILED_QUERY);
+}
+
+INLINE struct Lisp_TS_Query *
+XTS_COMPILED_QUERY (Lisp_Object a)
+{
+  eassert (TS_COMPILED_QUERY_P (a));
+  return XUNTAG (a, Lisp_Vectorlike, struct Lisp_TS_Query);
+}
+
 INLINE void
 CHECK_TS_PARSER (Lisp_Object parser)
 {
@@ -119,6 +143,13 @@ CHECK_TS_NODE (Lisp_Object node)
   CHECK_TYPE (TS_NODEP (node), Qtreesit_node_p, node);
 }
 
+INLINE void
+CHECK_TS_COMPILED_QUERY (Lisp_Object query)
+{
+  CHECK_TYPE (TS_COMPILED_QUERY_P (query),
+	      Qtreesit_compiled_query_p, query);
+}
+
 void
 ts_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
 		  ptrdiff_t new_end_byte);

commit 8aa04aac65ad286a06f05af374060d6c77d76189
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Jun 13 14:00:08 2022 -0700

    ; * lisp/treesit.el (treesit-defun-query): Improve docstring.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 76101509e0..d6d092ee6a 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -964,7 +964,9 @@ treesit-search-end
 (defvar-local treesit-defun-query nil
   "A tree-sitter query that matches function/class definitions.
 Capture names don't matter.  This variable is used by navigation
-functions like `treesit-beginning-of-defun'.")
+functions like `treesit-beginning-of-defun'.
+
+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.

commit b3de8850e0b19c831ebcb0760248c9ef00fbbb98
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Jun 13 13:53:11 2022 -0700

    Use the up-only parameter in treesit navigation functions
    
    * lisp/treesit.el(treesit-inspect-node-at-point,
    treesit-end-of-defun): Set up-only to t.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 7de7545f4e..76101509e0 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -974,7 +974,7 @@ treesit-beginning-of-defun
 according to `treesit-defun-query'."
   (unless treesit-defun-query
     (error "Variable `treesit-defun-query' is unset"))
-  (treesit-search-beginning treesit-defun-query (- (or arg 1))))
+  (treesit-search-beginning treesit-defun-query (- (or arg 1)) nil t))
 
 (defun treesit-end-of-defun (&optional arg)
   "Move forward to the end of a defun.
@@ -984,7 +984,7 @@ treesit-end-of-defun
 `treesit-defun-query'."
   (unless treesit-defun-query
     (error "Variable `treesit-defun-query' is unset"))
-  (treesit-search-end treesit-defun-query (or arg 1)))
+  (treesit-search-end treesit-defun-query (or arg 1) nil t))
 
 ;;; Debugging
 

commit c62473c31ab7dc70fc9c940f93b9217a7d16e7fc
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Jun 13 13:48:24 2022 -0700

    Add depth control for treesit traverse functions
    
    * lisp/treesit.el (treesit-traverse-depth-first,
    treesit-traverse-forward): Add depth parameter.
    (treesit-search-forward, treesit-search-beginning,
    treesit-search-end): Add up-only parameter.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 78dfcae7e5..7de7545f4e 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -229,21 +229,27 @@ treesit-parent-while
 
 (defalias 'treesit-traverse-parent #'treesit-parent-until)
 
-(defun treesit-traverse-depth-first (node pred &optional step)
+(defun treesit-traverse-depth-first (node pred &optional step depth)
   "Traverse the subtree of NODE depth-first.
 
 Traverse starting from NODE (i.e., NODE is passed to PRED).  For
 each node traversed, call PRED with the node, stop and return the
 node if PRED returns non-nil.  If STEP >= 0 or nil, go forward,
 if STEP < 0, go backward.  If no node satisfies PRED, return
-nil."
-  (if (funcall pred node)
-      node
-    (cl-loop for child in (if (or (null step) (>= step 0))
-                              (treesit-node-children node)
-                            (nreverse (treesit-node-children node)))
-             if (treesit-traverse-depth-first child pred step)
-             return child)))
+nil.
+
+DEPTH can be a positive integer or 0, meaning go DEPTH deep
+counting from NODE; or nil, meaning there is no limit."
+  (if (and (numberp depth) (<= depth 0))
+      nil
+    (if (funcall pred node)
+        node
+      (cl-loop for child in (if (or (null step) (>= step 0))
+                                (treesit-node-children node)
+                              (nreverse (treesit-node-children node)))
+               if (treesit-traverse-depth-first
+                   child pred step (if (numberp depth) (1- depth) depth))
+               return child))))
 
 (defun treesit--traverse-breadth-first-1 (pred step queue tail)
   "The work horse for `treesit-traverse-breadth-first'.
@@ -296,7 +302,7 @@ treesit-next-sibling-or-up
     (when (treesit-node-parent node)
       (list 'parent (treesit-node-parent node)))))
 
-(defun treesit-traverse-forward (node pred &optional step)
+(defun treesit-traverse-forward (node pred &optional step depth)
   "Traverse the whole tree forward from NODE depth-first.
 
 Traverse starting from NODE (i.e., NODE is passed to PRED).  For
@@ -316,23 +322,36 @@ treesit-traverse-forward
   |  |    |        |    |         |
   o  o    2        7  +-+-+    +--+--+
                       |   |    |  |  |
-                      10  11   13 14 15"
-  ;; First try NODE's subtree.
-  (or (treesit-traverse-depth-first node pred step)
+                      10  11   13 14 15
+
+DEPTH can be a positive integer, 0, nil, or 'up.  A positive
+integer or 0 means go DEPTH deep counting from NODE.  A nil means
+no limit.  And a symbol 'up means upward only: only traverse
+sibling and parent, never go down.  The difference between 0 and
+'up is subtle: in the above example, if given 0 as DEPTH, node 1
+3 4 5 6 8 9 12 16 are visited; if given t as DEPTH, only node 1 3
+4 8 16 are visited."
+  ;; First try NODE's subtree, but only under these conditions: if
+  ;; DEPTH is a number, it has to be greater than 0, if it's a symbol,
+  ;; it cannot be 'up.
+  (or (and (if (numberp depth) (> depth 0) (not (eq depth 'up)))
+           (treesit-traverse-depth-first node pred step depth))
       ;; If no match, try the next node: next sibling, or parent if no
       ;; next sibling exists.
       (catch 'match
         (let ((next (list nil node)))
-          ;; If NEXT is parent, call PRED on it and keep going.
+          ;; If NEXT is parent, call PRED on it and keep going.  We
+          ;; can always go to parent, regardless the value of DEPTH.
           (while (and (setq next (treesit-next-sibling-or-up
                                   (cadr next) step))
                       (eq (car next) 'parent))
+            (when (numberp depth) (cl-incf depth))
             (when (funcall pred (cadr next))
               (throw 'match (cadr next))))
           (when next
             ;; If NEXT is non-nil, it must be ('sibling node).
             (treesit-traverse-forward
-             (cadr next) pred step))))))
+             (cadr next) pred step depth))))))
 
 (defun treesit-node-children (node &optional named)
   "Return a list of NODE's children.
@@ -834,8 +853,9 @@ treesit-check-indent
 
 ;;; Search
 
-(defun treesit-search-forward (pos-fn arg query &optional lang)
-  "Search forward for nodes that matches QUERY.
+;; TODO: It might be more performant if we implement this in C.
+(defun treesit-search-forward (pos-fn arg query &optional lang up-only)
+  "Search forward for nodes that matches QUERY from current point.
 
 This is a more primitive function, you might want to use
 `treesit-search-beginning' or `treesit-search-end' instead.
@@ -851,7 +871,13 @@ treesit-search-forward
 or any function that takes a node and returns a position.
 
 If search succeeds, stop at the position returned by POS-FN and
-return the matched node.  Return nil if search failed."
+return the matched node.  Return nil if search failed.
+
+We search by traversing the parse tree, visiting every node
+that's after (or before) the smallest node at point (retrieved by
+`treesit-node-at').  If UP-ONLY is non-nil, only go to sibling or
+parent in the tree, never go down into children when traversing
+the tree."
   (cl-loop for idx from 1 to (abs arg)
            for parser = (if lang
                             (treesit-get-parser-create lang)
@@ -878,7 +904,8 @@ treesit-search-forward
                                   (< (funcall pos-fn node)
                                      starting-point)))
                         return t)))
-                arg))
+                ;; The AND form converts non-nil/nil into t/nil.
+                arg (and up-only t)))
            for pos = (funcall pos-fn node)
            ;; If we can find a match, jump to it.
            if pos do (goto-char pos)
@@ -886,7 +913,7 @@ treesit-search-forward
            ;; Return t to indicate that search is successful.
            finally return node))
 
-(defun treesit-search-beginning (query arg &optional lang)
+(defun treesit-search-beginning (query arg &optional lang up-only)
   "Search forward for nodes that matches QUERY.
 
 Stops at the beginning of matched node.
@@ -899,10 +926,17 @@ treesit-search-beginning
 negative ARG means go backward.
 
 If search succeeds, return the matched node.  Return nil if
-search failed."
-  (treesit-search-forward #'treesit-node-start arg query lang))
+search failed.
+
+We search by traversing the parse tree, visiting every node
+that's after (or before) the smallest node at point (retrieved by
+`treesit-node-at').  If UP-ONLY is non-nil, only go to sibling or
+parent in the tree, never go down into children when traversing
+the tree."
+  (treesit-search-forward #'treesit-node-start arg query lang
+                          up-only))
 
-(defun treesit-search-end (query arg &optional lang)
+(defun treesit-search-end (query arg &optional lang up-only)
   "Search forward for nodes that matches QUERY.
 
 Stops at the end of matched node.
@@ -915,8 +949,15 @@ treesit-search-end
 negative ARG means go backward.
 
 If search succeeds, return the matched node.  Return nil if
-search failed."
-  (treesit-search-forward #'treesit-node-end arg query lang))
+search failed.
+
+We search by traversing the parse tree, visiting every node
+that's after (or before) the smallest node at point (retrieved by
+`treesit-node-at').  If UP-ONLY is non-nil, only go to sibling or
+parent in the tree, never go down into children when traversing
+the tree."
+  (treesit-search-forward #'treesit-node-end arg query lang
+                          up-only))
 
 ;;; Navigation
 

commit a73f2b9990465820d80c58ed25208b72731d410d
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon Jun 13 13:22:17 2022 -0700

    Fix treesit-search-forward
    
    Move the check for movement
    
        (if (> arg 0)
            ;; Make sure we moved forward.
            (> (funcall pos-fn node) starting-point)
          ;; Make sure we moved backward.
          (< (funcall pos-fn node) starting-point))
    
    into cl-loop:
    
        if (treesit-node-eq cap-node node)
    
    becomes
    
        if (and (treesit-node-eq cap-node node)
                (if (> arg 0)
                    ;; Make sure we moved forward.
                    (> (funcall pos-fn node)
                       starting-point)
                  ;; Make sure we moved backward.
                  (< (funcall pos-fn node)
                     starting-point)))
    
    * lisp/treesit.el (treesit-search-forward): Move the check.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 98fcf84355..78dfcae7e5 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -864,17 +864,20 @@ treesit-search-forward
                 (lambda (node)
                   (and (not (eq (funcall pos-fn node)
                                 starting-point))
-                       (if (> arg 0)
-                           ;; Make sure we move forward.
-                           (> (funcall pos-fn node) starting-point)
-                         ;; Make sure we move backward.
-                         (< (funcall pos-fn node) starting-point))
-                       (cl-loop for cap-node in
-                                (mapcar
-                                 #'cdr
-                                 (treesit-query-capture node query))
-                                if (treesit-node-eq cap-node node)
-                                return t)))
+                       (cl-loop
+                        for cap-node in
+                        (mapcar
+                         #'cdr
+                         (treesit-query-capture node query))
+                        if (and (treesit-node-eq cap-node node)
+                                (if (> arg 0)
+                                    ;; Make sure we moved forward.
+                                    (> (funcall pos-fn node)
+                                       starting-point)
+                                  ;; Make sure we moved backward.
+                                  (< (funcall pos-fn node)
+                                     starting-point)))
+                        return t)))
                 arg))
            for pos = (funcall pos-fn node)
            ;; If we can find a match, jump to it.

commit c5b172ec586fa5ed0ae0644e1760fcf7ef27dd02
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Jun 11 20:42:26 2022 -0700

    * configure.ac (HAVE_TREE_SITTER): Not set TREE_SITTER_LIBS.

diff --git a/configure.ac b/configure.ac
index bf97dd017c..5a82d47db3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3115,7 +3115,6 @@ AC_DEFUN
     [HAVE_TREE_SITTER=yes], [HAVE_TREE_SITTER=no])
   if test "${HAVE_TREE_SITTER}" = yes; then
     AC_DEFINE(HAVE_TREE_SITTER, 1, [Define if using tree-sitter.])
-    TREE_SITTER_LIBS=-ltree-sitter
     TREE_SITTER_OBJ="treesit.o"
   fi
 fi

commit 1dd8ddee12e03224f9bcfd029c9e4192d2c47a24
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Jun 11 20:24:38 2022 -0700

    Rename treesit-traverse-forward-depth-first
    
    * lisp/treesit.el (treesit-traverse-forward): Rename to
    'treesit-traverse-forward'.
    (treesit-traverse-forward, treesit-search-forward): Use
    the new name.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 761c7147a0..98fcf84355 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -296,7 +296,7 @@ treesit-next-sibling-or-up
     (when (treesit-node-parent node)
       (list 'parent (treesit-node-parent node)))))
 
-(defun treesit-traverse-forward-depth-first (node pred &optional step)
+(defun treesit-traverse-forward (node pred &optional step)
   "Traverse the whole tree forward from NODE depth-first.
 
 Traverse starting from NODE (i.e., NODE is passed to PRED).  For
@@ -331,7 +331,7 @@ treesit-traverse-forward-depth-first
               (throw 'match (cadr next))))
           (when next
             ;; If NEXT is non-nil, it must be ('sibling node).
-            (treesit-traverse-forward-depth-first
+            (treesit-traverse-forward
              (cadr next) pred step))))))
 
 (defun treesit-node-children (node &optional named)
@@ -859,7 +859,7 @@ treesit-search-forward
            for node =
            (if-let ((starting-point (point))
                     (node (treesit-node-at (point) parser t)))
-               (treesit-traverse-forward-depth-first
+               (treesit-traverse-forward
                 node
                 (lambda (node)
                   (and (not (eq (funcall pos-fn node)

commit 35e2786c930d5c2125f2af8d1c224a480181dce9
Author: Theodor Thornhill <theo@thornhill.no>
Date:   Thu May 19 09:35:13 2022 -0700

    Fix typo and argument in treesit-beginning-of-defun, etc
    
    * lisp/treesit.el (treesit-beginning-of-defun, treesit-end-of-defun):
    Fix typo, add shield for argument.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 3313168d66..761c7147a0 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -927,20 +927,20 @@ treesit-beginning-of-defun
 
 With ARG, do it that many times.  Negative ARG means move forward
 to the ARGth following beginning of defun.  Defun is defined
-according to `treesit-defun-pattern'."
+according to `treesit-defun-query'."
   (unless treesit-defun-query
     (error "Variable `treesit-defun-query' is unset"))
-  (treesit-search-beginning treesit-defun-query (- arg)))
+  (treesit-search-beginning treesit-defun-query (- (or arg 1))))
 
 (defun treesit-end-of-defun (&optional arg)
   "Move forward to the end of a defun.
 
 With ARG, do it that many times.  Negative ARG means move back to
 ARGth preceding end of defun.  Defun is defined according to
-`treesit-defun-pattern'."
+`treesit-defun-query'."
   (unless treesit-defun-query
     (error "Variable `treesit-defun-query' is unset"))
-  (treesit-search-end treesit-defun-query arg))
+  (treesit-search-end treesit-defun-query (or arg 1)))
 
 ;;; Debugging
 

commit 74f8572f6cfa846f2a86d5f775b6fc2bd47ad269
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat May 14 08:57:23 2022 -0700

    ; * lisp/treesit.el (treesit-node-at): Fix typo.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 1cfdab95ca..3313168d66 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -142,7 +142,7 @@ treesit-node-at
   (let ((node (if (treesit-parser-p parser-or-lang)
                   (treesit-parser-root-node parser-or-lang)
                 (treesit-buffer-root-node parser-or-lang))))
-    ;; TODO: We might want a `treesit-node-decendant-for-pos' in C.
+    ;; TODO: We might want a `treesit-node-descendant-for-pos' in C.
     (while (cond ((and node (< (treesit-node-end node) point))
                   (setq node (treesit-node-next-sibling node))
                   t)

commit b2b57eda041e4c30fb169031b6f5dadeab4c7d98
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri May 13 16:39:29 2022 -0700

    Extract out treesit-search-forward
    
    * lisp/treesit.el (treesit-search-forward, treesit-search-beginning,
    treesit-search-end): New functions.
    (treesit-traverse-defun): Remove function.
    (treesit-beginning-of-defun, treesit-end-of-defun): Replace
    'treesit-traverse-defun' with 'treesit-search-forward' and fiends.
    * test/src/treesit-tests.el: Add reminder for tests.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 60f375e9d9..1cfdab95ca 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -832,48 +832,95 @@ treesit-check-indent
       (indent-region (point-min) (point-max))
       (diff-buffers source-buf (current-buffer)))))
 
-;;; Navigation
+;;; Search
 
-(defvar-local treesit-defun-query nil
-  "A tree-sitter query that matches function/class definitions.
-Capture names don't matter.  This variable is used by navigation
-functions like `treesit-beginning-of-defun'.")
+(defun treesit-search-forward (pos-fn arg query &optional lang)
+  "Search forward for nodes that matches QUERY.
 
-(defun treesit-traverse-defun (pos-fn arg)
-  "Move forward/backward to the beginning/end of a defun.
+This is a more primitive function, you might want to use
+`treesit-search-beginning' or `treesit-search-end' instead.
 
-Defun is defined according to `treesit-defun-pattern'.  Move
-forward/backward ARG time, positive ARG means go forward,
+QUERY has to capture the node to match.  LANG specifies the
+language in which we search for nodes.  If LANG is nil, use the
+first parser in `treesit-parser-list'.
+
+Move forward/backward ARG times, positive ARG means go forward,
 negative ARG means go backward.
 
-POS-FN can be either `treesit-node-start' or `treesit-node-end'."
-  (unless treesit-defun-query
-    (error "Variable `treesit-defun-query' is unset"))
+POS-FN can be either `treesit-node-start' or `treesit-node-end',
+or any function that takes a node and returns a position.
+
+If search succeeds, stop at the position returned by POS-FN and
+return the matched node.  Return nil if search failed."
   (cl-loop for idx from 1 to (abs arg)
-           for positions =
-           (remove
-            nil
-            (mapcar (lambda (parser)
-                      (if-let ((starting-point (point))
-                               (node (treesit-node-at
-                                      (point) parser t)))
-                          (funcall
-                           pos-fn
-                           (treesit-traverse-forward-depth-first
-                            node
-                            (lambda (node)
-                              (and (not (eq (funcall pos-fn node)
-                                            starting-point))
-                                   (treesit-query-capture
-                                    node treesit-defun-query)))
-                            arg))))
-                    treesit-parser-list))
-           ;; If we can find a defun start, jump to it.
-           if positions do (goto-char (apply #'max positions))
+           for parser = (if lang
+                            (treesit-get-parser-create lang)
+                          (car treesit-parser-list))
+           for node =
+           (if-let ((starting-point (point))
+                    (node (treesit-node-at (point) parser t)))
+               (treesit-traverse-forward-depth-first
+                node
+                (lambda (node)
+                  (and (not (eq (funcall pos-fn node)
+                                starting-point))
+                       (if (> arg 0)
+                           ;; Make sure we move forward.
+                           (> (funcall pos-fn node) starting-point)
+                         ;; Make sure we move backward.
+                         (< (funcall pos-fn node) starting-point))
+                       (cl-loop for cap-node in
+                                (mapcar
+                                 #'cdr
+                                 (treesit-query-capture node query))
+                                if (treesit-node-eq cap-node node)
+                                return t)))
+                arg))
+           for pos = (funcall pos-fn node)
+           ;; If we can find a match, jump to it.
+           if pos do (goto-char pos)
            else return nil
-           if (eq (point) (point-min)) return nil
            ;; Return t to indicate that search is successful.
-           finally return t))
+           finally return node))
+
+(defun treesit-search-beginning (query arg &optional lang)
+  "Search forward for nodes that matches QUERY.
+
+Stops at the beginning of matched node.
+
+QUERY has to capture the node to match.  LANG specifies the
+language in which we search for nodes.  If LANG is nil, use the
+first parser in `treesit-parser-list'.
+
+Move forward/backward ARG times, positive ARG means go forward,
+negative ARG means go backward.
+
+If search succeeds, return the matched node.  Return nil if
+search failed."
+  (treesit-search-forward #'treesit-node-start arg query lang))
+
+(defun treesit-search-end (query arg &optional lang)
+  "Search forward for nodes that matches QUERY.
+
+Stops at the end of matched node.
+
+QUERY has to capture the node to match.  LANG specifies the
+language in which we search for nodes.  If LANG is nil, use the
+first parser in `treesit-parser-list'.
+
+Move forward/backward ARG times, positive ARG means go forward,
+negative ARG means go backward.
+
+If search succeeds, return the matched node.  Return nil if
+search failed."
+  (treesit-search-forward #'treesit-node-end arg query lang))
+
+;;; Navigation
+
+(defvar-local treesit-defun-query nil
+  "A tree-sitter query that matches function/class definitions.
+Capture names don't matter.  This variable is used by navigation
+functions like `treesit-beginning-of-defun'.")
 
 (defun treesit-beginning-of-defun (&optional arg)
   "Move backward to the beginning of a defun.
@@ -881,7 +928,9 @@ treesit-beginning-of-defun
 With ARG, do it that many times.  Negative ARG means move forward
 to the ARGth following beginning of defun.  Defun is defined
 according to `treesit-defun-pattern'."
-  (treesit-traverse-defun #'treesit-node-start (- arg)))
+  (unless treesit-defun-query
+    (error "Variable `treesit-defun-query' is unset"))
+  (treesit-search-beginning treesit-defun-query (- arg)))
 
 (defun treesit-end-of-defun (&optional arg)
   "Move forward to the end of a defun.
@@ -889,7 +938,9 @@ treesit-end-of-defun
 With ARG, do it that many times.  Negative ARG means move back to
 ARGth preceding end of defun.  Defun is defined according to
 `treesit-defun-pattern'."
-  (treesit-traverse-defun #'treesit-node-end arg))
+  (unless treesit-defun-query
+    (error "Variable `treesit-defun-query' is unset"))
+  (treesit-search-end treesit-defun-query arg))
 
 ;;; Debugging
 
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index 65b871693d..1b20b86bc9 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -369,7 +369,9 @@ treesit-node-supplemental
 ;; TODO
 ;; - Functions in treesit.el
 ;; - treesit-load-name-override-list
-;; - treesit-traverse-defun
+;; - treesit-search-forward
+;; - treesit-search-beginning
+;; - treesit-search-end
 ;; - treesit-beginning-of-defun
 ;; - treesit-end-of-defun
 

commit 750090fd076e6923c5cee6f67b170416d48694da
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri May 13 16:34:26 2022 -0700

    * lisp/treesit.el (treesit-node-at): Add check for nil node.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 345aaf2e9b..60f375e9d9 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -143,7 +143,7 @@ treesit-node-at
                   (treesit-parser-root-node parser-or-lang)
                 (treesit-buffer-root-node parser-or-lang))))
     ;; TODO: We might want a `treesit-node-decendant-for-pos' in C.
-    (while (cond ((< (treesit-node-end node) point)
+    (while (cond ((and node (< (treesit-node-end node) point))
                   (setq node (treesit-node-next-sibling node))
                   t)
                  ((treesit-node-child node 0 named)

commit d8c9b9c0fb704ed2b20563b79248b837727853c2
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri May 13 14:00:56 2022 -0700

    Add defun navigation
    
    * lisp/treesit.el (treesit-defun-query): New variable.
    (treesit-traverse-defun, treesit-beginning-of-defun,
    treesit-end-of-defun): New functions.
    * test/src/treesit-tests.el: Add reminders for tests.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index 0fe3a8ed24..345aaf2e9b 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -832,6 +832,65 @@ treesit-check-indent
       (indent-region (point-min) (point-max))
       (diff-buffers source-buf (current-buffer)))))
 
+;;; Navigation
+
+(defvar-local treesit-defun-query nil
+  "A tree-sitter query that matches function/class definitions.
+Capture names don't matter.  This variable is used by navigation
+functions like `treesit-beginning-of-defun'.")
+
+(defun treesit-traverse-defun (pos-fn arg)
+  "Move forward/backward to the beginning/end of a defun.
+
+Defun is defined according to `treesit-defun-pattern'.  Move
+forward/backward ARG time, positive ARG means go forward,
+negative ARG means go backward.
+
+POS-FN can be either `treesit-node-start' or `treesit-node-end'."
+  (unless treesit-defun-query
+    (error "Variable `treesit-defun-query' is unset"))
+  (cl-loop for idx from 1 to (abs arg)
+           for positions =
+           (remove
+            nil
+            (mapcar (lambda (parser)
+                      (if-let ((starting-point (point))
+                               (node (treesit-node-at
+                                      (point) parser t)))
+                          (funcall
+                           pos-fn
+                           (treesit-traverse-forward-depth-first
+                            node
+                            (lambda (node)
+                              (and (not (eq (funcall pos-fn node)
+                                            starting-point))
+                                   (treesit-query-capture
+                                    node treesit-defun-query)))
+                            arg))))
+                    treesit-parser-list))
+           ;; If we can find a defun start, jump to it.
+           if positions do (goto-char (apply #'max positions))
+           else return nil
+           if (eq (point) (point-min)) return nil
+           ;; Return t to indicate that search is successful.
+           finally return t))
+
+(defun treesit-beginning-of-defun (&optional arg)
+  "Move backward to the beginning of a defun.
+
+With ARG, do it that many times.  Negative ARG means move forward
+to the ARGth following beginning of defun.  Defun is defined
+according to `treesit-defun-pattern'."
+  (treesit-traverse-defun #'treesit-node-start (- arg)))
+
+(defun treesit-end-of-defun (&optional arg)
+  "Move forward to the end of a defun.
+
+With ARG, do it that many times.  Negative ARG means move back to
+ARGth preceding end of defun.  Defun is defined according to
+`treesit-defun-pattern'."
+  (treesit-traverse-defun #'treesit-node-end arg))
+
 ;;; Debugging
 
 (defvar-local treesit--inspect-name nil
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index 429e12088f..65b871693d 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -369,6 +369,9 @@ treesit-node-supplemental
 ;; TODO
 ;; - Functions in treesit.el
 ;; - treesit-load-name-override-list
+;; - treesit-traverse-defun
+;; - treesit-beginning-of-defun
+;; - treesit-end-of-defun
 
 (provide 'treesit-tests)
 ;;; treesit-tests.el ends here

commit d94c7076dfcb35037e77fc12e48d07d65c2005cf
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri May 13 13:47:41 2022 -0700

    New node traversal functions
    
    * lisp/treesit.el (treesit-traverse-parent): New alias.
    (treesit-traverse-depth-first, treesit--traverse-breadth-first-1,
    treesit-traverse-breadth-first, treesit-next-sibling-or-up,
    treesit-traverse-forward-depth-first): New functions.
    * test/src/treesit-tests.el (treesit-node-supplemental): Add reminders
    for tests.

diff --git a/lisp/treesit.el b/lisp/treesit.el
index dbbe0e409a..0fe3a8ed24 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -227,6 +227,113 @@ treesit-parent-while
             node (treesit-node-parent node)))
     last))
 
+(defalias 'treesit-traverse-parent #'treesit-parent-until)
+
+(defun treesit-traverse-depth-first (node pred &optional step)
+  "Traverse the subtree of NODE depth-first.
+
+Traverse starting from NODE (i.e., NODE is passed to PRED).  For
+each node traversed, call PRED with the node, stop and return the
+node if PRED returns non-nil.  If STEP >= 0 or nil, go forward,
+if STEP < 0, go backward.  If no node satisfies PRED, return
+nil."
+  (if (funcall pred node)
+      node
+    (cl-loop for child in (if (or (null step) (>= step 0))
+                              (treesit-node-children node)
+                            (nreverse (treesit-node-children node)))
+             if (treesit-traverse-depth-first child pred step)
+             return child)))
+
+(defun treesit--traverse-breadth-first-1 (pred step queue tail)
+  "The work horse for `treesit-traverse-breadth-first'.
+PRED and STEP are the same as in
+`treesit-traverse-breadth-first'.  This function simply runes BFS
+on QUEUE: pops an element from QUEUE, append children to QUEUE,
+process the element, and next iteration.  TAIL is the pointer to
+the last cons in QUEUE, used for appending elements."
+  (cl-loop while queue
+           if (funcall pred (car queue)) return (car queue)
+           else do
+           (let ((children (if (or (null step) (>= step 0))
+                               (treesit-node-children (car queue))
+                             (nreverse (treesit-node-children (car queue))))))
+             ;; Append children to the end.
+             (setcdr tail children)
+             (setq tail (last tail))
+             ;; Pop the head off.
+             (setq queue (cdr queue)))
+           finally return nil))
+
+(defun treesit-traverse-breadth-first (node pred &optional step)
+  "Traverse the subtree of NODE breadth-first.
+
+Traverse starting from NODE (i.e., NODE is passed to PRED).  For
+each node traversed, call PRED with the node, stop and return the
+node if PRED returns non-nil.  If STEP >= 0 or nil, go forward,
+if STEP < 0, go backward.  If no node satisfies PRED, return
+nil."
+  ;; Traverse with a queue.
+  (let* ((queue (list node))
+         (tail (last queue)))
+    (treesit--traverse-breadth-first-1 pred step queue tail)))
+
+(defun treesit-next-sibling-or-up (node step)
+  "Return the next sibling of NODE.
+
+If there is no next sibling of NODE but NODE has a parent, return
+the parent.  If there is no parent, return nil.  If STEP >= 0 or
+nil, return the next sibling, if STEP < 0, return the previous
+one.
+
+Return either ('sibling node) or ('parent node)."
+  ;; First deplete siblings.
+  (if-let ((sibling (if (or (null step) (>= step 0))
+                        (treesit-node-next-sibling node)
+                      (treesit-node-prev-sibling node))))
+      (list 'sibling sibling)
+    ;; When siblings depleted, go up one level.
+    (when (treesit-node-parent node)
+      (list 'parent (treesit-node-parent node)))))
+
+(defun treesit-traverse-forward-depth-first (node pred &optional step)
+  "Traverse the whole tree forward from NODE depth-first.
+
+Traverse starting from NODE (i.e., NODE is passed to PRED).  For
+each node traversed, call PRED with the node, stop and return the
+node if PRED returns non-nil.  If STEP >= 0 or nil, go forward,
+if STEP < 0, go backward.  If no node satisfies PRED, return
+nil.
+
+Traversing forward depth-first means, for a tree like the below
+where NODE is marked 1, traverse as numbered:
+
+                16
+                |
+       3--------4-----------8
+       |        |           |
+  o--o-+--1  5--+--6    9---+-----12
+  |  |    |        |    |         |
+  o  o    2        7  +-+-+    +--+--+
+                      |   |    |  |  |
+                      10  11   13 14 15"
+  ;; First try NODE's subtree.
+  (or (treesit-traverse-depth-first node pred step)
+      ;; If no match, try the next node: next sibling, or parent if no
+      ;; next sibling exists.
+      (catch 'match
+        (let ((next (list nil node)))
+          ;; If NEXT is parent, call PRED on it and keep going.
+          (while (and (setq next (treesit-next-sibling-or-up
+                                  (cadr next) step))
+                      (eq (car next) 'parent))
+            (when (funcall pred (cadr next))
+              (throw 'match (cadr next))))
+          (when next
+            ;; If NEXT is non-nil, it must be ('sibling node).
+            (treesit-traverse-forward-depth-first
+             (cadr next) pred step))))))
+
 (defun treesit-node-children (node &optional named)
   "Return a list of NODE's children.
 If NAMED is non-nil, collect named child only."
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index c995542a2a..429e12088f 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -360,6 +360,10 @@ treesit-node-supplemental
     ;; `treesit-parent-while'
     ;; `treesit-node-children'
     ;; `treesit-node-field-name'
+    ;; `treesit-next-sibling-or-up'
+    ;; `treesit-traverse-depth-first'
+    ;; `treesit-traverse-breadth-first'
+    ;; `treesit-traverse-forward-depth-first'
     ))
 
 ;; TODO

commit 78df03329d1e942d5617c0f09f264792e24a063d
Author: Yuan Fu <casouri@gmail.com>
Date:   Fri May 13 13:38:21 2022 -0700

    Redefine treesit-node-at
    
    The old 'treesit-node-at' becomes 'treesit-node-on'.  The new
    'treesit-node-at' has slightly different semantics.  Now
    'treesit-node-on' gets the smallest node covering a range and
    'treesit-node-at' gets the smallest node after a position.
    
    The reason of change can be found in the docstring of
    'treesit-node-on' (the BEWARE part): its result can be sometimes
    surprising/unexpected.
    
    * doc/lispref/parsing.texi (Retrieving Node): Update manual.
    * lisp/treesit.el (treesit-node-at): Change to new definition.
    (treesit-node-on): Inherits the old definition of
    'treesit-node-at'.  Parameter END is now mandatory.
    (treesit-language-at, treesit-node-field-name): Use the new '-on'
    function.
    (treesit-font-lock-fontify-region, treesit-simple-indent-presets,
    treesit-indent): Use the new '-at' function.
    * test/src/treesit-tests.el (treesit-node-supplemental): Update tests.

diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
index bbe70ff9b1..72be91877b 100644
--- a/doc/lispref/parsing.texi
+++ b/doc/lispref/parsing.texi
@@ -471,11 +471,10 @@ Retrieving Node
 
 @heading Retrieving node from syntax tree
 
-@defun treesit-node-at beg &optional end parser-or-lang named
-This function returns the @emph{smallest} node that covers the span
-from @var{beg} to @var{end}.  In other words, the start of the node
-@code{<=} @var{beg}, and the end of the node @code{>=} @var{end}.  If
-@var{end} is omitted, it defaults to the value of @var{beg}.
+@defun treesit-node-at beg end &optional parser-or-lang named
+This function returns the @emph{smallest} node that starts at or after
+the @var{point}.  In other words, the start of the node is equal or
+greater than @var{point}.
 
 When @var{parser-or-lang} is nil, this function uses the first parser
 in @var{treesit-parser-list} in the current buffer.  If
@@ -489,12 +488,34 @@ Retrieving Node
 @example
 @group
 ;; Find the node at point in a C parser's syntax tree.
-(treesit-node-at (point) (point) 'c)
+(treesit-node-on (point) 'c)
     @c @result{} #<treesit-node from 1 to 4 in *scratch*>
 @end group
 @end example
 @end defun
 
+@defun treesit-node-on beg end &optional parser-or-lang named
+This function returns the @emph{smallest} node that covers the span
+from @var{beg} to @var{end}.  In other words, the start of the node is
+less or equal to @var{beg}, and the end of the node is greater or
+equal to @var{end}.
+
+@emph{Beware}, Calling this function on an empty line that is not
+inside any top-level construct (function definition, etc) most
+probably will give you the root node, because the root node is the
+smallest node that covers that empty line.  You probably want to use
+@code{treesit-node-at} instead.
+
+When @var{parser-or-lang} is nil, this function uses the first parser
+in @var{treesit-parser-list} in the current buffer.  If
+@var{parser-or-lang} is a parser object, it use that parser; if
+@var{parser-or-lang} is a language, it finds the first parser using
+that language in @var{treesit-parser-list} and use that.
+
+If @var{named} is non-nil, this function looks for a named node
+instead (@pxref{tree-sitter named node, named node}).
+@end defun
+
 @defun treesit-parser-root-node parser
 This function returns the root node of the syntax tree generated by
 @var{parser}.
diff --git a/lisp/treesit.el b/lisp/treesit.el
index eaaa1316af..dbbe0e409a 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -90,7 +90,7 @@ treesit-parse-string
 (defun treesit-language-at (point)
   "Return the language used at POINT."
   (cl-loop for parser in treesit-parser-list
-           if (treesit-node-at point nil parser)
+           if (treesit-node-on point point parser)
            return (treesit-parser-language parser)))
 
 (defun treesit-set-ranges (parser-or-lang ranges)
@@ -128,11 +128,40 @@ treesit-node-language
   (treesit-parser-language
    (treesit-node-parser node)))
 
-(defun treesit-node-at (beg &optional end parser-or-lang named)
+(defun treesit-node-at (point &optional parser-or-lang named)
+  "Return the smallest node that starts at or after POINT.
+
+\"Starts at or after POINT\" means the start of the node is
+greater or larger than POINT.  Return nil if none find.  If NAMED
+non-nil, only look for named node.
+
+If PARSER-OR-LANG is nil, use the first parser in
+`treesit-parser-list'; if PARSER-OR-LANG is a parser, use
+that parser; if PARSER-OR-LANG is a language, find a parser using
+that language in the current buffer, and use that."
+  (let ((node (if (treesit-parser-p parser-or-lang)
+                  (treesit-parser-root-node parser-or-lang)
+                (treesit-buffer-root-node parser-or-lang))))
+    ;; TODO: We might want a `treesit-node-decendant-for-pos' in C.
+    (while (cond ((< (treesit-node-end node) point)
+                  (setq node (treesit-node-next-sibling node))
+                  t)
+                 ((treesit-node-child node 0 named)
+                  (setq node (treesit-node-child node 0 named))
+                  t)))
+    node))
+
+(defun treesit-node-on (beg end &optional parser-or-lang named)
   "Return the smallest node covering BEG to END.
 
-If omitted, END defaults to BEG.  Return nil if none find.  If
-NAMED non-nil, only look for named node.  NAMED defaults to nil.
+BEWARE!  Calling this function on an empty line that is not
+inside any top-level construct (function definition, etc) most
+probably will give you the root node, because the root node is
+the smallest node that covers that empty line.  You probably want
+to use `treesit-node-at' instead.
+
+Return nil if none find.  If NAMED non-nil, only look for named
+node.
 
 If PARSER-OR-LANG is nil, use the first parser in
 `treesit-parser-list'; if PARSER-OR-LANG is a parser, use
@@ -358,7 +387,7 @@ treesit-font-lock-fontify-region
     (when-let* ((language (nth 0 setting))
                 (match-pattern (nth 1 setting))
                 (parser (treesit-get-parser-create language)))
-      (when-let ((node (treesit-node-at start end parser)))
+      (when-let ((node (treesit-node-on start end parser)))
         (let ((captures (treesit-query-capture
                          node match-pattern
                          ;; Specifying the range is important. More
@@ -500,7 +529,7 @@ treesit-simple-indent-presets
                      (forward-line -1)
                      (skip-chars-forward " \t")
                      (treesit-node-start
-                      (treesit-node-at (point) nil nil t))))))
+                      (treesit-node-at (point) nil t))))))
   "A list of presets.
 These presets that can be used as MATHER and ANCHOR in
 `treesit-simple-indent-rules'.
@@ -622,8 +651,7 @@ treesit-indent
                 (point)))
          (smallest-node
           (cl-loop for parser in treesit-parser-list
-                   for node = (treesit-node-at
-                               bol nil parser)
+                   for node = (treesit-node-at bol parser)
                    if node return node))
          (node (treesit-parent-while
                 smallest-node
@@ -639,7 +667,7 @@ treesit-indent
          (parent (cond ((and node parser)
                         (treesit-node-parent node))
                        (parser
-                        (treesit-node-at bol nil parser))
+                        (treesit-node-at bol parser))
                        (t nil)))
          (`(,anchor . ,offset)
           (funcall treesit-indent-function node parent bol)))
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
index eb6e85c3fd..c995542a2a 100644
--- a/test/src/treesit-tests.el
+++ b/test/src/treesit-tests.el
@@ -331,7 +331,11 @@ treesit-node-supplemental
                 'json))
     ;; `treesit-node-at'.
     (should (equal (treesit-node-string
-                    (treesit-node-at 1 2 'json))
+                    (treesit-node-at 1 'json))
+                   "(\"[\")"))
+    ;; `treesit-node-on'
+    (should (equal (treesit-node-string
+                    (treesit-node-on 1 2 'json))
                    "(\"[\")"))
     ;; `treesit-buffer-root-node'.
     (should (treesit-node-eq

commit eebe5a1d6114ed54eb3cdd5576f43da76590b8fa
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon May 9 12:49:55 2022 -0700

    Fix compilation warnings
    
    * src/treesit.c: Add static keywords, remove unused variables, add
    const qualifier.

diff --git a/src/treesit.c b/src/treesit.c
index beeb2b7855..91114b06f1 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -100,7 +100,7 @@ ts_calloc_wrapper (size_t n, size_t size)
   return xzalloc (n * size);
 }
 
-void
+static void
 ts_initialize ()
 {
   if (!ts_initialized)
@@ -114,7 +114,7 @@ ts_initialize ()
 
 /* Translates a symbol treesit-<lang> to a C name
    treesit_<lang>.  */
-void
+static void
 ts_symbol_to_c_name (char *symbol_name)
 {
   for (int idx=0; idx < strlen (symbol_name); idx++)
@@ -124,7 +124,7 @@ ts_symbol_to_c_name (char *symbol_name)
     }
 }
 
-bool
+static bool
 ts_find_override_name
 (Lisp_Object language_symbol, Lisp_Object *name, Lisp_Object *c_symbol)
 {
@@ -149,7 +149,7 @@ ts_symbol_to_c_name (char *symbol_name)
    thsi function pushes "lib_base_name.so" and "lib_base_name.dylib"
    into *path_candidates. Obiviously path_candidates should be a Lisp
    list of Lisp strings.  */
-void
+static void
 ts_load_language_push_for_each_suffix
 (Lisp_Object lib_base_name, Lisp_Object *path_candidates)
 {
@@ -168,7 +168,7 @@ ts_symbol_to_c_name (char *symbol_name)
 
    If SIGNAL is true, signal an error when failed to load LANGUAGE; if
    false, return NULL when failed.  */
-TSLanguage *
+static TSLanguage *
 ts_load_language (Lisp_Object language_symbol, bool signal)
 {
   Lisp_Object symbol_name = Fsymbol_name (language_symbol);
@@ -242,7 +242,7 @@ ts_load_language (Lisp_Object language_symbol, bool signal)
 
   /* Load TSLanguage.  */
   dynlib_error ();
-  TSLanguage *(*langfn) ();
+  TSLanguage *(*langfn) (void);
   langfn = dynlib_sym (handle, c_name);
   error = dynlib_error ();
   if (error != NULL)
@@ -348,10 +348,9 @@ ts_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
     }
 }
 
-void
+static void
 ts_ensure_position_synced (Lisp_Object parser)
 {
-  TSParser *ts_parser = XTS_PARSER (parser)->parser;
   TSTree *tree = XTS_PARSER (parser)->tree;
 
   if (tree == NULL)
@@ -406,7 +405,7 @@ ts_ensure_position_synced (Lisp_Object parser)
   XTS_PARSER (parser)->visible_end = visible_end;
 }
 
-void
+static void
 ts_check_buffer_size (struct buffer *buffer)
 {
   ptrdiff_t buffer_size =
@@ -419,7 +418,7 @@ ts_check_buffer_size (struct buffer *buffer)
 
 /* Parse the buffer.  We don't parse until we have to. When we have
 to, we call this function to parse and update the tree.  */
-void
+static void
 ts_ensure_parsed (Lisp_Object parser)
 {
   if (!XTS_PARSER (parser)->need_reparse)
@@ -456,7 +455,7 @@ ts_ensure_parsed (Lisp_Object parser)
 /* This is the read function provided to tree-sitter to read from a
    buffer.  It reads one character at a time and automatically skips
    the gap.  */
-const char*
+static const char*
 ts_read_buffer (void *parser, uint32_t byte_index,
 		TSPoint position, uint32_t *bytes_read)
 {
@@ -647,7 +646,7 @@ DEFUN ("treesit-parser-root-node",
 
 /* Checks that the RANGES argument of
    treesit-parser-set-included-ranges is valid.  */
-void
+static void
 ts_check_range_argument (Lisp_Object ranges)
 {
   EMACS_INT last_point = 1;
@@ -706,7 +705,6 @@ DEFUN ("treesit-parser-set-included-ranges",
       /* Set ranges for PARSER.  */
       ptrdiff_t len = list_length (ranges);
       TSRange *ts_ranges = malloc (sizeof(TSRange) * len);
-      struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
 
       for (int idx=0; !NILP (ranges); idx++, ranges = XCDR (ranges))
 	{
@@ -1246,7 +1244,7 @@ DEFUN ("treesit-expand-query",
 		     query, build_pure_c_string (" "));
 }
 
-char*
+static const char*
 ts_query_error_to_string (TSQueryError error)
 {
   switch (error)
@@ -1285,7 +1283,7 @@ ts_query_error_to_string (TSQueryError error)
 
 /* Collect predicates for this match and return them in a list.  Each
    predicate is a list of strings and symbols.  */
-Lisp_Object
+static Lisp_Object
 ts_predicates_for_pattern
 (TSQuery *query, uint32_t pattern_index)
 {
@@ -1327,7 +1325,7 @@ ts_query_error_to_string (TSQueryError error)
 
 /* Translate a capture NAME (symbol) to the text of the captured node.
    Signals treesit-query-error if such node is not captured.  */
-Lisp_Object
+static Lisp_Object
 ts_predicate_capture_name_to_text
 (Lisp_Object name, struct capture_range captures)
 {
@@ -1360,7 +1358,7 @@ ts_query_error_to_string (TSQueryError error)
    false otherwise. A and B can be either string, or a capture name.
    The capture name evaluates to the text its captured node spans in
    the buffer.  */
-bool
+static bool
 ts_predicate_equal
 (Lisp_Object args, struct capture_range captures)
 {
@@ -1383,7 +1381,7 @@ ts_query_error_to_string (TSQueryError error)
 /* Handles predicate (#match "regexp" @node).  Return true if "regexp"
    matches the text spanned by @node; return false otherwise.  Matching
    is case-sensitive.  */
-bool
+static bool
 ts_predicate_match
 (Lisp_Object args, struct capture_range captures)
 {
@@ -1420,7 +1418,7 @@ ts_query_error_to_string (TSQueryError error)
 
 /* If all predicates in PREDICATES passes, return true; otherwise
    return false.  */
-bool
+static bool
 ts_eval_predicates
 (struct capture_range captures, Lisp_Object predicates)
 {

commit 0d4155826a523f28c616295a91e7859c1fc05426
Author: Yuan Fu <casouri@gmail.com>
Date:   Mon May 9 12:34:01 2022 -0700

    Remove call to nconc to improve performance
    
    * src/treesit.c (struct capture_range): New struct.
    (ts_predicate_capture_name_to_text, ts_predicate_equal,
    ts_predicate_match, ts_eval_predicates): Replace capture list with
    capture_range.
    (Ftreesit_query_capture): Remove call to nconc.

diff --git a/src/treesit.c b/src/treesit.c
index e127fc2d87..beeb2b7855 100644
--- a/src/treesit.c
+++ b/src/treesit.c
@@ -1268,6 +1268,21 @@ ts_query_error_to_string (TSQueryError error)
     }
 }
 
+/* This struct is used for passing captures to be check against
+   predicates.  Captures we check for are the ones in START before
+   END.  For example, if START and END are
+
+   START       END
+    v              v
+   (1 . (2 . (3 . (4 . (5 . (6 . nil))))))
+
+   We only look at captures 1 2 3.  */
+struct capture_range
+{
+  Lisp_Object start;
+  Lisp_Object end;
+};
+
 /* Collect predicates for this match and return them in a list.  Each
    predicate is a list of strings and symbols.  */
 Lisp_Object
@@ -1313,10 +1328,12 @@ ts_query_error_to_string (TSQueryError error)
 /* Translate a capture NAME (symbol) to the text of the captured node.
    Signals treesit-query-error if such node is not captured.  */
 Lisp_Object
-ts_predicate_capture_name_to_text (Lisp_Object name, Lisp_Object captures)
+ts_predicate_capture_name_to_text
+(Lisp_Object name, struct capture_range captures)
 {
   Lisp_Object node = Qnil;
-  for (Lisp_Object tail = captures; !NILP (tail); tail = XCDR (tail))
+  for (Lisp_Object tail = captures.start;
+       !EQ (tail, captures.end); tail = XCDR (tail))
     {
       if (EQ (XCAR (XCAR (tail)), name))
 	{
@@ -1344,14 +1361,14 @@ ts_predicate_capture_name_to_text (Lisp_Object name, Lisp_Object captures)
    The capture name evaluates to the text its captured node spans in
    the buffer.  */
 bool
-ts_predicate_equal (Lisp_Object args, Lisp_Object captures)
+ts_predicate_equal
+(Lisp_Object args, struct capture_range captures)
 {
   if (XFIXNUM (Flength (args)) != 2)
     xsignal2 (Qtreesit_query_error, build_pure_c_string ("Predicate `equal' requires two arguments but only given"), Flength (args));
 
   Lisp_Object arg1 = XCAR (args);
   Lisp_Object arg2 = XCAR (XCDR (args));
-  Lisp_Object tail = captures;
   Lisp_Object text1 = STRINGP (arg1) ? arg1 :
     ts_predicate_capture_name_to_text (arg1, captures);
   Lisp_Object text2 = STRINGP (arg2) ? arg2 :
@@ -1367,14 +1384,14 @@ ts_predicate_equal (Lisp_Object args, Lisp_Object captures)
    matches the text spanned by @node; return false otherwise.  Matching
    is case-sensitive.  */
 bool
-ts_predicate_match (Lisp_Object args, Lisp_Object captures)
+ts_predicate_match
+(Lisp_Object args, struct capture_range captures)
 {
   if (XFIXNUM (Flength (args)) != 2)
     xsignal2 (Qtreesit_query_error, build_pure_c_string ("Predicate `equal' requires two arguments but only given"), Flength (args));
 
   Lisp_Object regexp = XCAR (args);
   Lisp_Object capture_name = XCAR (XCDR (args));
-  Lisp_Object tail = captures;
   Lisp_Object text = ts_predicate_capture_name_to_text
     (capture_name, captures);
 
@@ -1404,7 +1421,8 @@ ts_predicate_match (Lisp_Object args, Lisp_Object captures)
 /* If all predicates in PREDICATES passes, return true; otherwise
    return false.  */
 bool
-ts_eval_predicates (Lisp_Object captures, Lisp_Object predicates)
+ts_eval_predicates
+(struct capture_range captures, Lisp_Object predicates)
 {
   bool pass = true;
   /* Evaluate each predicates.  */
@@ -1498,13 +1516,21 @@ DEFUN ("treesit-query-capture",
   TSQueryMatch match;
 
   /* Go over each match, collect captures and predicates.  Include the
-     captures in the return list if all predicates in that match
-     passes.  */
+     captures in the RESULT list unconditionally as we get them, then
+     test for predicates.  If predicates pass, then all good, if
+     predicates don't pass, revert the result back to the result
+     before this loop (PREV_RESULT). (Predicates control the entire
+     match.) This way we don't need to create a list of captures in
+     every for loop and nconc it to RESULT every time.  That is indeed
+     the initial implementation in which Yoav found nconc being the
+     bottleneck (98.4% of the running time spent on nconc).  */
   Lisp_Object result = Qnil;
+  Lisp_Object prev_result = result;
   while (ts_query_cursor_next_match (cursor, &match))
     {
+      /* Record the checkpoint that we may roll back to.  */
+      prev_result = result;
       /* Get captured nodes.  */
-      Lisp_Object captures_lisp = Qnil;
       const TSQueryCapture *captures = match.captures;
       for (int idx=0; idx < match.capture_count; idx++)
 	{
@@ -1517,21 +1543,23 @@ DEFUN ("treesit-query-capture",
 	  Lisp_Object cap =
 	    Fcons (intern_c_string_1 (capture_name, capture_name_len),
 		   captured_node);
-	  captures_lisp = Fcons (cap, captures_lisp);
+	  result = Fcons (cap, result);
 	}
       /* Get predicates.  */
       Lisp_Object predicates =
 	ts_predicates_for_pattern (ts_query, match.pattern_index);
 
-      captures_lisp = Fnreverse (captures_lisp);
-      if (ts_eval_predicates (captures_lisp, predicates))
+      /* captures_lisp = Fnreverse (captures_lisp); */
+      struct capture_range captures_range = { result, prev_result };
+      if (!ts_eval_predicates (captures_range, predicates))
 	{
-	  result = CALLN (Fnconc, result, captures_lisp);
+	  /* Predicates didn't pass, roll back.  */
+	  result = prev_result;
 	}
     }
   ts_query_delete (ts_query);
   ts_query_cursor_delete (cursor);
-  return result;
+  return Fnreverse (result);
 }
 
 /*** Initialization */

commit 82d5e902af68695481b8809e511a7913ef9a75aa
Merge: 84847cad82 293a97d61e
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat May 7 01:57:39 2022 -0700

    ; Merge from master.

commit 84847cad82e3b667c82f411627cd58d236f55e84
Author: Yuan Fu <casouri@gmail.com>
Date:   Sat Mar 12 22:10:06 2022 -0800

    Add tree-sitter intergration
    
    * configure.ac (HAVE_TREE_SITTER, TREE_SITTER_OBJ): New variables.
    (DYNAMIC_LIB_SUFFIX): new variable, I copied code from MODULES_SUFFIX
    so the diff looks this way.
    * doc/lispref/elisp.texi (Top): Add tree-sitter manual.
    * doc/lispref/modes.texi (Font Lock Mode): mention tree-sitter.
    (Parser-based Font Lock): New section.
    (Auto-Indentation): Mention tree-sitter.
    (Parser-based Indentation): New section.
    * doc/lispref/parsing.texi (Parsing Program Source): New chapter.
    * lisp/emacs-lisp/cl-preloaded.el (cl--typeof-types): Add
    treesit-parser and treesit-node type.
    * lisp/treesit.el: New file.
    * src/Makefile.in (TREE_SITTER_LIBS, TREE_SITTER_FLAGS,
    TREE_SITTER_OBJ): New variables.
    * src/alloc.c:
    (cleanup_vector): Add cleanup code for treesit-parser and
    treesit-node.
    * src/casefiddle.c (casify_region): Notify tree-sitter parser of
    buffer change.
    * src/data.c (Ftype_of): Add treesit-parser and treesit-node type
    (Qtreesit_parser, Qtreesit_node): New symbol.
    * src/emacs.c (main): Add symbols in treesit.c.
    * src/eval.c (define_error): Move the function to here.
    * src/insdel.c (insert_1_both, insert_from_string_1, insert_from_gap,
    insert_from_buffer_1, replace_range, del_range_2): Notify tree-sitter
    parser of buffer change.
    * src/json.c (define_error): Move this function out.
    * src/lisp.h (DEFINE_GDB_SYMBOL_BEGIN): Add treesit-parser and
    treesit-node.
    * src/lread.c (Vdynamic_library_suffixes): New variable.
    * src/print.c (print_vectorlike): Add code for printing
    treesit-parser and treesit-node.
    * src/treesit.c: New file.
    * src/treesit.h: New file.
    * test/src/treesit-tests.el: New file.

diff --git a/configure.ac b/configure.ac
index a315eeb6bd..0c174c6a7b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -457,6 +457,7 @@ AC_DEFUN
 OPTION_DEFAULT_OFF([imagemagick],[compile with ImageMagick image support])
 OPTION_DEFAULT_ON([native-image-api], [don't use native image APIs (GDI+ on Windows)])
 OPTION_DEFAULT_IFAVAILABLE([json], [compile with native JSON support])
+OPTION_DEFAULT_IFAVAILABLE([tree-sitter], [compile with tree-sitter])
 
 OPTION_DEFAULT_ON([xft],[don't use XFT for anti aliased fonts])
 OPTION_DEFAULT_ON([harfbuzz],[don't use HarfBuzz for text shaping])
@@ -3087,6 +3088,27 @@ AC_DEFUN
 AC_SUBST(JSON_CFLAGS)
 AC_SUBST(JSON_OBJ)
 
+HAVE_TREE_SITTER=no
+TREE_SITTER_OBJ=
+
+if test "${with_tree_sitter}" != "no"; then
+   dnl TODO: we should use tree-sitter >= 0.20.2, but right now all
+   dnl tree-sitter libraries distributed are versioned at 0.0, so for
+   dnl the easy of development we'll just leave the version
+   dnl requirement at 0.0 for now.
+  EMACS_CHECK_MODULES([TREE_SITTER], [tree-sitter >= 0.0],
+    [HAVE_TREE_SITTER=yes], [HAVE_TREE_SITTER=no])
+  if test "${HAVE_TREE_SITTER}" = yes; then
+    AC_DEFINE(HAVE_TREE_SITTER, 1, [Define if using tree-sitter.])
+    TREE_SITTER_LIBS=-ltree-sitter
+    TREE_SITTER_OBJ="treesit.o"
+  fi
+fi
+
+AC_SUBST(TREE_SITTER_LIBS)
+AC_SUBST(TREE_SITTER_CFLAGS)
+AC_SUBST(TREE_SITTER_OBJ)
+
 NOTIFY_OBJ=
 NOTIFY_SUMMARY=no
 
@@ -3926,20 +3948,31 @@ AC_DEFUN
 fi
 AC_SUBST(LIBZ)
 
+### Dynamic library support
+case $opsys in
+  cygwin|mingw32) DYNAMIC_LIB_SUFFIX=".dll" ;;
+  darwin) DYNAMIC_LIB_SUFFIX=".dylib" ;;
+  *) DYNAMIC_LIB_SUFFIX=".so" ;;
+esac
+case "${opsys}" in
+  darwin) DYNAMIC_LIB_SECONDARY_SUFFIX='.so' ;;
+  *) DYNAMIC_LIB_SECONDARY_SUFFIX='' ;;
+esac
+AC_DEFINE_UNQUOTED(DYNAMIC_LIB_SUFFIX, "$DYNAMIC_LIB_SUFFIX",
+  [System extension for dynamic libraries])
+AC_DEFINE_UNQUOTED(DYNAMIC_LIB_SECONDARY_SUFFIX, "$DYNAMIC_LIB_SECONDARY_SUFFIX",
+  [Alternative system extension for dynamic libraries.])
+
+AC_SUBST(DYNAMIC_LIB_SUFFIX)
+AC_SUBST(DYNAMIC_LIB_SECONDARY_SUFFIX)
+
 ### Dynamic modules support
 LIBMODULES=
 HAVE_MODULES=no
 MODULES_OBJ=
 NEED_DYNLIB=no
-case $opsys in
-  cygwin|mingw32) MODULES_SUFFIX=".dll" ;;
-  darwin) MODULES_SUFFIX=".dylib" ;;
-  *) MODULES_SUFFIX=".so" ;;
-esac
-case "${opsys}" in
-  darwin) MODULES_SECONDARY_SUFFIX='.so' ;;
-  *) MODULES_SECONDARY_SUFFIX='' ;;
-esac
+MODULES_SUFFIX="${DYNAMIC_LIB_SUFFIX}"
+MODULES_SECONDARY_SUFFIX="${DYNAMIC_LIB_SECONDARY_SUFFIX}"
 if test "${with_modules}" != "no"; then
   case $opsys in
     gnu|gnu-linux)
@@ -3970,10 +4003,10 @@ AC_DEFUN
    NEED_DYNLIB=yes
    AC_DEFINE(HAVE_MODULES, 1, [Define to 1 if dynamic modules are enabled])
    AC_DEFINE_UNQUOTED(MODULES_SUFFIX, "$MODULES_SUFFIX",
-     [System extension for dynamic libraries])
+     [System extension for dynamic modules])
    if test -n "${MODULES_SECONDARY_SUFFIX}"; then
      AC_DEFINE_UNQUOTED(MODULES_SECONDARY_SUFFIX, "$MODULES_SECONDARY_SUFFIX",
-       [Alternative system extension for dynamic libraries.])
+       [Alternative system extension for dynamic modules.])
    fi
 fi
 AC_SUBST(MODULES_OBJ)
@@ -4333,6 +4366,12 @@ AC_DEFUN
   *) MISSING="$MISSING json"
      WITH_IFAVAILABLE="$WITH_IFAVAILABLE --with-json=ifavailable";;
 esac
+case $with_tree_sitter,$HAVE_TREE_SITTER in
+  no,* | ifavailable,* | *,yes) ;;
+  *) MISSING="$MISSING tree-sitter"
+     WITH_IFAVAILABLE="$WITH_IFAVAILABLE --with-tree-sitter=ifavailable";;
+esac
+
 if test "X${MISSING}" != X; then
   # If we have a missing library, and we don't have pkg-config installed,
   # the missing pkg-config may be the reason.  Give the user a hint.
@@ -6263,7 +6302,7 @@ AC_DEFUN
 optsep=
 emacs_config_features=
 for opt in ACL BE_APP CAIRO DBUS FREETYPE GCONF GIF GLIB GMP GNUTLS GPM GSETTINGS \
- HARFBUZZ IMAGEMAGICK JPEG JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 \
+ HARFBUZZ IMAGEMAGICK JPEG JSON TREE-SITTER LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 \
  M17N_FLT MODULES NATIVE_COMP NOTIFY NS OLDXMENU PDUMPER PGTK PNG RSVG SECCOMP \
  SOUND SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS \
  UNEXEC WEBP X11 XAW3D XDBE XFT XIM XINPUT2 XPM XWIDGETS X_TOOLKIT \
@@ -6334,6 +6373,7 @@ AC_DEFUN
   Does Emacs use -lxft?                                   ${HAVE_XFT}
   Does Emacs use -lsystemd?                               ${HAVE_LIBSYSTEMD}
   Does Emacs use -ljansson?                               ${HAVE_JSON}
+  Does Emacs use -ltree-sitter?                           ${HAVE_TREE_SITTER}
   Does Emacs use the GMP library?                         ${HAVE_GMP}
   Does Emacs directly use zlib?                           ${HAVE_ZLIB}
   Does Emacs have dynamic modules support?                ${HAVE_MODULES}
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi
index 426bb6d017..7390352016 100644
--- a/doc/lispref/elisp.texi
+++ b/doc/lispref/elisp.texi
@@ -222,6 +222,7 @@ Top
 * Non-ASCII Characters::    Non-ASCII text in buffers and strings.
 * Searching and Matching::  Searching buffers for strings or regexps.
 * Syntax Tables::           The syntax table controls word and list parsing.
+* Parsing Program Source::  Generate syntax tree for program sources.
 * Abbrevs::                 How Abbrev mode works, and its data structures.
 
 * Threads::                 Concurrency in Emacs Lisp.
@@ -1357,6 +1358,16 @@ Top
 * Syntax Table Internals::  How syntax table information is stored.
 * Categories::              Another way of classifying character syntax.
 
+Parsing Program Source
+
+* Language Definitions::     Loading tree-sitter language definitions.
+* Using Parser::             Introduction to parsers.
+* Retrieving Node::          Retrieving node from syntax tree.
+* Accessing Node::           Accessing node information.
+* Pattern Matching::         Pattern matching with query patterns.
+* Multiple Languages::       Parse text written in multiple languages.
+* Tree-sitter C API::        Compare the C API and the ELisp API.
+
 Syntax Descriptors
 
 * Syntax Class Table::      Table of syntax classes.
@@ -1701,6 +1712,7 @@ Top
 
 @include searching.texi
 @include syntax.texi
+@include parsing.texi
 @include abbrevs.texi
 @include threads.texi
 @include processes.texi
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index c29936d5ca..905b21c0d4 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -2826,11 +2826,13 @@ Font Lock Mode
 in which contexts.  This section explains how to customize Font Lock for
 a particular major mode.
 
-  Font Lock mode finds text to highlight in two ways: through
-syntactic parsing based on the syntax table, and through searching
-(usually for regular expressions).  Syntactic fontification happens
-first; it finds comments and string constants and highlights them.
-Search-based fontification happens second.
+  Font Lock mode finds text to highlight in three ways: through
+syntactic parsing based on the syntax table, through searching
+(usually for regular expressions), and through parsing based on a
+full-blown parser.  Syntactic fontification happens first; it finds
+comments and string constants and highlights them.  Search-based
+fontification happens second.  Parser-based fontification can be
+optionally enabled and it will precede the other two fontifications.
 
 @menu
 * Font Lock Basics::            Overview of customizing Font Lock.
@@ -2845,6 +2847,7 @@ Font Lock Mode
 * Syntactic Font Lock::         Fontification based on syntax tables.
 * Multiline Font Lock::         How to coerce Font Lock into properly
                                   highlighting multiline constructs.
+* Parser-based Font Lock::      Use a parser for fontification.
 @end menu
 
 @node Font Lock Basics
@@ -3735,6 +3738,89 @@ Region to Refontify
 reasonably fast.
 @end defvar
 
+@node Parser-based Font Lock
+@subsection Parser-based Font Lock
+
+@c This node is written when the only parser Emacs has is tree-sitter,
+@c if in the future more parser are supported, feel free to reorganize
+@c and rewrite this node to describe multiple parsers in parallel.
+
+Besides simple syntactic font lock and search-based font lock, Emacs
+also provides complete syntactic font lock with the help of a parser,
+currently provided by the tree-sitter library (@pxref{Parsing Program
+Source}).  Because it is an optional feature, parser-based font lock
+is less integrated with Emacs.  Most variables introduced in previous
+sections only apply to search-based font lock, except for
+@var{font-lock-maximum-decoration}.
+
+@defun treesit-font-lock-enable
+This function enables parser-based font lock in the current buffer.
+@end defun
+
+Parser-based font lock and other font lock mechanism are not mutually
+exclusive.  By default, if enabled, parser-based font lock runs first,
+then the simple syntactic font lock (if enabled), then search-based
+font lock.
+
+Although parser-based font lock doesn't share the same customization
+variables with search-based font lock, parser-based font lock uses
+similar customization schemes.  Just like @var{font-lock-keywords} and
+@var{font-lock-defaults}, parser-based font lock has
+@var{treesit-font-lock-settings} and
+@var{treesit-font-lock-defaults}.
+
+@defvar treesit-font-lock-settings
+A list of @var{setting}s for tree-sitter font lock.
+
+Each @var{setting} should look like
+
+@example
+(@var{language} @var{query})
+@end example
+
+Each @var{setting} controls one parser (often of different language).
+And @var{language} is the language symbol (@pxref{Language
+Definitions}); @var{query} is either a string query or a sexp query
+(@pxref{Pattern Matching}).
+
+Capture names in @var{query} should be face names like
+@code{font-lock-keyword-face}.  The captured node will be fontified
+with that face.  Capture names can also be function names, in which
+case the function is called with (@var{start} @var{end} @var{node}),
+where @var{start} and @var{end} are the start and end position of the
+node in buffer, and @var{node} is the tree-sitter node object.  If a
+capture name is both a face and a function, face takes priority.
+
+Generally, major modes should set @var{treesit-font-lock-defaults},
+and let Emacs automatically populate this variable.
+@end defvar
+
+@defvar treesit-font-lock-defaults
+This variable stores defaults for tree-sitter font Lock.  It is a list
+of
+
+@example
+(@var{default} @var{:keyword} @var{value}...)
+@end example
+
+A @var{default} may be a symbol or a list of symbols (for different
+levels of fontification).  The symbol(s) can be a variable or a
+function.  If a symbol is both a variable and a function, it is used
+as a function.  Different levels of fontification can be controlled by
+@var{font-lock-maximum-decoration}.
+
+The symbol(s) in @var{default} should contain or return a
+@var{setting} as described in @var{treesit-font-lock-settings}.
+
+The rest @var{keyword}s and @var{value}s are additional settings that
+could be used to alter the fontification behavior.  Currently there
+aren't any.
+@end defvar
+
+Multi-language major modes should provide range functions in
+@var{treesit-range-functions}, and Emacs will set the ranges
+accordingly before fontifing a region (@pxref{Multiple Languages}).
+
 @node Auto-Indentation
 @section Automatic Indentation of code
 
@@ -3791,10 +3877,12 @@ Auto-Indentation
 so if your language seems somewhat similar to one of those languages,
 you might try to use that engine.  @c FIXME: documentation?
 Another one is SMIE which takes an approach in the spirit
-of Lisp sexps and adapts it to non-Lisp languages.
+of Lisp sexps and adapts it to non-Lisp languages. Yet another one is
+to rely on a full-blown parser, for example, the tree-sitter library.
 
 @menu
 * SMIE::                        A simple minded indentation engine.
+* Parser-based indentation::    Parser-based indentation engine.
 @end menu
 
 @node SMIE
@@ -4454,6 +4542,176 @@ SMIE Customization
 @code{eval: (smie-config-local '(@var{rules}))}.
 @end defun
 
+@node Parser-based Indentation
+@subsection Parser-based Indentation
+
+@c This node is written when the only parser Emacs has is tree-sitter,
+@c if in the future more parser are supported, feel free to reorganize
+@c and rewrite this node to describe multiple parsers in parallel.
+
+When built with the tree-sitter library (@pxref{Parsing Program
+Source}), Emacs could parse program source and produce a syntax tree.
+And this syntax tree can be used for indentation.  For maximum
+flexibility, we could write a custom indent function that queries the
+syntax tree and indents accordingly for each language, but that would
+be a lot of work.  It is more convenient to use the simple indentation
+engine described below: we only need to write some indentation rules
+and the engine takes care of the rest.
+
+To enable the indentation engine, set the value of
+@var{indent-line-function} to @code{treesit-indent}.
+
+@defvar treesit-indent-function
+This variable stores the actual function called by
+@code{treesit-indent}.  By default, its value is
+@code{treesit-simple-indent}.  In the future we might add other
+more complex indentation engines, if @code{treesit-simple-indent}
+proves to be insufficient.
+@end defvar
+
+@heading Writing indentation rules
+
+@defvar treesit-simple-indent-rules
+This local variable stores indentation rules for every language. It is
+a list of
+
+@example
+(@var{language} . @var{rules})
+@end example
+
+where @var{language} is a language symbol, @var{rules} is a list of
+
+@example
+(@var{matcher} @var{anchor} @var{offset})
+@end example
+
+The @var{matcher} determines whether this rule applies, @var{anchor}
+and @var{offset} together determines which column to indent to.
+
+A @var{matcher} is a function that takes three arguments (@var{node}
+@var{parent} @var{bol}).  Argument @var{bol} is the point at where we
+are indenting: the position of the first non-whitespace character from
+the beginning of line; @var{node} is the largest (highest-in-tree)
+node that starts at that point; @var{parent} is the parent of
+@var{node};
+
+If @var{matcher} returns non-nil, meaning the rule matches, Emacs then
+uses @var{anchor} to find an anchor, it should be a function that
+takes the same argument (@var{node} @var{parent} @var{bol}) and
+returns a point.
+
+Finally Emacs computes the column of that point returned by
+@var{anchor} and adds @var{offset} to it, and indents to that column.
+
+For @var{matcher} and @var{anchor}, Emacs provides some convenient
+presets to spare us from writing these functions ourselves. They are
+stored in @var{treesit-simple-indent-presets}, see below.
+@end defvar
+
+@defvar treesit-simple-indent-presets
+This is a list of presets for @var{matcher}s and @var{anchor}s in
+@var{treesit-simple-indent-rules}. Each of them represent a
+function that takes @var{node}, @var{parent} and @var{bol} as
+arguments.
+
+@example
+(match @var{node-type} @var{parent-type}
+       @var{node-field} @var{node-index-min} @var{node-index-max})
+@end example
+
+This matcher checks if @var{node}'s type is @var{node-type},
+@var{parent}'s type is @var{parent-type}, @var{node}'s field name in
+@var{parent} is @var{node-field}, and @var{node}'s index among its
+siblings is between @var{node-index-min} and @var{node-index-max}.  If
+the value of a constraint is nil, this matcher doesn't check for that
+constraint.  For example, to match the first child where parent is
+@code{argument_list}, use
+
+@example
+(match nil "argument_list" nil nil 0 0)
+@end example
+
+@example
+no-node
+@end example
+
+This matcher matches the case where @var{node} is nil, i.e., there is
+no node that starts at @var{bol}.  This is the case when @var{bol} is
+at an empty line or inside a multi-line string, etc.
+
+@example
+(parent-is @var{type})
+@end example
+
+This matcher matches if @var{parent}'s type is @var{type}.
+
+@example
+(node-is @var{type})
+@end example
+
+This matcher matches if @var{node}'s type is @var{type}.
+
+@example
+(query @var{query})
+@end example
+
+This matcher matches if querying @var{parent} with @var{query}
+captures @var{node}.  The capture name does not matter.
+
+@example
+first-sibling
+@end example
+
+This anchor returns the start of the first child of @var{parent}.
+
+@example
+parent
+@end example
+
+This anchor returns the start of @var{parent}.
+
+@example
+parent-bol
+@end example
+
+This anchor returns the beginning of non-space characters on the line
+where @var{parent} is on.
+
+@example
+prev-sibling
+@end example
+
+This anchor returns the start of the previous sibling of @var{node}.
+
+@example
+no-indent
+@end example
+
+This anchor returns the start of @var{node}, i.e., do not indent.
+
+@example
+prev-line
+@end example
+
+This anchor returns the start of the first named node on the previous
+line.  This can be used for indenting an empty line.
+@end defvar
+
+@heading Indentation utilities
+
+Here are some utility functions that can help writing indentation
+rules.
+
+@defun treesit-check-indent mode
+This function check current buffer's indentation against major mode
+@var{mode}.  It indents the current line in @var{mode} and compares
+the indentation with the current indentation.  Then it pops up a diff
+buffer showing the difference.  Correct indentation (target) is in
+green, current indentation is in red.
+@end defun
+
+It is also helpful to use @code{treesit-inspect-mode} when writing
+indentation rules.
 
 @node Desktop Save Mode
 @section Desktop Save Mode
diff --git a/doc/lispref/parsing.texi b/doc/lispref/parsing.texi
new file mode 100644
index 0000000000..bbe70ff9b1
--- /dev/null
+++ b/doc/lispref/parsing.texi
@@ -0,0 +1,1420 @@
+@c -*- mode: texinfo; coding: utf-8 -*-
+@c This is part of the GNU Emacs Lisp Reference Manual.
+@c Copyright (C) 2021 Free Software Foundation, Inc.
+@c See the file elisp.texi for copying conditions.
+@node Parsing Program Source
+@chapter Parsing Program Source
+
+Emacs provides various ways to parse program source text and produce a
+@dfn{syntax tree}.  In a syntax tree, text is no longer a
+one-dimensional stream but a structured tree of nodes, where each node
+representing a piece of text.  Thus a syntax tree can enable
+interesting features like precise fontification, indentation,
+navigation, structured editing, etc.
+
+Emacs has a simple facility for parsing balanced expressions
+(@pxref{Parsing Expressions}).  There is also SMIE library for generic
+navigation and indentation (@pxref{SMIE}).
+
+Emacs also provides integration with tree-sitter library
+(@uref{https://tree-sitter.github.io/tree-sitter}) if compiled with
+it.  The tree-sitter library implements an incremental parser and has
+support from a wide range of programming languages.
+
+@defun treesit-available-p
+This function returns non-nil if tree-sitter features are available
+for this Emacs instance.
+@end defun
+
+For using tree-sitter features in font-lock and indentation,
+@pxref{Parser-based Font Lock}, @pxref{Parser-based Indentation}.
+
+To access the syntax tree of the text in a buffer, we need to first
+load a language definition and create a parser with it.  Next, we can
+query the parser for specific nodes in the syntax tree.  Then, we can
+access various information about the node, and we can pattern-match a
+node with a powerful syntax.  Finally, we explain how to work with
+source files that mixes multiple languages.  The following sections
+explain how to do each of the tasks in detail.
+
+@menu
+* Language Definitions::     Loading tree-sitter language definitions.
+* Using Parser::             Introduction to parsers.
+* Retrieving Node::          Retrieving node from syntax tree.
+* Accessing Node::           Accessing node information.
+* Pattern Matching::         Pattern matching with query patterns.
+* Multiple Languages::       Parse text written in multiple languages.
+* Tree-sitter C API::        Compare the C API and the ELisp API.
+@end menu
+
+@node Language Definitions
+@section Tree-sitter Language Definitions
+
+@heading Loading a language definition
+
+Tree-sitter relies on language definitions to parse text in that
+language. In Emacs, A language definition is represented by a symbol.
+For example, C language definition is represented as @code{c}, and
+@code{c} can be passed to tree-sitter functions as the @var{language}
+argument.
+
+@vindex treesit-extra-load-path
+@vindex treesit-load-language-error
+@vindex treesit-load-suffixes
+Tree-sitter language definitions are distributed as dynamic libraries.
+In order to use a language definition in Emacs, you need to make sure
+that the dynamic library is installed on the system.  Emacs looks for
+language definitions under load paths in
+@var{treesit-extra-load-path}, @var{user-emacs-directory}/tree-sitter,
+and system default locations for dynamic libraries, in that order.
+Emacs tries each extensions in @var{treesit-load-suffixes}.  If Emacs
+cannot find the library or has problem loading it, Emacs signals
+@var{treesit-load-language-error}.  The signal data is a list of
+specific error messages.
+
+@defun treesit-language-available-p language
+This function checks whether the dynamic library for @var{language} is
+present on the system, and return non-nil if it is.
+@end defun
+
+@vindex treesit-load-name-override-list
+By convention, the dynamic library for @var{language} is
+@code{libtree-sitter-@var{language}.@var{ext}}, where @var{ext} is the
+system-specific extension for dynamic libraries. Also by convention,
+the function provided by that library is named
+@code{tree_sitter_<language>}.  If a language definition doesn't
+follow this convention, you should add an entry
+
+@example
+(@var{language} @var{library-base-name} @var{function-name})
+@end example
+
+to @var{treesit-load-name-override-list}, where
+@var{library-base-name} is the base filename for the dynamic library
+(conventionally @code{libtree-sitter-@var{language}}), and
+@var{function-name} is the function provided by the library
+(conventionally @code{tree_sitter_@var{language}). For example,
+
+@example
+(cool-lang "libtree-sitter-coool" "tree_sitter_cooool")
+@end example
+
+for a language too cool to abide by the rules.
+
+@heading Concrete syntax tree
+
+A syntax tree is what a language definition defines (more or less) and
+what a parser generates.  In a syntax tree, each node represents a
+piece of text, and is connected to each other by a parent-child
+relationship.  For example, if the source text is
+
+@example
+1 + 2
+@end example
+
+@noindent
+its syntax tree could be
+
+@example
+@group
+                  +--------------+
+                  | root "1 + 2" |
+                  +--------------+
+                         |
+        +--------------------------------+
+        |       expression "1 + 2"       |
+        +--------------------------------+
+           |             |            |
++------------+   +--------------+   +------------+
+| number "1" |   | operator "+" |   | number "2" |
++------------+   +--------------+   +------------+
+@end group
+@end example
+
+We can also represent it in s-expression:
+
+@example
+(root (expression (number) (operator) (number)))
+@end example
+
+@subheading Node types
+
+@cindex tree-sitter node type
+@anchor{tree-sitter node type}
+@cindex tree-sitter named node
+@anchor{tree-sitter named node}
+@cindex tree-sitter anonymous node
+Names like @code{root}, @code{expression}, @code{number},
+@code{operator} are nodes' @dfn{type}.  However, not all nodes in a
+syntax tree have a type.  Nodes that don't are @dfn{anonymous nodes},
+and nodes with a type are @dfn{named nodes}.  Anonymous nodes are
+tokens with fixed spellings, including punctuation characters like
+bracket @samp{]}, and keywords like @code{return}.
+
+@subheading Field names
+
+@cindex tree-sitter node field name
+@anchor{tree-sitter node field name} To make the syntax tree easier to
+analyze, many language definitions assign @dfn{field names} to child
+nodes.  For example, a @code{function_definition} node could have a
+@code{declarator} and a @code{body}:
+
+@example
+@group
+(function_definition
+ declarator: (declaration)
+ body: (compound_statement))
+@end group
+@end example
+
+@deffn Command treesit-inspect-mode
+This minor mode displays the node that @emph{starts} at point in
+mode-line.  The mode-line will display
+
+@example
+@var{parent} @var{field-name}: (@var{child} (@var{grand-child} (...)))
+@end example
+
+@var{child}, @var{grand-child}, and @var{grand-grand-child}, etc, are
+nodes that have their beginning at point.  And @var{parent} is the
+parent of @var{child}.
+
+If there is no node that starts at point, i.e., point is in the middle
+of a node, then the mode-line only displays the smallest node that
+spans point, and its immediate parent.
+
+This minor mode doesn't create parsers on its own.  It simply uses the
+first parser in @var{treesit-parser-list} (@pxref{Using Parser}).
+@end deffn
+
+@heading Reading the grammar definition
+
+Authors of language definitions define the @dfn{grammar} of a
+language, and this grammar determines how does a parser construct a
+concrete syntax tree out of the text.  In order to used the syntax
+tree effectively, we need to read the @dfn{grammar file}.
+
+The grammar file is usually @code{grammar.js} in a language
+definition’s project repository.  The link to a language definition’s
+home page can be found in tree-sitter’s homepage
+(@uref{https://tree-sitter.github.io/tree-sitter}).
+
+The grammar is written in JavaScript syntax.  For example, the rule
+matching a @code{function_definition} node looks like
+
+@example
+@group
+function_definition: $ => seq(
+  $.declaration_specifiers,
+  field('declarator', $.declaration),
+  field('body', $.compound_statement)
+)
+@end group
+@end example
+
+The rule is represented by a function that takes a single argument
+@var{$}, representing the whole grammar.  The function itself is
+constructed by other functions: the @code{seq} function puts together a
+sequence of children; the @code{field} function annotates a child with
+a field name.  If we write the above definition in BNF syntax, it
+would look like
+
+@example
+@group
+function_definition :=
+  <declaration_specifiers> <declaration> <compound_statement>
+@end group
+@end example
+
+@noindent
+and the node returned by the parser would look like
+
+@example
+@group
+(function_definition
+  (declaration_specifier)
+  declarator: (declaration)
+  body: (compound_statement))
+@end group
+@end example
+
+Below is a list of functions that one will see in a grammar
+definition.  Each function takes other rules as arguments and returns
+a new rule.
+
+@itemize @bullet
+@item
+@code{seq(rule1, rule2, ...)} matches each rule one after another.
+
+@item
+@code{choice(rule1, rule2, ...)} matches one of the rules in its
+arguments.
+
+@item
+@code{repeat(rule)} matches @var{rule} for @emph{zero or more} times.
+This is like the @samp{*} operator in regular expressions.
+
+@item
+@code{repeat1(rule)} matches @var{rule} for @emph{one or more} times.
+This is like the @samp{+} operator in regular expressions.
+
+@item
+@code{optional(rule)} matches @var{rule} for @emph{zero or one} time.
+This is like the @samp{?} operator in regular expressions.
+
+@item
+@code{field(name, rule)} assigns field name @var{name} to the child
+node matched by @var{rule}.
+
+@item
+@code{alias(rule, alias)} makes nodes matched by @var{rule} appear as
+@var{alias} in the syntax tree generated by the parser.  For example,
+
+@example
+alias(preprocessor_call_exp, call_expression)
+@end example
+
+makes any node matched by @code{preprocessor_call_exp} to appear as
+@code{call_expression}.
+@end itemize
+
+Below are grammar functions less interesting for a reader of a
+language definition.
+
+@itemize
+@item
+@code{token(rule)} marks @var{rule} to produce a single leaf node.
+That is, instead of generating a parent node with individual child
+nodes under it, everything is combined into a single leaf node.
+
+@item
+Normally, grammar rules ignore preceding whitespaces,
+@code{token.immediate(rule)} changes @var{rule} to match only when
+there is no preceding whitespaces.
+
+@item
+@code{prec(n, rule)} gives @var{rule} a level @var{n} precedence.
+
+@item
+@code{prec.left([n,] rule)} marks @var{rule} as left-associative,
+optionally with level @var{n}.
+
+@item
+@code{prec.right([n,] rule)} marks @var{rule} as right-associative,
+optionally with level @var{n}.
+
+@item
+@code{prec.dynamic(n, rule)} is like @code{prec}, but the precedence
+is applied at runtime instead.
+@end itemize
+
+The tree-sitter project talks about writing a grammar in more detail:
+@uref{https://tree-sitter.github.io/tree-sitter/creating-parsers}.
+Read especially ``The Grammar DSL'' section.
+
+@node Using Parser
+@section Using Tree-sitter Parser
+@cindex Tree-sitter parser
+
+This section described how to create and configure a tree-sitter
+parser.  In Emacs, each tree-sitter parser is associated with a
+buffer.  As we edit the buffer, the associated parser is automatically
+kept up-to-date.
+
+@defvar treesit-disabled-modes
+Before creating a parser, it is perhaps good to check whether we
+should use tree-sitter at all.  Sometimes a user don't want to use
+tree-sitter features for a major mode.  To turn-off tree-sitter for a
+mode, they add that mode to this variable.
+@end defvar
+
+@defvar treesit-maximum-size
+If users want to turn off tree-sitter for buffers larger than a
+particular size (because tree-sitter consumes memory ~10 times the
+buffer size for storing the syntax tree), they set this variable to
+that size.
+@end defvar
+
+@defun treesit-should-enable-p &optional mode
+This function returns non-nil if @var{mode} (default to the current
+major mode) should activate tree-sitter features.  The result depends
+on the value of @var{treesit-disabled-modes} and
+@var{treesit-maximum-size} described above.  The result also
+depends on, of course, the result of @code{treesit-avaliabe-p}.
+
+Writer of major modes or other packages are responsible for calling
+this function and determine whether to activate tree-sitter features.
+@end defun
+
+
+@cindex Creating tree-sitter parsers
+To create a parser, we provide a buffer to parse and the language to
+use (@pxref{Language Definitions}).  Emacs provides several creation
+functions for different use cases.
+
+@defun treesit-get-parser-create language
+This function is the most convenient one.  It gives you a parser that
+recognizes @var{language} for the current buffer.  The function
+checks if there already exists a parser suiting the need, and only
+creates a new one when it can't find one.
+
+@example
+@group
+;; Create a parser for C programming language.
+(treesit-get-parser-create 'c)
+    @c @result{} #<treesit-parser for c in *scratch*>
+@end group
+@end example
+@end defun
+
+@defun treesit-get-parser language
+This function is like @code{treesit-get-parser-create}, but it
+always creates a new parser.
+@end defun
+
+@defun treesit-parser-create buffer language
+This function is the most primitive, requiring both the buffer to
+associate to, and the language to use.  If @var{buffer} is nil, the
+current buffer is used.
+@end defun
+
+Given a parser, we can query information about it:
+
+@defun treesit-parser-buffer parser
+Returns the buffer associated with @var{parser}.
+@end defun
+
+@defun treesit-parser-language parser
+Returns the language that @var{parser} uses.
+@end defun
+
+@defun treesit-parser-p object
+Checks if @var{object} is a tree-sitter parser. Return non-nil if it
+is, return nil otherwise.
+@end defun
+
+There is no need to explicitly parse a buffer, because parsing is done
+automatically and lazily.  A parser only parses when we query for a
+node in its syntax tree.  Therefore, when a parser is first created,
+it doesn't parse the buffer; instead, it waits until we query for a
+node for the first time.  Similarly, when some change is made in the
+buffer, a parser doesn't re-parse immediately and only records some
+necessary information to later re-parse when necessary.
+
+@vindex treesit-buffer-too-large
+When a parser do parse, it checks for the size of the buffer.
+Tree-sitter can only handle buffer no larger than about 4GB.  If the
+size exceeds that, Emacs signals @var{treesit-buffer-too-large}
+with signal data being the buffer size.
+
+@vindex treesit-parser-list
+Once a parser is created, Emacs automatically adds it to the
+buffer-local variable @var{treesit-parser-list}.  Every time a
+change is made to the buffer, Emacs updates parsers in this list so
+they can update their syntax tree incrementally.  Therefore, one must
+not remove parsers from this list and put the parser back in: if any
+change is made when that parser is absent, the parser will be
+permanently out-of-sync with the buffer content, and shouldn't be used
+anymore.
+
+@cindex tree-sitter narrowing
+@anchor{tree-sitter narrowing} Normally, a parser ``sees'' the whole
+buffer, but when the buffer is narrowed (@pxref{Narrowing}), the
+parser will only see the visible region.  As far as the parser can
+tell, the hidden region is deleted.  And when the buffer is later
+widened, the parser thinks text is inserted in the beginning and in
+the end.  Although parsers respect narrowing, narrowing shouldn't be
+the mean to handle a multi-language buffer; instead, set the ranges in
+which a parser should operate in.  @xref{Multiple Languages}.
+
+Because a parser parses lazily, when we narrow the buffer, the parser
+doesn't act immediately; as long as we don't query for a node while
+the buffer is narrowed, narrowing does not affect the parser.
+
+@cindex tree-sitter parse string
+@defun treesit-parse-string string language
+Besides creating a parser for a buffer, we can also just parse a
+string.  Unlike a buffer, parsing a string is a one-time deal, and
+there is no way to update the result.
+
+This function parses @var{string} with @var{language}, and returns the
+root node of the generated syntax tree.
+@end defun
+
+@node Retrieving Node
+@section Retrieving Node
+
+@cindex tree-sitter find node
+@cindex tree-sitter get node
+There are two ways to retrieve a node: directly from the syntax tree,
+or by traveling from other nodes.  But before we continue, lets go
+over some conventions of tree-sitter functions.
+
+We talk about a node being ``smaller'' or ``larger'', and ``lower'' or
+``higher''.  A smaller and lower node is lower in the syntax tree and
+therefore spans a smaller piece of text; a larger and higher node is
+higher up in the syntax tree, containing many smaller nodes as its
+children, and therefore spans a larger piece of text.
+
+When a function cannot find a node, it returns nil.  And for the
+convenience for function chaining, all the functions that take a node
+as argument and returns a node accept the node to be nil; in that
+case, the function just returns nil.
+
+@vindex treesit-node-outdated
+Nodes are not automatically updated when the associated buffer is
+modified.  In fact, there is no way to update a node once it is
+retrieved.  It is best to use a node and throw it away and not save
+it.  A node is @dfn{outdated} if the buffer has changed since the node
+is retrieved.  Using an outdated node throws
+@var{treesit-node-outdated} error.
+
+@heading Retrieving node from syntax tree
+
+@defun treesit-node-at beg &optional end parser-or-lang named
+This function returns the @emph{smallest} node that covers the span
+from @var{beg} to @var{end}.  In other words, the start of the node
+@code{<=} @var{beg}, and the end of the node @code{>=} @var{end}.  If
+@var{end} is omitted, it defaults to the value of @var{beg}.
+
+When @var{parser-or-lang} is nil, this function uses the first parser
+in @var{treesit-parser-list} in the current buffer.  If
+@var{parser-or-lang} is a parser object, it use that parser; if
+@var{parser-or-lang} is a language, it finds the first parser using
+that language in @var{treesit-parser-list} and use that.
+
+If @var{named} is non-nil, this function looks for a named node
+instead (@pxref{tree-sitter named node, named node}).
+
+@example
+@group
+;; Find the node at point in a C parser's syntax tree.
+(treesit-node-at (point) (point) 'c)
+    @c @result{} #<treesit-node from 1 to 4 in *scratch*>
+@end group
+@end example
+@end defun
+
+@defun treesit-parser-root-node parser
+This function returns the root node of the syntax tree generated by
+@var{parser}.
+@end defun
+
+@defun treesit-buffer-root-node &optional language
+This function finds the first parser that uses @var{language} in
+@var{treesit-parser-list} in the current buffer, and returns the
+root node of that buffer.  If it cannot find an appropriate parser, it
+returns nil.
+@end defun
+
+Once we have a node, we can retrieve other nodes from it, or query for
+information about this node.
+
+@heading Retrieving node from other nodes
+
+@subheading By kinship
+
+@defun treesit-node-parent node
+This function returns the immediate parent of @var{node}.
+@end defun
+
+@defun treesit-node-child node n &optional named
+This function returns the @var{n}'th child of @var{node}.  If
+@var{named} is non-nil, then it only counts named nodes
+(@pxref{tree-sitter named node, named node}).  For example, in a node
+that represents a string: @code{"text"}, there are three children
+nodes: the opening quote @code{"}, the string content @code{text}, and
+the enclosing quote @code{"}.  Among these nodes, the first child is
+the opening quote @code{"}, the first named child is the string
+content @code{text}.
+@end defun
+
+@defun treesit-node-children node &optional named
+This function returns all of @var{node}'s children in a list.  If
+@var{named} is non-nil, then it only retrieves named nodes
+(@pxref{tree-sitter named node, named node}).
+@end defun
+
+@defun treesit-next-sibling node &optional named
+This function finds the next sibling of @var{node}.  If @var{named} is
+non-nil, it finds the next named sibling (@pxref{tree-sitter named
+node, named node}).
+@end defun
+
+@defun treesit-prev-sibling node &optional named
+This function finds the previous sibling of @var{node}.  If
+@var{named} is non-nil, it finds the previous named sibling
+(@pxref{tree-sitter named node, named node}).
+@end defun
+
+@subheading By field name
+
+To make the syntax tree easier to analyze, many language definitions
+assign @dfn{field names} to child nodes (@pxref{tree-sitter node field
+name, field name}).  For example, a @code{function_definition} node
+could have a @code{declarator} and a @code{body}.
+
+@defun treesit-child-by-field-name node field-name
+This function finds the child of @var{node} that has @var{field-name}
+as its field name.
+
+@example
+@group
+;; Get the child that has "body" as its field name.
+(treesit-child-by-field-name node "body")
+    @c @result{} #<treesit-node from 3 to 11 in *scratch*>
+@end group
+@end example
+@end defun
+
+@subheading By position
+
+@defun treesit-first-child-for-pos node pos &optional named
+This function finds the first child of @var{node} that extends beyond
+@var{pos}.  ``Extend beyond'' means the end of the child node
+@code{>=} @var{pos}.  This function only looks for immediate children of
+@var{node}, and doesn't look in its grand children.  If @var{named} is
+non-nil, it only looks for named child (@pxref{tree-sitter named node,
+named node}).
+@end defun
+
+@defun treesit-node-descendant-for-range node beg end &optional named
+This function finds the @emph{smallest} (grand)child of @var{node}
+that spans the range from @var{beg} to @var{end}.  It is similar to
+@code{treesit-node-at}.  If @var{named} is non-nil, it only looks
+for named child (@pxref{tree-sitter named node, named node}).
+@end defun
+
+@heading More convenient functions
+
+@defun treesit-filter-child node pred &optional named
+This function finds children of @var{node} that satisfies @var{pred}.
+
+Function @var{pred} takes the child node as the argument and should
+return non-nil to indicated keeping the child.  If @var{named}
+non-nil, this function only searches for named nodes."
+@end defun
+
+@defun treesit-parent-until node pred
+This function repeatedly finds the parent of @var{node}, and returns
+the parent if it satisfies @var{pred} (which takes the parent as the
+argument).  If no parent satisfies @var{pred}, this function returns
+nil.
+@end defun
+
+@defun treesit-parent-while
+This function repeatedly finds the parent of @var{node}, and keeps
+doing so as long as the parent satisfies @var{pred} (which takes the
+parent as the single argument).  I.e., this function returns the
+farthest parent that still satisfies @var{pred}.
+@end defun
+
+@node Accessing Node
+@section Accessing Node Information
+
+Before going further, make sure you have read the basic conventions
+about tree-sitter nodes in the previous node.
+
+@heading Basic information
+
+Every node is associated with a parser, and that parser is associated
+with a buffer.  The following functions let you retrieve them.
+
+@defun treesit-node-parser node
+This function returns @var{node}'s associated parser.
+@end defun
+
+@defun treesit-node-buffer node
+This function returns @var{node}'s parser's associated buffer.
+@end defun
+
+@defun treesit-node-language node
+This function returns @var{node}'s parser's associated language.
+@end defun
+
+Each node represents a piece of text in the buffer.  Functions below
+finds relevant information about that text.
+
+@defun treesit-node-start node
+Return the start position of @var{node}.
+@end defun
+
+@defun treesit-node-end node
+Return the end position of @var{node}.
+@end defun
+
+@defun treesit-node-text node &optional object
+Returns the buffer text that @var{node} represents.  (If @var{node} is
+retrieved from parsing a string, it will be the text from that
+string.)
+@end defun
+
+Here are some basic checks on tree-sitter nodes.
+
+@defun treesit-node-p object
+Checks if @var{object} is a tree-sitter syntax node.
+@end defun
+
+@defun treesit-node-eq node1 node2
+Checks if @var{node1} and @var{node2} are the same node in a syntax
+tree.
+@end defun
+
+@heading Property information
+
+In general, nodes in a concrete syntax tree fall into two categories:
+@dfn{named nodes} and @dfn{anonymous nodes}.  Whether a node is named
+or anonymous is determined by the language definition
+(@pxref{tree-sitter named node, named node}).
+
+@cindex tree-sitter missing node
+Apart from being named/anonymous, a node can have other properties.  A
+node can be ``missing'': missing nodes are inserted by the parser in
+order to recover from certain kinds of syntax errors, i.e., something
+should probably be there according to the grammar, but not there.
+
+@cindex tree-sitter extra node
+A node can be ``extra'': extra nodes represent things like comments,
+which can appear anywhere in the text.
+
+@cindex tree-sitter node that has changes
+A node ``has changes'' if the buffer changed since when the node is
+retrieved.  In this case, the node's start and end position would be
+off and we better throw it away and retrieve a new one.
+
+@cindex tree-sitter node that has error
+A node ``has error'' if the text it spans contains a syntax error.  It
+can be the node itself has an error, or one of its (grand)children has
+an error.
+
+@defun treesit-node-check node property
+This function checks if @var{node} has @var{property}.  @var{property}
+can be @code{'named}, @code{'missing}, @code{'extra},
+@code{'has-changes}, or @code{'has-error}.
+@end defun
+
+Named nodes have ``types'' (@pxref{tree-sitter node type, node type}).
+For example, a named node can be a @code{string_literal} node, where
+@code{string_literal} is its type.
+
+@defun treesit-node-type node
+Return @var{node}'s type as a string.
+@end defun
+
+@heading Information as a child or parent
+
+@defun treesit-node-index node &optional named
+This function returns the index of @var{node} as a child node of its
+parent.  If @var{named} is non-nil, it only count named nodes
+(@pxref{tree-sitter named node, named node}).
+@end defun
+
+@defun treesit-node-field-name node
+A child of a parent node could have a field name (@pxref{tree-sitter
+node field name, field name}).  This function returns the field name
+of @var{node} as a child of its parent.
+@end defun
+
+@defun treesit-node-field-name-for-child node n
+This is a more primitive function that returns the field name of the
+@var{n}'th child of @var{node}.
+@end defun
+
+@defun treesit-child-count node &optional named
+This function finds the number of children of @var{node}.  If
+@var{named} is non-nil, it only counts named child (@pxref{tree-sitter
+named node, named node}).
+@end defun
+
+@node Pattern Matching
+@section Pattern Matching Tree-sitter Nodes
+
+Tree-sitter let us pattern match with a small declarative language.
+Pattern matching consists of two steps: first tree-sitter matches a
+@dfn{pattern} against nodes in the syntax tree, then it @dfn{captures}
+specific nodes in that pattern and returns the captured nodes.
+
+We describe first how to write the most basic query pattern and how to
+capture nodes in a pattern, then the pattern-match function, finally
+more advanced pattern syntax.
+
+@heading Basic query syntax
+
+@cindex Tree-sitter query syntax
+@cindex Tree-sitter query pattern
+A @dfn{query} consists of multiple @dfn{patterns}, each pattern is an
+s-expression that matches a certain node in the syntax node.  A
+pattern has the following shape:
+
+@example
+(@var{type} @var{child}...)
+@end example
+
+@noindent
+For example, a pattern that matches a @code{binary_expression} node that
+contains @code{number_literal} child nodes would look like
+
+@example
+(binary_expression (number_literal))
+@end example
+
+To @dfn{capture} a node in the query pattern above, append
+@code{@@capture-name} after the node pattern you want to capture.  For
+example,
+
+@example
+(binary_expression (number_literal) @@number-in-exp)
+@end example
+
+@noindent
+captures @code{number_literal} nodes that are inside a
+@code{binary_expression} node with capture name @code{number-in-exp}.
+
+We can capture the @code{binary_expression} node too, with capture
+name @code{biexp}:
+
+@example
+(binary_expression
+ (number_literal) @@number-in-exp) @@biexp
+@end example
+
+@heading Query function
+
+Now we can introduce the query functions.
+
+@defun treesit-query-capture node query &optional beg end
+This function matches patterns in @var{query} in @var{node}.
+Argument @var{query} can be a either string or a s-expression.  For
+now, we focus on the string syntax; s-expression syntax is described
+at the end of the section.
+
+The function returns all captured nodes in a list of
+@code{(@var{capture_name} . @var{node})}.  If @var{beg} and @var{end}
+are both non-nil, it only pattern matches nodes in that range.
+
+@vindex treesit-query-error
+This function raise a @var{treesit-query-error} if @var{query} is
+malformed.  The signal data contains a description of the specific
+error.
+@end defun
+
+@defun treesit-query-in source query &optional beg end
+This function matches patterns in @var{query} in @var{source}, and
+returns all captured nodes in a list of @code{(@var{capture_name}
+. @var{node})}.  If @var{beg} and @var{end} are both non-nil, it only
+pattern match nodes in that range.
+
+Argument @var{source} designates a node, it can be a language symbol,
+a parser, or simply a node.  If a language symbol, @var{source}
+represents the root node of the first parser for that language in the
+current buffer; if a parser, @var{source} represents the root node of
+that parser.
+
+This function also raises @var{treesit-query-error}.
+@end defun
+
+For example, suppose @var{node}'s content is @code{1 + 2}, and
+@var{query} is
+
+@example
+@group
+(setq query
+      "(binary_expression
+        (number_literal) @@number-in-exp) @@biexp")
+@end group
+@end example
+
+@noindent
+Querying that query would return
+
+@example
+@group
+(treesit-query-capture node query)
+    @result{} ((biexp . @var{<node for "1 + 2">})
+       (number-in-exp . @var{<node for "1">})
+       (number-in-exp . @var{<node for "2">}))
+@end group
+@end example
+
+As we mentioned earlier, a @var{query} could contain multiple
+patterns. For example, it could have two top-level patterns:
+
+@example
+@group
+(setq query
+      "(binary_expression) @@biexp
+       (number_literal)  @@number @@biexp")
+@end group
+@end example
+
+@defun treesit-query-string string query language
+This function parses @var{string} with @var{language}, pattern matches
+its root node with @var{query}, and returns the result.
+@end defun
+
+@heading More query syntax
+
+Besides node type and capture, tree-sitter's query syntax can express
+anonymous node, field name, wildcard, quantification, grouping,
+alternation, anchor, and predicate.
+
+@subheading Anonymous node
+
+An anonymous node is written verbatim, surrounded by quotes.  A
+pattern matching (and capturing) keyword @code{return} would be
+
+@example
+"return" @@keyword
+@end example
+
+@subheading Wild card
+
+In a query pattern, @samp{(_)} matches any named node, and @samp{_}
+matches any named and anonymous node.  For example, to capture any
+named child of a @code{binary_expression} node, the pattern would be
+
+@example
+(binary_expression (_) @@in_biexp)
+@end example
+
+@subheading Field name
+
+We can capture child nodes that has specific field names:
+
+@example
+@group
+(function_definition
+  declarator: (_) @@func-declarator
+  body: (_) @@func-body)
+@end group
+@end example
+
+We can also capture a node that doesn't have certain field, say, a
+@code{function_definition} without a @code{body} field.
+
+@example
+(function_definition !body) @@func-no-body
+@end example
+
+@subheading Quantify node
+
+Tree-sitter recognizes quantification operators @samp{*}, @samp{+} and
+@samp{?}.  Their meanings are the same as in regular expressions:
+@samp{*} matches the preceding pattern zero or more times, @samp{+}
+matches one or more times, and @samp{?} matches zero or one time.
+
+For example, this pattern matches @code{type_declaration} nodes
+that has @emph{zero or more} @code{long} keyword.
+
+@example
+(type_declaration "long"* @@long-in-type)
+@end example
+
+@noindent
+And this pattern matches a type declaration that has zero or one
+@code{long} keyword:
+
+@example
+(type_declaration "long"?) @@type-decl
+@end example
+
+@subheading Grouping
+
+Similar to groups in regular expression, we can bundle patterns into a
+group and apply quantification operators to it.  For example, to
+express a comma separated list of identifiers, one could write
+
+@example
+(identifier) ("," (identifier))*
+@end example
+
+@subheading Alternation
+
+Again, similar to regular expressions, we can express ``match anyone
+from this group of patterns'' in the query pattern.  The syntax is a
+list of patterns enclosed in square brackets.  For example, to capture
+some keywords in C, the query pattern would be
+
+@example
+@group
+[
+  "return"
+  "break"
+  "if"
+  "else"
+] @@keyword
+@end group
+@end example
+
+@subheading Anchor
+
+The anchor operator @samp{.} can be used to enforce juxtaposition,
+i.e., to enforce two things to be directly next to each other.  The
+two ``things'' can be two nodes, or a child and the end of its parent.
+For example, to capture the first child, the last child, or two
+adjacent children:
+
+@example
+@group
+;; Anchor the child with the end of its parent.
+(compound_expression (_) @@last-child .)
+
+;; Anchor the child with the beginning of its parent.
+(compound_expression . (_) @@first-child)
+
+;; Anchor two adjacent children.
+(compound_expression
+ (_) @@prev-child
+ .
+ (_) @@next-child)
+@end group
+@end example
+
+Note that the enforcement of juxtaposition ignores any anonymous
+nodes.
+
+@subheading Predicate
+
+We can add predicate constraints to a pattern.  For example, if we use
+the following query pattern
+
+@example
+@group
+(
+ (array . (_) @@first (_) @@last .)
+ (#equal @@first @@last)
+)
+@end group
+@end example
+
+Then tree-sitter only matches arrays where the first element equals to
+the last element.  To attach a predicate to a pattern, we need to
+group then together.  A predicate always starts with a @samp{#}.
+Currently there are two predicates, @code{#equal} and @code{#match}.
+
+@deffn Predicate equal arg1 arg2
+Matches if @var{arg1} equals to @var{arg2}.  Arguments can be either a
+string or a capture name.  Capture names represent the text that the
+captured node spans in the buffer.
+@end deffn
+
+@deffn Predicate match regexp capture-name
+Matches if the text that @var{capture-name}’s node spans in the buffer
+matches regular expression @var{regexp}.  Matching is case-sensitive.
+@end deffn
+
+Note that a predicate can only refer to capture names appeared in the
+same pattern.  Indeed, it makes little sense to refer to capture names
+in other patterns anyway.
+
+@heading S-expression patterns
+
+Besides strings, Emacs provides a s-expression based syntax for query
+patterns. It largely resembles the string-based syntax.  For example,
+the following pattern
+
+@example
+@group
+(treesit-query-capture
+ node "(addition_expression
+        left: (_) @@left
+        \"+\" @@plus-sign
+        right: (_) @@right) @@addition
+
+        [\"return\" \"break\"] @@keyword")
+@end group
+@end example
+
+@noindent
+is equivalent to
+
+@example
+@group
+(treesit-query-capture
+ node '((addition_expression
+         left: (_) @@left
+         "+" @@plus-sign
+         right: (_) @@right) @@addition
+
+         ["return" "break"] @@keyword))
+@end group
+@end example
+
+Most pattern syntax can be written directly as strange but
+never-the-less valid s-expressions.  Only a few of them needs
+modification:
+
+@itemize
+@item
+Anchor @samp{.} is written as @code{:anchor}.
+@item
+@samp{?} is written as @samp{:?}.
+@item
+@samp{*} is written as @samp{:*}.
+@item
+@samp{+} is written as @samp{:+}.
+@item
+@code{#equal} is written as @code{:equal}.  In general, predicates
+change their @samp{#} to @samp{:}.
+@end itemize
+
+For example,
+
+@example
+@group
+"(
+  (compound_expression . (_) @@first (_)* @@rest)
+  (#match \"love\" @@first)
+  )"
+@end group
+@end example
+
+is written in s-expression as
+
+@example
+@group
+'((
+   (compound_expression :anchor (_) @@first (_) :* @@rest)
+   (:match "love" @@first)
+   ))
+@end group
+@end example
+
+@defun treesit-expand-query query
+This function expands the s-expression @var{query} into a string
+query.  It is usually a good idea to expand the s-expression patterns
+into strings for font-lock queries since they are called repeatedly.
+@end defun
+
+Tree-sitter project's documentation about pattern-matching can be
+found at
+@uref{https://tree-sitter.github.io/tree-sitter/using-parsers#pattern-matching-with-queries}.
+
+@node Multiple Languages
+@section Parsing Text in Multiple Languages
+
+Sometimes, the source of a programming language could contain sources
+of other languages, HTML + CSS + JavaScript is one example.  In that
+case, we need to assign individual parsers to text segments written in
+different languages.  Traditionally this is achieved by using
+narrowing.  While tree-sitter works with narrowing (@pxref{tree-sitter
+narrowing, narrowing}), the recommended way is to set ranges in which
+a parser will operate.
+
+@defun treesit-parser-set-included-ranges parser ranges
+This function sets the range of @var{parser} to @var{ranges}.  Then
+@var{parser} will only read the text covered in each range.  Each
+range in @var{ranges} is a list of cons @code{(@var{beg}
+. @var{end})}.
+
+Each range in @var{ranges} must come in order and not overlap.  That
+is, in pseudo code:
+
+@example
+@group
+(cl-loop for idx from 1 to (1- (length ranges))
+         for prev = (nth (1- idx) ranges)
+         for next = (nth idx ranges)
+         should (<= (car prev) (cdr prev)
+                    (car next) (cdr next)))
+@end group
+@end example
+
+@vindex treesit-range-invalid
+If @var{ranges} violates this constraint, or something else went
+wrong, this function signals a @var{treesit-range-invalid}.  The
+signal data contains a specific error message and the ranges we are
+trying to set.
+
+This function can also be used for disabling ranges.  If @var{ranges}
+is nil, the parser is set to parse the whole buffer.
+
+Example:
+
+@example
+@group
+(treesit-parser-set-included-ranges
+ parser '((1 . 9) (16 . 24) (24 . 25)))
+@end group
+@end example
+@end defun
+
+@defun treesit-parser-included-ranges parser
+This function returns the ranges set for @var{parser}.  The return
+value is the same as the @var{ranges} argument of
+@code{treesit-parser-included-ranges}: a list of cons
+@code{(@var{beg} . @var{end})}.  And if @var{parser} doesn't have any
+ranges, the return value is nil.
+
+@example
+@group
+(treesit-parser-included-ranges parser)
+    @result{} ((1 . 9) (16 . 24) (24 . 25))
+@end group
+@end example
+@end defun
+
+@defun treesit-set-ranges parser-or-lang ranges
+Like @code{treesit-parser-set-included-ranges}, this function sets
+the ranges of @var{parser-or-lang} to @var{ranges}.  Conveniently,
+@var{parser-or-lang} could be either a parser or a language.  If it is
+a language, this function looks for the first parser in
+@var{treesit-parser-list} for that language in the current buffer,
+and set range for it.
+@end defun
+
+@defun treesit-get-ranges parser-or-lang
+This function returns the ranges of @var{parser-or-lang}, like
+@code{treesit-parser-included-ranges}.  And like
+@code{treesit-set-ranges}, @var{parser-or-lang} can be a parser or
+a language symbol.
+@end defun
+
+@defun treesit-query-range source pattern &optional beg end
+This function matches @var{source} with @var{pattern} and returns the
+ranges of captured nodes.  The return value has the same shape of
+other functions: a list of @code{(@var{beg} . @var{end})}.
+
+For convenience, @var{source} can be a language symbol, a parser, or a
+node.  If a language symbol, this function matches in the root node of
+the first parser using that language; if a parser, this function
+matches in the root node of that parser; if a node, this function
+matches in that node.
+
+Parameter @var{pattern} is the query pattern used to capture nodes
+(@pxref{Pattern Matching}). The capture names don't matter.  Parameter
+@var{beg} and @var{end}, if both non-nil, limits the range in which
+this function queries.
+
+Like other query functions, this function raises an
+@var{treesit-query-error} if @var{pattern} is malformed.
+@end defun
+
+@defun treesit-language-at point
+This function tries to figure out which language is responsible for
+the text at @var{point}.  It goes over each parser in
+@var{treesit-parser-list} and see if that parser's range covers
+@var{point}.
+@end defun
+
+@defvar treesit-range-functions
+A list of range functions.  Font-locking and indenting code uses
+functions in this alist to set correct ranges for a language parser
+before using it.
+
+The signature of each function should be
+
+@example
+(@var{start} @var{end} &rest @var{_})
+@end example
+
+where @var{start} and @var{end} marks the region that is about to be
+used.  A range function only need to (but not limited to) update
+ranges in that region.
+
+Each function in the list is called in-order.
+@end defvar
+
+@defun treesit-update-ranges &optional start end
+This function is used by font-lock and indent to update ranges before
+using any parser.  Each range function in
+@var{treesit-range-functions} is called in-order.  Arguments
+@var{start} and @var{end} are passed to each range function.
+@end defun
+
+@heading An example
+
+Normally, in a set of languages that can be mixed together, there is a
+major language and several embedded languages. The major language
+parses the whole document, and skips the embedded languages. Then the
+parser for the major language knows the ranges of the embedded
+languages. So we first parse the whole document with the major
+language’s parser, set ranges for the embedded languages, then parse
+the embedded languages.
+
+Suppose we want to parse a very simple document that mixes HTML, CSS
+and JavaScript:
+
+@example
+@group
+<html>
+  <script>1 + 2</script>
+  <style>body @{ color: "blue"; @}</style>
+</html>
+@end group
+@end example
+
+We first parse with HTML, then set ranges for CSS and JavaScript:
+
+@example
+@group
+;; Create parsers.
+(setq html (treesit-get-parser-create 'html))
+(setq css (treesit-get-parser-create 'css))
+(setq js (treesit-get-parser-create 'javascript))
+
+;; Set CSS ranges.
+(setq css-range
+      (treesit-query-range
+       'html
+       "(style_element (raw_text) @@capture)"))
+(treesit-parser-set-included-ranges css css-range)
+
+;; Set JavaScript ranges.
+(setq js-range
+      (treesit-query-range
+       'html
+       "(script_element (raw_text) @@capture)"))
+(treesit-parser-set-included-ranges js js-range)
+@end group
+@end example
+
+We use a query pattern @code{(style_element (raw_text) @@capture)} to
+find CSS nodes in the HTML parse tree. For how to write query
+patterns, @pxref{Pattern Matching}.
+
+@node Tree-sitter C API
+@section Tree-sitter C API Correspondence
+
+Emacs' tree-sitter integration doesn't expose every feature
+tree-sitter's C API provides.  Missing features include:
+
+@itemize
+@item
+Creating a tree cursor and navigating the syntax tree with it.
+@item
+Setting timeout and cancellation flag for a parser.
+@item
+Setting the logger for a parser.
+@item
+Printing a DOT graph of the syntax tree to a file.
+@item
+Coping and modifying a syntax tree.  (Emacs doesn't expose a tree
+object.)
+@item
+Using (row, column) coordinates as position.
+@item
+Updating a node with changes. (In Emacs, retrieve a new node instead
+of updating the existing one.)
+@item
+Querying statics of a language definition.
+@end itemize
+
+In addition, Emacs makes some changes to the C API to make the API more
+convenient and idiomatic:
+
+@itemize
+@item
+Instead of using byte positions, the ELisp API uses character
+positions.
+@item
+Null nodes are converted to nil.
+@end itemize
+
+Below is the correspondence between all C API functions and their
+ELisp counterparts.  Sometimes one ELisp function corresponds to
+multiple C functions, and many C functions don't have an ELisp
+counterpart.
+
+@example
+ts_parser_new                           treesit-parser-create
+ts_parser_delete
+ts_parser_set_language
+ts_parser_language                      treesit-parser-language
+ts_parser_set_included_ranges           treesit-parser-set-included-ranges
+ts_parser_included_ranges               treesit-parser-included-ranges
+ts_parser_parse
+ts_parser_parse_string                  treesit-parse-string
+ts_parser_parse_string_encoding
+ts_parser_reset
+ts_parser_set_timeout_micros
+ts_parser_timeout_micros
+ts_parser_set_cancellation_flag
+ts_parser_cancellation_flag
+ts_parser_set_logger
+ts_parser_logger
+ts_parser_print_dot_graphs
+ts_tree_copy
+ts_tree_delete
+ts_tree_root_node
+ts_tree_language
+ts_tree_edit
+ts_tree_get_changed_ranges
+ts_tree_print_dot_graph
+ts_node_type                            treesit-node-type
+ts_node_symbol
+ts_node_start_byte                      treesit-node-start
+ts_node_start_point
+ts_node_end_byte                        treesit-node-end
+ts_node_end_point
+ts_node_string                          treesit-node-string
+ts_node_is_null
+ts_node_is_named                        treesit-node-check
+ts_node_is_missing                      treesit-node-check
+ts_node_is_extra                        treesit-node-check
+ts_node_has_changes                     treesit-node-check
+ts_node_has_error                       treesit-node-check
+ts_node_parent                          treesit-node-parent
+ts_node_child                           treesit-node-child
+ts_node_field_name_for_child            treesit-node-field-name-for-child
+ts_node_child_count                     treesit-node-child-count
+ts_node_named_child                     treesit-node-child
+ts_node_named_child_count               treesit-node-child-count
+ts_node_child_by_field_name             treesit-node-by-field-name
+ts_node_child_by_field_id
+ts_node_next_sibling                    treesit-next-sibling
+ts_node_prev_sibling                    treesit-prev-sibling
+ts_node_next_named_sibling              treesit-next-sibling
+ts_node_prev_named_sibling              treesit-prev-sibling
+ts_node_first_child_for_byte            treesit-first-child-for-pos
+ts_node_first_named_child_for_byte      treesit-first-child-for-pos
+ts_node_descendant_for_byte_range       treesit-descendant-for-range
+ts_node_descendant_for_point_range
+ts_node_named_descendant_for_byte_range treesit-descendant-for-range
+ts_node_named_descendant_for_point_range
+ts_node_edit
+ts_node_eq                              treesit-node-eq
+ts_tree_cursor_new
+ts_tree_cursor_delete
+ts_tree_cursor_reset
+ts_tree_cursor_current_node
+ts_tree_cursor_current_field_name
+ts_tree_cursor_current_field_id
+ts_tree_cursor_goto_parent
+ts_tree_cursor_goto_next_sibling
+ts_tree_cursor_goto_first_child
+ts_tree_cursor_goto_first_child_for_byte
+ts_tree_cursor_goto_first_child_for_point
+ts_tree_cursor_copy
+ts_query_new
+ts_query_delete
+ts_query_pattern_count
+ts_query_capture_count
+ts_query_string_count
+ts_query_start_byte_for_pattern
+ts_query_predicates_for_pattern
+ts_query_step_is_definite
+ts_query_capture_name_for_id
+ts_query_string_value_for_id
+ts_query_disable_capture
+ts_query_disable_pattern
+ts_query_cursor_new
+ts_query_cursor_delete
+ts_query_cursor_exec                    treesit-query-capture
+ts_query_cursor_did_exceed_match_limit
+ts_query_cursor_match_limit
+ts_query_cursor_set_match_limit
+ts_query_cursor_set_byte_range
+ts_query_cursor_set_point_range
+ts_query_cursor_next_match
+ts_query_cursor_remove_match
+ts_query_cursor_next_capture
+ts_language_symbol_count
+ts_language_symbol_name
+ts_language_symbol_for_name
+ts_language_field_count
+ts_language_field_name_for_id
+ts_language_field_id_for_name
+ts_language_symbol_type
+ts_language_version
+@end example
diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el
index 6aa45526d8..b4be54bbd6 100644
--- a/lisp/emacs-lisp/cl-preloaded.el
+++ b/lisp/emacs-lisp/cl-preloaded.el
@@ -68,6 +68,8 @@ cl--typeof-types
     (font-spec atom) (font-entity atom) (font-object atom)
     (vector array sequence atom)
     (user-ptr atom)
+    (tree-sitter-parser atom)
+    (tree-sitter-node atom)
     ;; Plus, really hand made:
     (null symbol list sequence atom))
   "Alist of supertypes.
diff --git a/lisp/treesit.el b/lisp/treesit.el
new file mode 100644
index 0000000000..eaaa1316af
--- /dev/null
+++ b/lisp/treesit.el
@@ -0,0 +1,853 @@
+;;; treesit.el --- tree-sitter utilities -*- lexical-binding: t -*-
+
+;; Copyright (C) 2021 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; Note to self: we don't create parsers automatically in any provided
+;; functions.
+
+;;; Code:
+
+(eval-when-compile (require 'cl-lib))
+(require 'cl-seq)
+(require 'font-lock)
+
+;;; Activating tree-sitter
+
+(defgroup treesit
+  nil
+  "Tree-sitter is an incremental parser."
+  :group 'tools)
+
+(defcustom treesit-disabled-modes nil
+  "A list of major-modes for which tree-sitter support is disabled."
+  :type '(list symbol))
+
+(defcustom treesit-maximum-size (* 4 1024 1024)
+  "Maximum buffer size for enabling tree-sitter parsing."
+  :type 'integer)
+
+(defun treesit-available-p ()
+  "Return non-nil if tree-sitter features are available."
+  (fboundp 'treesit-parser-create))
+
+(defun treesit-should-enable-p (&optional mode)
+  "Return non-nil if MODE should activate tree-sitter support.
+MODE defaults to the value of `major-mode'.  The result depends
+on the value of `treesit-disabled-modes',
+`treesit-maximum-size', and of course, whether tree-sitter is
+available on the system at all."
+  (let* ((mode (or mode major-mode))
+         (disabled (cl-loop
+                    for disabled-mode in treesit-disabled-modes
+                    if (provided-mode-derived-p mode disabled-mode)
+                    return t
+                    finally return nil)))
+    (and (treesit-available-p)
+         (not disabled)
+         (< (buffer-size) treesit-maximum-size))))
+
+;;; Parser API supplement
+
+(defun treesit-get-parser (language)
+  "Find the first parser using LANGUAGE in `treesit-parser-list'."
+  (catch 'found
+    (dolist (parser treesit-parser-list)
+      (when (eq language (treesit-parser-language parser))
+        (throw 'found parser)))))
+
+(defun treesit-get-parser-create (language)
+  "Find the first parser using LANGUAGE in `treesit-parser-list'.
+If none exists, create one and return it."
+  (or (treesit-get-parser language)
+      (treesit-parser-create
+       (current-buffer) language)))
+
+(defun treesit-parse-string (string language)
+  "Parse STRING using a parser for LANGUAGE.
+Return the root node of the syntax tree."
+  (with-temp-buffer
+    (insert string)
+    (treesit-parser-root-node
+     (treesit-parser-create (current-buffer) language))))
+
+(defun treesit-language-at (point)
+  "Return the language used at POINT."
+  (cl-loop for parser in treesit-parser-list
+           if (treesit-node-at point nil parser)
+           return (treesit-parser-language parser)))
+
+(defun treesit-set-ranges (parser-or-lang ranges)
+  "Set the ranges of PARSER-OR-LANG to RANGES."
+  (treesit-parser-set-included-ranges
+   (cond ((symbolp parser-or-lang)
+          (or (treesit-get-parser parser-or-lang)
+              (error "Cannot find a parser for %s" parser-or-lang)))
+         ((treesit-parser-p parser-or-lang)
+          parser-or-lang)
+         (t (error "Expecting a parser or language, but got %s"
+                   parser-or-lang)))
+   ranges))
+
+(defun treesit-get-ranges (parser-or-lang)
+  "Get the ranges of PARSER-OR-LANG."
+  (treesit-parser-included-ranges
+   (cond ((symbolp parser-or-lang)
+          (or (treesit-get-parser parser-or-lang)
+              (error "Cannot find a parser for %s" parser-or-lang)))
+         ((treesit-parser-p parser-or-lang)
+          parser-or-lang)
+         (t (error "Expecting a parser or language, but got %s"
+                   parser-or-lang)))))
+
+;;; Node API supplement
+
+(defun treesit-node-buffer (node)
+  "Return the buffer in where NODE belongs."
+  (treesit-parser-buffer
+   (treesit-node-parser node)))
+
+(defun treesit-node-language (node)
+  "Return the language symbol that NODE's parser uses."
+  (treesit-parser-language
+   (treesit-node-parser node)))
+
+(defun treesit-node-at (beg &optional end parser-or-lang named)
+  "Return the smallest node covering BEG to END.
+
+If omitted, END defaults to BEG.  Return nil if none find.  If
+NAMED non-nil, only look for named node.  NAMED defaults to nil.
+
+If PARSER-OR-LANG is nil, use the first parser in
+`treesit-parser-list'; if PARSER-OR-LANG is a parser, use
+that parser; if PARSER-OR-LANG is a language, find a parser using
+that language in the current buffer, and use that."
+  (let ((root (if (treesit-parser-p parser-or-lang)
+                  (treesit-parser-root-node parser-or-lang)
+                (treesit-buffer-root-node parser-or-lang))))
+    (treesit-node-descendant-for-range root beg (or end beg) named)))
+
+(defun treesit-buffer-root-node (&optional language)
+  "Return the root node of the current buffer.
+Use the first parser in `treesit-parser-list', if LANGUAGE is
+non-nil, use the first parser for LANGUAGE."
+  (if-let ((parser
+            (or (if language
+                    (or (treesit-get-parser language)
+                        (error "Cannot find a parser for %s" language))
+                  (or (car treesit-parser-list)
+                      (error "Buffer has no parser"))))))
+      (treesit-parser-root-node parser)))
+
+(defun treesit-filter-child (node pred &optional named)
+  "Return children of NODE that satisfies PRED.
+PRED is a function that takes one argument, the child node.  If
+NAMED non-nil, only search for named node."
+  (let ((child (treesit-node-child node 0 named))
+        result)
+    (while child
+      (when (funcall pred child)
+        (push child result))
+      (setq child (treesit-node-next-sibling child named)))
+    (reverse result)))
+
+(defun treesit-node-text (node &optional no-property)
+  "Return the buffer (or string) content corresponding to NODE.
+If NO-PROPERTY is non-nil, remove text properties."
+  (with-current-buffer (treesit-node-buffer node)
+    (if no-property
+        (buffer-substring-no-properties
+         (treesit-node-start node)
+         (treesit-node-end node))
+      (buffer-substring
+       (treesit-node-start node)
+       (treesit-node-end node)))))
+
+(defun treesit-parent-until (node pred)
+  "Return the closest parent of NODE that satisfies PRED.
+Return nil if none found.  PRED should be a function that takes
+one argument, the parent node."
+  (let ((node (treesit-node-parent node)))
+    (while (and node (not (funcall pred node)))
+      (setq node (treesit-node-parent node)))
+    node))
+
+(defun treesit-parent-while (node pred)
+  "Return the furthest parent of NODE that satisfies PRED.
+Return nil if none found.  PRED should be a function that takes
+one argument, the parent node."
+  (let ((last nil))
+    (while (and node (funcall pred node))
+      (setq last node
+            node (treesit-node-parent node)))
+    last))
+
+(defun treesit-node-children (node &optional named)
+  "Return a list of NODE's children.
+If NAMED is non-nil, collect named child only."
+  (mapcar (lambda (idx)
+            (treesit-node-child node idx named))
+          (number-sequence
+           0 (1- (treesit-node-child-count node named)))))
+
+(defun treesit-node-index (node &optional named)
+  "Return the index of NODE in its parent.
+If NAMED is non-nil, count named child only."
+  (let ((count 0))
+    (while (setq node (treesit-node-prev-sibling node named))
+      (cl-incf count))
+    count))
+
+(defun treesit-node-field-name (node)
+  "Return the field name of NODE as a child of its parent."
+  (when-let ((parent (treesit-node-parent node))
+             (idx (treesit-node-index node)))
+    (treesit-node-field-name-for-child parent idx)))
+
+;;; Query API supplement
+
+(defun treesit-query-in (source query &optional beg end)
+  "Query the current buffer with QUERY.
+
+SOURCE can be a language symbol, a parser, or a node.  If a
+language symbol, use the root node of the first parser for that
+language; if a parser, use the root node of that parser; if a
+node, use that node.
+
+QUERY is either a string query or a sexp query.  See Info node
+`(elisp)Pattern Matching' for how to write a query pattern in either
+string or s-expression form.
+
+BEG and END, if _both_ non-nil, specifies the range in which the query
+is executed.
+
+Raise an treesit-query-error if QUERY is malformed."
+  (treesit-query-capture
+   (cond ((symbolp source) (treesit-buffer-root-node source))
+         ((treesit-parser-p source)
+          (treesit-parser-root-node source))
+         ((treesit-node-p source) source))
+   query
+   beg end))
+
+(defun treesit-query-string (string query language)
+  "Query STRING with QUERY in LANGUAGE.
+See `treesit-query-capture' for QUERY."
+  (with-temp-buffer
+    (insert string)
+    (let ((parser (treesit-parser-create (current-buffer) language)))
+      (treesit-query-capture
+       (treesit-parser-root-node parser)
+       query))))
+
+(defun treesit-query-range (source query &optional beg end)
+  "Query the current buffer and return ranges of captured nodes.
+
+QUERY, SOURCE, BEG, END are the same as in
+`treesit-query-in'.  This function returns a list
+of (START . END), where START and END specifics the range of each
+captured node.  Capture names don't matter."
+  (cl-loop for capture
+           in (treesit-query-in source query beg end)
+           for node = (cdr capture)
+           collect (cons (treesit-node-start node)
+                         (treesit-node-end node))))
+
+;;; Range API supplement
+
+(defvar-local treesit-range-functions nil
+  "A list of range functions.
+Font-locking and indenting code uses functions in this alist to
+set correct ranges for a language parser before using it.
+
+The signature of each function should be
+
+    (start end &rest _)
+
+where START and END marks the region that is about to be used.  A
+range function only need to (but not limited to) update ranges in
+that region.
+
+Each function in the list is called in-order.")
+
+(defun treesit-update-ranges (&optional start end)
+  "Update the ranges for each language in the current buffer.
+Calls each range functions in `treesit-range-functions'
+in-order.  START and END are passed to each range function."
+  (dolist (range-fn treesit-range-functions)
+    (funcall range-fn (or start (point-min)) (or end (point-max)))))
+
+;;; Font-lock
+
+(defvar-local treesit-font-lock-settings nil
+  "A list of SETTINGs for treesit-based fontification.
+
+Each SETTING should look like
+
+    (LANGUAGE QUERY)
+
+Each SETTING controls one parser (often of different language).
+LANGUAGE is the language symbol.  See Info node `(elisp)Language
+Definitions'.
+
+QUERY is either a string query or a sexp query.
+See Info node `(elisp)Pattern Matching' for writing queries.
+
+Capture names in QUERY should be face names like
+`font-lock-keyword-face'.  The captured node will be fontified
+with that face.  Capture names can also be function names, in
+which case the function is called with (START END NODE), where
+START and END are the start and end position of the node in
+buffer, and NODE is the tree-sitter node object.  If a capture
+name is both a face and a function, face takes priority.
+
+Generally, major modes should set
+`treesit-font-lock-defaults', and let Emacs automatically
+populate this variable.")
+
+(defvar-local treesit-font-lock-defaults nil
+  "Defaults for tree-sitter Font Lock specified by the major mode.
+
+This variable should be a list of
+
+    (DEFAULT :KEYWORD VALUE...)
+
+A DEFAULT may be a symbol or a list of symbols (specifying
+different levels of fontification).  The symbol(s) can be of a
+variable or a function.  If a symbol is both a variable and a
+function, it is used as a function.  Different levels of
+fontification can be controlled by
+`font-lock-maximum-decoration'.
+
+The symbol(s) in DEFAULT should contain or return a SETTING as
+explained in `treesit-font-lock-settings', which looks like
+
+    (LANGUAGE QUERY)
+
+KEYWORD and VALUE are additional settings could be used to alter
+fontification behavior.  Currently there aren't any.
+
+Multi-language major-modes should provide a range function for
+eacn language it supports in `treesit-range-functions', and
+Emacs will set the ranges accordingly before fontifing a region.
+See Info node `(elisp)Multiple Languages' for what does it mean
+to set ranges for a parser.")
+
+(defun treesit-font-lock-fontify-region (start end &optional loudly)
+  "Fontify the region between START and END.
+If LOUDLY is non-nil, message some debugging information."
+  (treesit-update-ranges start end)
+  (font-lock-unfontify-region start end)
+  (dolist (setting treesit-font-lock-settings)
+    (when-let* ((language (nth 0 setting))
+                (match-pattern (nth 1 setting))
+                (parser (treesit-get-parser-create language)))
+      (when-let ((node (treesit-node-at start end parser)))
+        (let ((captures (treesit-query-capture
+                         node match-pattern
+                         ;; Specifying the range is important. More
+                         ;; often than not, NODE will be the root
+                         ;; node, and if we don't specify the range,
+                         ;; we are basically querying the whole file.
+                         start end)))
+          (with-silent-modifications
+            (dolist (capture captures)
+              (let* ((face (car capture))
+                     (node (cdr capture))
+                     (start (treesit-node-start node))
+                     (end (treesit-node-end node)))
+                (cond ((facep face)
+                       (put-text-property start end 'face face))
+                      ((functionp face)
+                       (funcall face start end node))
+                      (t (error "Capture name %s is neither a face nor a function" face)))
+                (when loudly
+                  (message "Fontifying text from %d to %d, Face: %s Language: %s"
+                           start end face language)))))))))
+  ;; Call regexp font-lock after tree-sitter, as it is usually used
+  ;; for custom fontification.
+  (let ((font-lock-unfontify-region-function #'ignore))
+    (funcall #'font-lock-default-fontify-region start end loudly)))
+
+(defun treesit-font-lock-enable ()
+  "Enable tree-sitter font-locking for the current buffer."
+  (let ((default (car treesit-font-lock-defaults))
+        (attributes (cdr treesit-font-lock-defaults)))
+    (ignore attributes)
+    (setq-local treesit-font-lock-settings
+                (font-lock-eval-keywords
+                 (font-lock-choose-keywords
+                  default
+	          (font-lock-value-in-major-mode
+                   font-lock-maximum-decoration)))))
+  (setq-local font-lock-fontify-region-function
+              #'treesit-font-lock-fontify-region)
+  ;; If we don't set `font-lock-defaults' to some non-nil value,
+  ;; font-lock doesn't enable properly (the font-lock-mode-internal
+  ;; doesn't run).  See `font-lock-add-keywords'.
+  (when (and font-lock-mode
+             (null font-lock-keywords)
+             (null font-lock-defaults))
+    (font-lock-mode -1)
+    (setq-local font-lock-defaults '(nil t))
+    (font-lock-mode 1)))
+
+;;; Indent
+
+(defvar treesit--indent-verbose nil
+  "If non-nil, log progress when indenting.")
+
+;; This is not bound locally like we normally do with major-mode
+;; stuff, because for tree-sitter, a buffer could contain more than
+;; one language.
+(defvar treesit-simple-indent-rules nil
+  "A list of indent rule settings.
+Each indent rule setting should be (LANGUAGE . RULES),
+where LANGUAGE is a language symbol, and RULES is a list of
+
+    (MATCHER ANCHOR OFFSET).
+
+MATCHER determines whether this rule applies, ANCHOR and OFFSET
+together determines which column to indent to.
+
+A MATCHER is a function that takes three arguments (NODE PARENT
+BOL).  BOL is the point where we are indenting: the beginning of
+line content, the position of the first non-whitespace character.
+NODE is the largest (highest-in-tree) node starting at that
+point.  PARENT is the parent of NODE.
+
+If MATCHER returns non-nil, meaning the rule matches, Emacs then
+uses ANCHOR to find an anchor, it should be a function that takes
+the same argument (NODE PARENT BOL) and returns a point.
+
+Finally Emacs computes the column of that point returned by ANCHOR
+and adds OFFSET to it, and indents to that column.
+
+For MATCHER and ANCHOR, Emacs provides some convenient presets.
+See `treesit-simple-indent-presets'.")
+
+(defvar treesit-simple-indent-presets
+  '((match . (lambda
+               (&optional node-type parent-type node-field
+                          node-index-min node-index-max)
+               `(lambda (node parent bol &rest _)
+                  (and (or (null ,node-type)
+                           (equal (treesit-node-type node)
+                                  ,node-type))
+                       (or (null ,parent-type)
+                           (equal (treesit-node-type parent)
+                                  ,parent-type))
+                       (or (null ,node-field)
+                           (equal (treesit-node-field-name node)
+                                  ,node-field))
+                       (or (null ,node-index-min)
+                           (>= (treesit-node-index node t)
+                               ,node-index-min))
+                       (or (null ,node-index-max)
+                           (<= (treesit-node-index node t)
+                               ,node-index-max))))))
+    (no-node . (lambda (node parent bol &rest _) (null node)))
+    (parent-is . (lambda (type)
+                   `(lambda (node parent bol &rest _)
+                      (equal ,type (treesit-node-type parent)))))
+
+    (node-is . (lambda (type)
+                 `(lambda (node parent bol &rest _)
+                    (equal ,type (treesit-node-type node)))))
+
+    (query . (lambda (pattern)
+               `(lambda (node parent bol &rest _)
+                  (cl-loop for capture
+                           in (treesit-query-capture
+                               parent ,pattern)
+                           if (treesit-node-eq node (cdr capture))
+                           return t
+                           finally return nil))))
+    (first-sibling . (lambda (node parent bol &rest _)
+                       (treesit-node-start
+                        (treesit-node-child parent 0 t))))
+
+    (parent . (lambda (node parent bol &rest _)
+                (treesit-node-start parent)))
+    (parent-bol . (lambda (node parent bol &rest _)
+                    (save-excursion
+                      (goto-char (treesit-node-start parent))
+                      (back-to-indentation)
+                      (point))))
+    (prev-sibling . (lambda (node parent bol &rest _)
+                      (treesit-node-start
+                       (treesit-node-prev-sibling node))))
+    (no-indent . (lambda (node parent bol &rest _) bol))
+    (prev-line . (lambda (node parent bol &rest _)
+                   (save-excursion
+                     (goto-char bol)
+                     (forward-line -1)
+                     (skip-chars-forward " \t")
+                     (treesit-node-start
+                      (treesit-node-at (point) nil nil t))))))
+  "A list of presets.
+These presets that can be used as MATHER and ANCHOR in
+`treesit-simple-indent-rules'.
+
+MATCHER:
+
+\(match NODE-TYPE PARENT-TYPE NODE-FIELD NODE-INDEX-MIN NODE-INDEX-MAX)
+
+    NODE-TYPE checks for node's type, PARENT-TYPE checks for
+    parent's type, NODE-FIELD checks for the filed name of node
+    in the parent, NODE-INDEX-MIN and NODE-INDEX-MAX checks for
+    the node's index in the parent.  Therefore, to match the
+    first child where parent is \"argument_list\", use
+
+        (match nil \"argument_list\" nil nil 0 0).
+
+no-node
+
+    Matches the case where node is nil, i.e., there is no node
+    that starts at point.  This is the case when indenting an
+    empty line.
+
+\(parent-is TYPE)
+
+    Check that the parent has type TYPE.
+
+\(node-is TYPE)
+
+    Checks that the node has type TYPE.
+
+\(query QUERY)
+
+    Queries the parent node with QUERY, and checks if the node
+    is captured (by any capture name).
+
+ANCHOR:
+
+first-sibling
+
+    Find the first child of the parent.
+
+parent
+
+    Find the parent.
+
+parent-bol
+
+    Find the beginning of non-space characters on the line where
+    the parent is on.
+
+prev-sibling
+
+    Find node's previous sibling.
+
+no-indent
+
+    Do nothing.
+
+prev-line
+
+    Find the named node on the previous line.  This can be used when
+    indenting an empty line: just indent like the previous node.")
+
+(defun treesit--simple-apply (fn args)
+  "Apply ARGS to FN.
+
+If FN is a key in `treesit-simple-indent-presets', use the
+corresponding value as the function."
+  ;; We don't want to match uncompiled lambdas, so make sure this cons
+  ;; is not a function.  We could move the condition functionp
+  ;; forward, but better be explicit.
+  (cond ((and (consp fn) (not (functionp fn)))
+         (apply (treesit--simple-apply (car fn) (cdr fn))
+                ;; We don't evaluate ARGS with `simple-apply', i.e.,
+                ;; no composing, better keep it simple.
+                args))
+        ((and (symbolp fn)
+              (alist-get fn treesit-simple-indent-presets))
+         (apply (alist-get fn treesit-simple-indent-presets)
+                args))
+        ((functionp fn) (apply fn args))
+        (t (error "Couldn't find the function corresponding to %s" fn))))
+
+;; This variable might seem unnecessary: why split
+;; `treesit-indent' and `treesit-simple-indent' into two
+;; functions?  We add this variable in between because later we might
+;; add more powerful indentation engines, and that new engine can
+;; probably share `treesit-indent'.  It is also useful, suggested
+;; by Stefan M, to have a function that figures out how much to indent
+;; but doesn't actually performs the indentation, because we might
+;; want to know where will a node indent to if we put it at some other
+;; location, and use that information to calculate the actual
+;; indentation.  And `treesit-simple-indent' is that function.  I
+;; forgot the example Stefan gave, but it makes a lot of sense.
+(defvar treesit-indent-function #'treesit-simple-indent
+  "Function used by `treesit-indent' to do some of the work.
+
+This function is called with
+
+    (NODE PARENT BOL &rest _)
+
+and returns
+
+    (ANCHOR . OFFSET).
+
+BOL is the position of the beginning of the line; NODE is the
+\"largest\" node that starts at BOL; PARENT is its parent; ANCHOR
+is a point (not a node), and OFFSET is a number.  Emacs finds the
+column of ANCHOR and adds OFFSET to it as the final indentation
+of the current line.")
+
+(defun treesit-indent ()
+  "Indent according to the result of `treesit-indent-function'."
+  (treesit-update-ranges)
+  (let* ((orig-pos (point))
+         (bol (save-excursion
+                (forward-line 0)
+                (skip-chars-forward " \t")
+                (point)))
+         (smallest-node
+          (cl-loop for parser in treesit-parser-list
+                   for node = (treesit-node-at
+                               bol nil parser)
+                   if node return node))
+         (node (treesit-parent-while
+                smallest-node
+                (lambda (node)
+                  (eq bol (treesit-node-start node))))))
+    (pcase-let*
+        ((parser (if smallest-node
+                     (treesit-node-parser smallest-node)
+                   nil))
+         ;; NODE would be nil if BOL is on a whitespace.  In that case
+         ;; we set PARENT to the "node at point", which would
+         ;; encompass the whitespace.
+         (parent (cond ((and node parser)
+                        (treesit-node-parent node))
+                       (parser
+                        (treesit-node-at bol nil parser))
+                       (t nil)))
+         (`(,anchor . ,offset)
+          (funcall treesit-indent-function node parent bol)))
+      (if (null anchor)
+          (when treesit--indent-verbose
+            (message "Failed to find the anchor"))
+        (let ((col (+ (save-excursion
+                        (goto-char anchor)
+                        (current-column))
+                      offset)))
+          (if (< bol orig-pos)
+              (save-excursion
+                (indent-line-to col))
+            (indent-line-to col)))))))
+
+(defun treesit-simple-indent (node parent bol)
+  "Calculate indentation according to `treesit-simple-indent-rules'.
+
+BOL is the position of the first non-whitespace character on the
+current line.  NODE is the largest node that starts at BOL,
+PARENT is NODE's parent.
+
+Return (ANCHOR . OFFSET) where ANCHOR is a node, OFFSET is the
+indentation offset, meaning indent to align with ANCHOR and add
+OFFSET."
+  (if (null parent)
+      (when treesit--indent-verbose
+        (message "PARENT is nil, not indenting"))
+    (let* ((language (treesit-node-language parent))
+           (rules (alist-get language
+                             treesit-simple-indent-rules)))
+      (cl-loop for rule in rules
+               for pred = (nth 0 rule)
+               for anchor = (nth 1 rule)
+               for offset = (nth 2 rule)
+               if (treesit--simple-apply
+                   pred (list node parent bol))
+               do (when treesit--indent-verbose
+                    (message "Matched rule: %S" rule))
+               and
+               return (cons (treesit--simple-apply
+                             anchor (list node parent bol))
+                            offset)))))
+
+(defun treesit-check-indent (mode)
+  "Check current buffer's indentation against a major mode MODE.
+
+Pop up a diff buffer showing the difference.  Correct
+indentation (target) is in green, current indentation is in red."
+  (interactive "CTarget major mode: ")
+  (let ((source-buf (current-buffer)))
+    (with-temp-buffer
+      (insert-buffer-substring source-buf)
+      (funcall mode)
+      (indent-region (point-min) (point-max))
+      (diff-buffers source-buf (current-buffer)))))
+
+;;; Debugging
+
+(defvar-local treesit--inspect-name nil
+  "treesit-inspect-mode uses this to show node name in mode-line.")
+
+(defun treesit-inspect-node-at-point (&optional arg)
+  "Show information of the node at point.
+If called interactively, show in echo area, otherwise set
+`treesit--inspect-name' (which will appear in the mode-line
+if `treesit-inspect-mode' is enabled).  Uses the first parser
+in `treesit-parser-list'."
+  (interactive "p")
+  ;; NODE-LIST contains all the node that starts at point.
+  (let* ((node-list
+          (cl-loop for node = (treesit-node-at (point))
+                   then (treesit-node-parent node)
+                   while node
+                   if (eq (treesit-node-start node)
+                          (point))
+                   collect node))
+         (largest-node (car (last node-list)))
+         (parent (treesit-node-parent largest-node))
+         ;; node-list-acending contains all the node bottom-up, then
+         ;; the parent.
+         (node-list-acending
+          (if (null largest-node)
+              ;; If there are no nodes that start at point, just show
+              ;; the node at point and its parent.
+              (list (treesit-node-at (point))
+                    (treesit-node-parent
+                     (treesit-node-at (point))))
+            (append node-list (list parent))))
+         (name ""))
+    ;; We draw nodes like (parent field-name: (node)) recursively,
+    ;; so it could be (node1 field-name: (node2 field-name: (node3))).
+    (dolist (node node-list-acending)
+      (setq
+       name
+       (concat
+        (if (treesit-node-field-name node)
+            (format " %s: " (treesit-node-field-name node))
+          " ")
+        (if (treesit-node-check node 'named) "(" "\"")
+        (or (treesit-node-type node)
+            "N/A")
+        name
+        (if (treesit-node-check node 'named) ")" "\""))))
+    (setq treesit--inspect-name name)
+    (force-mode-line-update)
+    (when arg
+      (if node-list
+          (message "%s" treesit--inspect-name)
+        (message "No node at point")))))
+
+(define-minor-mode treesit-inspect-mode
+  "Shows the node that _starts_ at point in the mode-line.
+
+The mode-line displays
+
+    PARENT FIELD-NAME: (CHILD (GRAND-CHILD (...)))
+
+CHILD, GRAND-CHILD, and GRAND-GRAND-CHILD, etc, are nodes that
+have their beginning at point.  And PARENT is the parent of
+CHILD.
+
+If no node starts at point, i.e., point is in the middle of a
+node, then we just display the smallest node that spans point and
+its immediate parent.
+
+This minor mode doesn't create parsers on its own.  It simply
+uses the first parser in `treesit-parser-list'."
+  :lighter nil
+  (if treesit-inspect-mode
+      (progn
+        (add-hook 'post-command-hook
+                  #'treesit-inspect-node-at-point 0 t)
+        (add-to-list 'mode-line-misc-info
+                     '(:eval treesit--inspect-name)))
+    (remove-hook 'post-command-hook
+                 #'treesit-inspect-node-at-point t)
+    (setq mode-line-misc-info
+          (remove '(:eval treesit--inspect-name)
+                  mode-line-misc-info))))
+
+(defun treesit-check-query (query language)
+  "Check if QUERY is valid for LANGUAGE.
+If QUERY is invalid, display the query in a popup buffer, jumps
+to the offending pattern and highlight the pattern."
+  (let ((buf (get-buffer-create "*tree-sitter check query*")))
+    (with-temp-buffer
+      (treesit-get-parser-create language)
+      (condition-case err
+          (progn (treesit-query-in language query)
+                 (message "QUERY is valid"))
+        (treesit-query-error
+         (with-current-buffer buf
+           (let* ((data (cdr err))
+                  (message (nth 0 data))
+                  (start (nth 1 data)))
+             (erase-buffer)
+             (insert query)
+             (goto-char start)
+             (search-forward " " nil t)
+             (put-text-property start (point) 'face 'error)
+             (message "%s" (buffer-substring start (point)))
+             (goto-char (point-min))
+             (insert (format "%s: %d\n" message start))
+             (forward-char start)))
+         (pop-to-buffer buf))))))
+
+;;; Etc
+
+(declare-function find-library-name "find-func.el")
+(defun treesit--check-manual-covarage ()
+  "Print tree-sitter functions missing from the manual in message buffer."
+  (interactive)
+  (require 'find-func)
+  (let ((functions-in-source
+         (with-temp-buffer
+           (insert-file-contents (find-library-name "tree-sitter"))
+           (cl-remove-if
+            (lambda (name) (string-match "treesit--" name))
+            (cl-sort
+             (save-excursion
+               (goto-char (point-min))
+               (cl-loop while (re-search-forward
+                               "^(defun \\([^ ]+\\)" nil t)
+                        collect (match-string-no-properties 1)))
+             #'string<))))
+        (functions-in-manual
+         (with-temp-buffer
+           (insert-file-contents (expand-file-name
+                                  "doc/lispref/parsing.texi"
+                                  source-directory))
+           (insert-file-contents (expand-file-name
+                                  "doc/lispref/modes.texi"
+                                  source-directory))
+           (cl-sort
+            (save-excursion
+              (goto-char (point-min))
+              (cl-loop while (re-search-forward
+                              "^@defun \\([^ ]+\\)" nil t)
+                       collect (match-string-no-properties 1)))
+            #'string<))))
+    (message "Missing: %s"
+             (string-join
+              (cl-remove-if
+               (lambda (name) (member name functions-in-manual))
+               functions-in-source)
+              "\n"))))
+
+(provide 'treesit)
+
+;;; treesit.el ends here
diff --git a/src/Makefile.in b/src/Makefile.in
index 2b7c4bb316..6ae55b19e1 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -337,6 +337,10 @@ JSON_LIBS =
 JSON_CFLAGS = @JSON_CFLAGS@
 JSON_OBJ = @JSON_OBJ@
 
+TREE_SITTER_LIBS = @TREE_SITTER_LIBS@
+TREE_SITTER_FLAGS = @TREE_SITTER_FLAGS@
+TREE_SITTER_OBJ = @TREE_SITTER_OBJ@
+
 INTERVALS_H = dispextern.h intervals.h composite.h
 
 GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -400,7 +404,7 @@ EMACS_CFLAGS=
   $(XINPUT_CFLAGS) $(WEBP_CFLAGS) $(WEBKIT_CFLAGS) $(LCMS2_CFLAGS) \
   $(SETTINGS_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \
   $(HARFBUZZ_CFLAGS) $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) \
-  $(LIBSYSTEMD_CFLAGS) $(JSON_CFLAGS) $(XSYNC_CFLAGS) \
+  $(LIBSYSTEMD_CFLAGS) $(JSON_CFLAGS) $(XSYNC_CFLAGS) $(TREE_SITTER_CFLAGS) \
   $(LIBGNUTLS_CFLAGS) $(NOTIFY_CFLAGS) $(CAIRO_CFLAGS) \
   $(WERROR_CFLAGS) $(HAIKU_CFLAGS)
 ALL_CFLAGS = $(EMACS_CFLAGS) $(WARN_CFLAGS) $(CFLAGS)
@@ -439,7 +443,7 @@ base_obj =
 	$(if $(HYBRID_MALLOC),sheap.o) \
 	$(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \
 	$(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ) $(JSON_OBJ) \
-	$(HAIKU_OBJ) $(PGTK_OBJ)
+	$(TREE_SITTER_OBJ) $(HAIKU_OBJ) $(PGTK_OBJ)
 doc_obj = $(base_obj) $(NS_OBJC_OBJ)
 obj = $(doc_obj) $(HAIKU_CXX_OBJ)
 
@@ -559,7 +563,7 @@ LIBES =
    $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(GETADDRINFO_A_LIBS) $(LCMS2_LIBS) \
    $(NOTIFY_LIBS) $(LIB_MATH) $(LIBZ) $(LIBMODULES) $(LIBSYSTEMD_LIBS) \
    $(JSON_LIBS) $(LIBGMP) $(LIBGCCJIT_LIBS) $(XINPUT_LIBS) $(HAIKU_LIBS) \
-   $(SQLITE3_LIBS)
+   $(TREE_SITTER_LIBS) $(SQLITE3_LIBS)
 
 ## FORCE it so that admin/unidata can decide whether this file is
 ## up-to-date.  Although since charprop depends on bootstrap-emacs,
diff --git a/src/alloc.c b/src/alloc.c
index 9ed94dc8a1..e7603fac37 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -50,6 +50,10 @@ Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2022 Free Software
 #include TERM_HEADER
 #endif /* HAVE_WINDOW_SYSTEM */
 
+#ifdef HAVE_TREE_SITTER
+#include "treesit.h"
+#endif
+
 #include <flexmember.h>
 #include <verify.h>
 #include <execinfo.h>           /* For backtrace.  */
@@ -3177,6 +3181,15 @@ cleanup_vector (struct Lisp_Vector *vector)
       if (uptr->finalizer)
 	uptr->finalizer (uptr->p);
     }
+#ifdef HAVE_TREE_SITTER
+  else if (PSEUDOVECTOR_TYPEP (&vector->header, PVEC_TS_PARSER))
+    {
+      struct Lisp_TS_Parser *lisp_parser
+	= PSEUDOVEC_STRUCT (vector, Lisp_TS_Parser);
+      ts_tree_delete(lisp_parser->tree);
+      ts_parser_delete(lisp_parser->parser);
+    }
+#endif
 #ifdef HAVE_MODULES
   else if (PSEUDOVECTOR_TYPEP (&vector->header, PVEC_MODULE_FUNCTION))
     {
diff --git a/src/casefiddle.c b/src/casefiddle.c
index 2ea5f09b4c..3022c5cc7d 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -30,6 +30,10 @@ Copyright (C) 1985, 1994, 1997-1999, 2001-2022 Free Software Foundation,
 #include "composite.h"
 #include "keymap.h"
 
+#ifdef HAVE_TREE_SITTER
+#include "treesit.h"
+#endif
+
 enum case_action {CASE_UP, CASE_DOWN, CASE_CAPITALIZE, CASE_CAPITALIZE_UP};
 
 /* State for casing individual characters.  */
@@ -530,6 +534,11 @@ casify_region (enum case_action flag, Lisp_Object b, Lisp_Object e)
   modify_text (start, end);
   prepare_casing_context (&ctx, flag, true);
 
+#ifdef HAVE_TREE_SITTER
+  ptrdiff_t start_byte = CHAR_TO_BYTE (start);
+  ptrdiff_t old_end_byte = CHAR_TO_BYTE (end);
+#endif
+
   ptrdiff_t orig_end = end;
   record_delete (start, make_buffer_string (start, end, true), false);
   if (NILP (BVAR (current_buffer, enable_multibyte_characters)))
@@ -548,6 +557,9 @@ casify_region (enum case_action flag, Lisp_Object b, Lisp_Object e)
     {
       signal_after_change (start, end - start - added, end - start);
       update_compositions (start, end, CHECK_ALL);
+#ifdef HAVE_TREE_SITTER
+      ts_record_change (start_byte, old_end_byte, CHAR_TO_BYTE (end));
+#endif
     }
 
   return orig_end + added;
diff --git a/src/data.c b/src/data.c
index 1526cc0c73..9c711d2021 100644
--- a/src/data.c
+++ b/src/data.c
@@ -260,6 +260,10 @@ DEFUN ("type-of", Ftype_of, Stype_of, 1, 1, 0,
           return Qxwidget;
         case PVEC_XWIDGET_VIEW:
           return Qxwidget_view;
+	case PVEC_TS_PARSER:
+	  return Qtreesit_parser;
+	case PVEC_TS_NODE:
+	  return Qtreesit_node;
         case PVEC_SQLITE:
           return Qsqlite;
         /* "Impossible" cases.  */
@@ -4203,6 +4207,8 @@ #define PUT_ERROR(sym, tail, msg)			\
   DEFSYM (Qterminal, "terminal");
   DEFSYM (Qxwidget, "xwidget");
   DEFSYM (Qxwidget_view, "xwidget-view");
+  DEFSYM (Qtreesit_parser, "treesit-parser");
+  DEFSYM (Qtreesit_node, "treesit-node");
 
   DEFSYM (Qdefun, "defun");
 
diff --git a/src/emacs.c b/src/emacs.c
index d1060bca0b..9a14e10375 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -136,6 +136,10 @@ #define MAIN_PROGRAM
 #include <sys/resource.h>
 #endif
 
+#ifdef HAVE_TREE_SITTER
+#include "treesit.h"
+#endif
+
 #include "pdumper.h"
 #include "fingerprint.h"
 #include "epaths.h"
@@ -2181,6 +2185,9 @@ main (int argc, char **argv)
       syms_of_module ();
 #endif
 
+#ifdef HAVE_TREE_SITTER
+      syms_of_treesit ();
+#endif
 #ifdef HAVE_SOUND
       syms_of_sound ();
 #endif
diff --git a/src/eval.c b/src/eval.c
index 294d79e67a..ecf57efb92 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1915,6 +1915,19 @@ signal_error (const char *s, Lisp_Object arg)
   xsignal (Qerror, Fcons (build_string (s), arg));
 }
 
+void
+define_error (Lisp_Object name, const char *message, Lisp_Object parent)
+{
+  eassert (SYMBOLP (name));
+  eassert (SYMBOLP (parent));
+  Lisp_Object parent_conditions = Fget (parent, Qerror_conditions);
+  eassert (CONSP (parent_conditions));
+  eassert (!NILP (Fmemq (parent, parent_conditions)));
+  eassert (NILP (Fmemq (name, parent_conditions)));
+  Fput (name, Qerror_conditions, pure_cons (name, parent_conditions));
+  Fput (name, Qerror_message, build_pure_c_string (message));
+}
+
 /* Use this for arithmetic overflow, e.g., when an integer result is
    too large even for a bignum.  */
 void
diff --git a/src/insdel.c b/src/insdel.c
index 6f180ac580..4676330cb7 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -31,6 +31,10 @@
 #include "region-cache.h"
 #include "pdumper.h"
 
+#ifdef HAVE_TREE_SITTER
+#include "treesit.h"
+#endif
+
 static void insert_from_string_1 (Lisp_Object, ptrdiff_t, ptrdiff_t, ptrdiff_t,
 				  ptrdiff_t, bool, bool);
 static void insert_from_buffer_1 (struct buffer *, ptrdiff_t, ptrdiff_t, bool);
@@ -940,6 +944,12 @@ insert_1_both (const char *string,
     set_text_properties (make_fixnum (PT), make_fixnum (PT + nchars),
 			 Qnil, Qnil, Qnil);
 
+#ifdef HAVE_TREE_SITTER
+  eassert (nbytes >= 0);
+  eassert (PT_BYTE >= 0);
+  ts_record_change (PT_BYTE, PT_BYTE, PT_BYTE + nbytes);
+#endif
+
   adjust_point (nchars, nbytes);
 
   check_markers ();
@@ -1071,6 +1081,12 @@ insert_from_string_1 (Lisp_Object string, ptrdiff_t pos, ptrdiff_t pos_byte,
   graft_intervals_into_buffer (intervals, PT, nchars,
 			       current_buffer, inherit);
 
+#ifdef HAVE_TREE_SITTER
+  eassert (nbytes >= 0);
+  eassert (PT_BYTE >= 0);
+  ts_record_change (PT_BYTE, PT_BYTE, PT_BYTE + nbytes);
+#endif
+
   adjust_point (nchars, outgoing_nbytes);
 
   check_markers ();
@@ -1137,6 +1153,12 @@ insert_from_gap (ptrdiff_t nchars, ptrdiff_t nbytes, bool text_at_gap_tail)
 				   current_buffer, 0);
     }
 
+#ifdef HAVE_TREE_SITTER
+  eassert (nbytes >= 0);
+  eassert (ins_bytepos >= 0);
+  ts_record_change (ins_bytepos, ins_bytepos, ins_bytepos + nbytes);
+#endif
+
   if (ins_charpos < PT)
     adjust_point (nchars, nbytes);
 
@@ -1287,6 +1309,12 @@ insert_from_buffer_1 (struct buffer *buf,
   /* Insert those intervals.  */
   graft_intervals_into_buffer (intervals, PT, nchars, current_buffer, inherit);
 
+#ifdef HAVE_TREE_SITTER
+  eassert (outgoing_nbytes >= 0);
+  eassert (PT_BYTE >= 0);
+  ts_record_change (PT_BYTE, PT_BYTE, PT_BYTE + outgoing_nbytes);
+#endif
+
   adjust_point (nchars, outgoing_nbytes);
 }
 
@@ -1535,6 +1563,13 @@ replace_range (ptrdiff_t from, ptrdiff_t to, Lisp_Object new,
   graft_intervals_into_buffer (intervals, from, inschars,
 			       current_buffer, inherit);
 
+#ifdef HAVE_TREE_SITTER
+  eassert (to_byte >= from_byte);
+  eassert (outgoing_insbytes >= 0);
+  eassert (from_byte >= 0);
+  ts_record_change (from_byte, to_byte, from_byte + outgoing_insbytes);
+#endif
+
   /* Relocate point as if it were a marker.  */
   if (from < PT)
     adjust_point ((from + inschars - (PT < to ? PT : to)),
@@ -1569,7 +1604,11 @@ replace_range (ptrdiff_t from, ptrdiff_t to, Lisp_Object new,
    If MARKERS, relocate markers.
 
    Unlike most functions at this level, never call
-   prepare_to_modify_buffer and never call signal_after_change.  */
+   prepare_to_modify_buffer and never call signal_after_change.
+   Because this function is called in a loop, one character at a time.
+   The caller of 'replace_range_2' calls these hooks for the entire
+   region once.  Apart from signal_after_change, any caller of this
+   function should also call ts_record_change.  */
 
 void
 replace_range_2 (ptrdiff_t from, ptrdiff_t from_byte,
@@ -1892,6 +1931,12 @@ del_range_2 (ptrdiff_t from, ptrdiff_t from_byte,
 
   evaporate_overlays (from);
 
+#ifdef HAVE_TREE_SITTER
+  eassert (from_byte <= to_byte);
+  eassert (from_byte >= 0);
+  ts_record_change (from_byte, to_byte, from_byte);
+#endif
+
   return deletion;
 }
 
diff --git a/src/json.c b/src/json.c
index db1be07f19..957f91b46b 100644
--- a/src/json.c
+++ b/src/json.c
@@ -1090,22 +1090,6 @@ DEFUN ("json-parse-buffer", Fjson_parse_buffer, Sjson_parse_buffer,
   return unbind_to (count, lisp);
 }
 
-/* Simplified version of 'define-error' that works with pure
-   objects.  */
-
-static void
-define_error (Lisp_Object name, const char *message, Lisp_Object parent)
-{
-  eassert (SYMBOLP (name));
-  eassert (SYMBOLP (parent));
-  Lisp_Object parent_conditions = Fget (parent, Qerror_conditions);
-  eassert (CONSP (parent_conditions));
-  eassert (!NILP (Fmemq (parent, parent_conditions)));
-  eassert (NILP (Fmemq (name, parent_conditions)));
-  Fput (name, Qerror_conditions, pure_cons (name, parent_conditions));
-  Fput (name, Qerror_message, build_pure_c_string (message));
-}
-
 void
 syms_of_json (void)
 {
diff --git a/src/lisp.h b/src/lisp.h
index 778bd1bfa5..aecbfed7fa 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -575,6 +575,8 @@ #define ENUM_BF(TYPE) enum TYPE
    your object -- this way, the same object could be used to represent
    several disparate C structures.
 
+   In addition, you need to add switch branches in data.c for Ftype_of.
+
    You also need to add the new type to the constant
    `cl--typeof-types' in lisp/emacs-lisp/cl-preloaded.el.  */
 
@@ -1053,6 +1055,8 @@ DEFINE_GDB_SYMBOL_END (PSEUDOVECTOR_FLAG)
   PVEC_CONDVAR,
   PVEC_MODULE_FUNCTION,
   PVEC_NATIVE_COMP_UNIT,
+  PVEC_TS_PARSER,
+  PVEC_TS_NODE,
   PVEC_SQLITE,
 
   /* These should be last, for internal_equal and sxhash_obj.  */
@@ -5407,6 +5411,11 @@ maybe_gc (void)
     maybe_garbage_collect ();
 }
 
+/* Simplified version of 'define-error' that works with pure
+   objects.  */
+void
+define_error (Lisp_Object name, const char *message, Lisp_Object parent);
+
 INLINE_HEADER_END
 
 #endif /* EMACS_LISP_H */
diff --git a/src/lread.c b/src/lread.c
index 0486a98883..8989e2d12d 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -5196,6 +5196,14 @@ syms_of_lread (void)
     Fcons (build_pure_c_string (MODULES_SECONDARY_SUFFIX), Vload_suffixes);
 #endif
 
+  DEFVAR_LISP ("dynamic-library-suffixes", Vdynamic_library_suffixes,
+	       doc: /* A list of suffixes for loadable dynamic libraries.  */);
+  Vdynamic_library_suffixes =
+    Fcons (build_pure_c_string (DYNAMIC_LIB_SECONDARY_SUFFIX), Qnil);
+  Vdynamic_library_suffixes =
+    Fcons (build_pure_c_string (DYNAMIC_LIB_SUFFIX),
+	   Vdynamic_library_suffixes);
+
 #endif
   DEFVAR_LISP ("module-file-suffix", Vmodule_file_suffix,
 	       doc: /* Suffix of loadable module file, or nil if modules are not supported.  */);
diff --git a/src/print.c b/src/print.c
index 8cce8a1ad8..ab3047dee5 100644
--- a/src/print.c
+++ b/src/print.c
@@ -48,6 +48,10 @@ Copyright (C) 1985-1986, 1988, 1993-1995, 1997-2022 Free Software
 # include <sys/socket.h> /* for F_DUPFD_CLOEXEC */
 #endif
 
+#ifdef HAVE_TREE_SITTER
+#include "treesit.h"
+#endif
+
 struct terminal;
 
 /* Avoid actual stack overflow in print.  */
@@ -1936,6 +1940,30 @@ print_vectorlike (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag,
       }
       break;
 #endif
+
+#ifdef HAVE_TREE_SITTER
+    case PVEC_TS_PARSER:
+      print_c_string ("#<treesit-parser for ", printcharfun);
+      Lisp_Object language = XTS_PARSER (obj)->language_symbol;
+      print_string (Fsymbol_name (language), printcharfun);
+      print_c_string (" in ", printcharfun);
+      print_object (XTS_PARSER (obj)->buffer, printcharfun, escapeflag);
+      printchar ('>', printcharfun);
+      break;
+    case PVEC_TS_NODE:
+      print_c_string ("#<treesit-node from ", printcharfun);
+      print_object (Ftreesit_node_start (obj),
+		    printcharfun, escapeflag);
+      print_c_string (" to ", printcharfun);
+      print_object (Ftreesit_node_end (obj),
+		    printcharfun, escapeflag);
+      print_c_string (" in ", printcharfun);
+      print_object (XTS_PARSER (XTS_NODE (obj)->parser)->buffer,
+		    printcharfun, escapeflag);
+      printchar ('>', printcharfun);
+      break;
+#endif
+
     case PVEC_SQLITE:
       {
 	print_c_string ("#<sqlite ", printcharfun);
diff --git a/src/treesit.c b/src/treesit.c
new file mode 100644
index 0000000000..e127fc2d87
--- /dev/null
+++ b/src/treesit.c
@@ -0,0 +1,1657 @@
+/* Tree-sitter integration for GNU Emacs.
+
+Copyright (C) 2021-2022 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#include <config.h>
+#include "lisp.h"
+#include "buffer.h"
+#include "treesit.h"
+
+/* Commentary
+
+   The Emacs wrapper of tree-sitter does not expose everything the C
+   API provides, most notably:
+
+   - It doesn't expose a syntax tree, we put the syntax tree in the
+     parser object, and updating the tree is handled in the C level.
+
+   - We don't expose tree cursor either.  I think Lisp is slow enough
+     to nullify any performance advantage of using a cursor, though I
+     don't have evidence.  Also I want to minimize the number of new
+     types we introduce, currently we only add parser and node type.
+
+   - Because updating the change is handled in the C level as each
+     change is made in the buffer, there is no way for Lisp to update
+     a node.  But since we can just retrieve a new node, it shouldn't
+     be a limitation.
+
+   - I didn't expose setting timeout and cancellation flag for a
+     parser, mainly because I don't think they are really necessary
+     in Emacs' use cases.
+
+   - Many tree-sitter functions asks for a TSPoint, basically a (row,
+     column) location.  Emacs uses a gap buffer and keeps no
+     information about row and column position.  According to the
+     author of tree-sitter, tree-sitter only asks for (row, column)
+     position to carry it around and return back to the user later;
+     and the real position used is the byte position.  He also said
+     that he _think_ that it will work to use byte position only.
+     That's why whenever a TSPoint is asked, we pass a dummy one to
+     it.  Judging by the nature of parsing algorithms, I think it is
+     safe to use only byte position, and I don't think this will
+     change in the future.
+
+     REF: https://github.com/tree-sitter/tree-sitter/issues/445
+
+   treesit.h has some commentary on the two main data structure
+   for the parser and node.  ts_ensure_position_synced has some
+   commentary on how do we make tree-sitter play well with narrowing
+   (tree-sitter parser only sees the visible region, so we need to
+   translate positions back and forth).  Most action happens in
+   ts_ensure_parsed, ts_read_buffer and ts_record_change.
+
+   A complete correspondence list between tree-sitter functions and
+   exposed Lisp functions can be found in the manual (elisp)API
+   Correspondence.
+
+   Placement of CHECK_xxx functions: call CHECK_xxx before using any
+   unchecked Lisp values; these include argument of Lisp functions,
+   return value of Fsymbol_value, car of a cons.
+
+   Initializing tree-sitter: there are two entry points to tree-sitter
+   functions: 'treesit-parser-create' and
+   'treesit-language-available-p'.  Therefore we only need to call
+   initialization function in those two functions.
+
+   Tree-sitter offset (0-based) and buffer position (1-based):
+     tree-sitter offset + buffer position = buffer position
+     buffer position - buffer position = tree-sitter offset
+
+   Tree-sitter-related code in other files:
+   - src/alloc.c for gc for parser and node
+   - src/casefiddle.c & src/insdel.c for notifying tree-sitter
+     parser of buffer changes.
+   - lisp/emacs-lisp/cl-preloaded.el & data.c & lisp.h for parser and
+     node type.
+ */
+
+/*** Initialization */
+
+bool ts_initialized = false;
+
+static void *
+ts_calloc_wrapper (size_t n, size_t size)
+{
+  return xzalloc (n * size);
+}
+
+void
+ts_initialize ()
+{
+  if (!ts_initialized)
+    {
+      ts_set_allocator (xmalloc, ts_calloc_wrapper, xrealloc, xfree);
+      ts_initialized = true;
+    }
+}
+
+/*** Loading language library */
+
+/* Translates a symbol treesit-<lang> to a C name
+   treesit_<lang>.  */
+void
+ts_symbol_to_c_name (char *symbol_name)
+{
+  for (int idx=0; idx < strlen (symbol_name); idx++)
+    {
+      if (symbol_name[idx] == '-')
+	symbol_name[idx] = '_';
+    }
+}
+
+bool
+ts_find_override_name
+(Lisp_Object language_symbol, Lisp_Object *name, Lisp_Object *c_symbol)
+{
+  for (Lisp_Object list = Vtreesit_load_name_override_list;
+       !NILP (list); list = XCDR (list))
+    {
+      Lisp_Object lang = XCAR (XCAR (list));
+      CHECK_SYMBOL (lang);
+      if (EQ (lang, language_symbol))
+	{
+	  *name = Fnth (make_fixnum (1), XCAR (list));
+	  CHECK_STRING (*name);
+	  *c_symbol = Fnth (make_fixnum (2), XCAR (list));
+	  CHECK_STRING (*c_symbol);
+	  return true;
+	}
+    }
+  return false;
+}
+
+/* For example, if Vdynamic_library_suffixes is (".so", ".dylib"),
+   thsi function pushes "lib_base_name.so" and "lib_base_name.dylib"
+   into *path_candidates. Obiviously path_candidates should be a Lisp
+   list of Lisp strings.  */
+void
+ts_load_language_push_for_each_suffix
+(Lisp_Object lib_base_name, Lisp_Object *path_candidates)
+{
+  for (Lisp_Object suffixes = Vdynamic_library_suffixes;
+       !NILP (suffixes); suffixes = XCDR (suffixes)) {
+    *path_candidates = Fcons (concat2 (lib_base_name, XCAR (suffixes)),
+			      *path_candidates);
+  }
+}
+
+/* Load the dynamic library of LANGUAGE_SYMBOL and return the pointer
+   to the language definition.  Signals
+   Qtreesit_load_language_error if something goes wrong.
+   Qtreesit_load_language_error carries the error message from
+   trying to load the library with each extension.
+
+   If SIGNAL is true, signal an error when failed to load LANGUAGE; if
+   false, return NULL when failed.  */
+TSLanguage *
+ts_load_language (Lisp_Object language_symbol, bool signal)
+{
+  Lisp_Object symbol_name = Fsymbol_name (language_symbol);
+
+  /* Figure out the library name and C name.  */
+  Lisp_Object lib_base_name =
+    (concat2 (build_pure_c_string ("libtree-sitter-"), symbol_name));
+  Lisp_Object base_name =
+    (concat2 (build_pure_c_string ("tree-sitter-"), symbol_name));
+  char *c_name = strdup (SSDATA (base_name));
+  ts_symbol_to_c_name (c_name);
+
+  /* Override the library name and C name, if appropriate.  */
+  Lisp_Object override_name;
+  Lisp_Object override_c_name;
+  bool found_override = ts_find_override_name
+    (language_symbol, &override_name, &override_c_name);
+  if (found_override)
+    {
+      lib_base_name = override_name;
+      c_name = SSDATA (override_c_name);
+    }
+
+  /* Now we generate a list of possible library paths.  */
+  Lisp_Object path_candidates = Qnil;
+  /* First push just the filenames to the candidate list, which will
+     make dynlib_open look under standard system load paths.  */
+  ts_load_language_push_for_each_suffix
+    (lib_base_name, &path_candidates);
+  /* Then push ~/.emacs.d/tree-sitter paths.  */
+  ts_load_language_push_for_each_suffix
+    (Fexpand_file_name
+     (concat2 (build_string ("tree-sitter/"), lib_base_name),
+      Fsymbol_value (Quser_emacs_directory)),
+     &path_candidates);
+  /* Then push paths from treesit-extra-load-path.  */
+  for (Lisp_Object tail = Freverse (Vtreesit_extra_load_path);
+       !NILP (tail); tail = XCDR (tail))
+    {
+      ts_load_language_push_for_each_suffix
+	(Fexpand_file_name (lib_base_name, XCAR (tail)),
+	 &path_candidates);
+    }
+
+  /* Try loading the dynamic library by each path candidate.  Stop
+     when succeed, record the error message and try the next one when
+     fail.  */
+  dynlib_handle_ptr handle;
+  char const *error;
+  Lisp_Object error_list = Qnil;
+  for (Lisp_Object tail = path_candidates;
+       !NILP (tail); tail = XCDR (tail))
+    {
+      char *library_name = SSDATA (XCAR (tail));
+      dynlib_error ();
+      handle = dynlib_open (library_name);
+      error = dynlib_error ();
+      if (error == NULL)
+	break;
+      else
+	error_list = Fcons (build_string (error), error_list);
+    }
+  if (error != NULL)
+    {
+      if (signal)
+	xsignal2 (Qtreesit_load_language_error,
+		  symbol_name, Fnreverse (error_list));
+      else
+	return NULL;
+    }
+
+  /* Load TSLanguage.  */
+  dynlib_error ();
+  TSLanguage *(*langfn) ();
+  langfn = dynlib_sym (handle, c_name);
+  error = dynlib_error ();
+  if (error != NULL)
+    {
+      if (signal)
+	xsignal1 (Qtreesit_load_language_error,
+		  build_string (error));
+      else
+	return NULL;
+    }
+  TSLanguage *lang = (*langfn) ();
+
+  /* Check if language version matches tree-sitter version.  */
+  TSParser *parser = ts_parser_new ();
+  bool success = ts_parser_set_language (parser, lang);
+  ts_parser_delete (parser);
+  if (!success)
+    {
+      if (signal)
+	xsignal2 (Qtreesit_load_language_error,
+		  build_pure_c_string ("Language version doesn't match tree-sitter version, language version:"),
+		  make_fixnum (ts_language_version (lang)));
+      else
+	return NULL;
+    }
+  return lang;
+}
+
+DEFUN ("treesit-language-available-p",
+       Ftreesit_langauge_available_p,
+       Streesit_language_available_p,
+       1, 1, 0,
+       doc: /* Return non-nil if LANGUAGE exists and is loadable.  */)
+  (Lisp_Object language)
+{
+  CHECK_SYMBOL (language);
+  ts_initialize ();
+  if (ts_load_language(language, false) == NULL)
+    return Qnil;
+  else
+    return Qt;
+}
+
+/*** Parsing functions */
+
+/* An auxiliary function that saves a few lines of code.  Assumes TREE
+   is not NULL.  */
+static inline void
+ts_tree_edit_1 (TSTree *tree, ptrdiff_t start_byte,
+		ptrdiff_t old_end_byte, ptrdiff_t new_end_byte)
+{
+  TSPoint dummy_point = {0, 0};
+  TSInputEdit edit = {(uint32_t) start_byte,
+		      (uint32_t) old_end_byte,
+		      (uint32_t) new_end_byte,
+		      dummy_point, dummy_point, dummy_point};
+  ts_tree_edit (tree, &edit);
+}
+
+/* Update each parser's tree after the user made an edit.  This
+function does not parse the buffer and only updates the tree. (So it
+should be very fast.)  */
+void
+ts_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
+		  ptrdiff_t new_end_byte)
+{
+  for (Lisp_Object parser_list =
+	 Fsymbol_value (Qtreesit_parser_list);
+       !NILP (parser_list);
+       parser_list = XCDR (parser_list))
+    {
+      CHECK_CONS (parser_list);
+      Lisp_Object lisp_parser = XCAR (parser_list);
+      CHECK_TS_PARSER (lisp_parser);
+      TSTree *tree = XTS_PARSER (lisp_parser)->tree;
+      if (tree != NULL)
+	{
+	  eassert (start_byte <= old_end_byte);
+	  eassert (start_byte <= new_end_byte);
+	  /* Think the recorded change as a delete followed by an
+	     insert, and think of them as moving unchanged text back
+	     and forth.  After all, the whole point of updating the
+	     tree is to update the position of unchanged text.  */
+	  ptrdiff_t bytes_del = old_end_byte - start_byte;
+	  ptrdiff_t bytes_ins = new_end_byte - start_byte;
+
+	  ptrdiff_t visible_beg = XTS_PARSER (lisp_parser)->visible_beg;
+	  ptrdiff_t visible_end = XTS_PARSER (lisp_parser)->visible_end;
+
+	  ptrdiff_t affected_start =
+	    max (visible_beg, start_byte) - visible_beg;
+	  ptrdiff_t affected_old_end =
+	    min (visible_end, affected_start + bytes_del);
+	  ptrdiff_t affected_new_end =
+	    affected_start + bytes_ins;
+
+	  ts_tree_edit_1 (tree, affected_start, affected_old_end,
+			  affected_new_end);
+	  XTS_PARSER (lisp_parser)->visible_end = affected_new_end;
+	  XTS_PARSER (lisp_parser)->need_reparse = true;
+	  XTS_PARSER (lisp_parser)->timestamp++;
+	}
+    }
+}
+
+void
+ts_ensure_position_synced (Lisp_Object parser)
+{
+  TSParser *ts_parser = XTS_PARSER (parser)->parser;
+  TSTree *tree = XTS_PARSER (parser)->tree;
+
+  if (tree == NULL)
+    return;
+
+  struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
+  ptrdiff_t visible_beg = XTS_PARSER (parser)->visible_beg;
+  ptrdiff_t visible_end = XTS_PARSER (parser)->visible_end;
+  /* Before we parse or set ranges, catch up with the narrowing
+     situation.  We change visible_beg and visible_end to match
+     BUF_BEGV_BYTE and BUF_ZV_BYTE, and inform tree-sitter of the
+     change.  We want to move the visible range of tree-sitter to
+     match the narrowed range. For example,
+     from ________|xxxx|__
+     to   |xxxx|__________ */
+
+  /* 1. Make sure visible_beg <= BUF_BEGV_BYTE.  */
+  if (visible_beg > BUF_BEGV_BYTE (buffer))
+    {
+      /* Tree-sitter sees: insert at the beginning. */
+      ts_tree_edit_1 (tree, 0, 0, visible_beg - BUF_BEGV_BYTE (buffer));
+      visible_beg = BUF_BEGV_BYTE (buffer);
+    }
+  /* 2. Make sure visible_end = BUF_ZV_BYTE.  */
+  if (visible_end < BUF_ZV_BYTE (buffer))
+    {
+      /* Tree-sitter sees: insert at the end.  */
+      ts_tree_edit_1 (tree, visible_end - visible_beg,
+		      visible_end - visible_beg,
+		      BUF_ZV_BYTE (buffer) - visible_beg);
+      visible_end = BUF_ZV_BYTE (buffer);
+    }
+  else if (visible_end > BUF_ZV_BYTE (buffer))
+    {
+      /* Tree-sitter sees: delete at the end.  */
+      ts_tree_edit_1 (tree, BUF_ZV_BYTE (buffer) - visible_beg,
+		      visible_end - visible_beg,
+		      BUF_ZV_BYTE (buffer) - visible_beg);
+      visible_end = BUF_ZV_BYTE (buffer);
+    }
+  /* 3. Make sure visible_beg = BUF_BEGV_BYTE.  */
+  if (visible_beg < BUF_BEGV_BYTE (buffer))
+    {
+      /* Tree-sitter sees: delete at the beginning.  */
+      ts_tree_edit_1 (tree, 0, BUF_BEGV_BYTE (buffer) - visible_beg, 0);
+      visible_beg = BUF_BEGV_BYTE (buffer);
+    }
+  eassert (0 <= visible_beg);
+  eassert (visible_beg <= visible_end);
+
+  XTS_PARSER (parser)->visible_beg = visible_beg;
+  XTS_PARSER (parser)->visible_end = visible_end;
+}
+
+void
+ts_check_buffer_size (struct buffer *buffer)
+{
+  ptrdiff_t buffer_size =
+    (BUF_Z (buffer) - BUF_BEG (buffer));
+  if (buffer_size > UINT32_MAX)
+    xsignal2 (Qtreesit_buffer_too_large,
+	      build_pure_c_string ("Buffer size too large, size:"),
+	      make_fixnum (buffer_size));
+}
+
+/* Parse the buffer.  We don't parse until we have to. When we have
+to, we call this function to parse and update the tree.  */
+void
+ts_ensure_parsed (Lisp_Object parser)
+{
+  if (!XTS_PARSER (parser)->need_reparse)
+    return;
+  TSParser *ts_parser = XTS_PARSER (parser)->parser;
+  TSTree *tree = XTS_PARSER(parser)->tree;
+  TSInput input = XTS_PARSER (parser)->input;
+  struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
+  ts_check_buffer_size (buffer);
+
+  /* Before we parse, catch up with the narrowing situation.  */
+  ts_ensure_position_synced (parser);
+
+  TSTree *new_tree = ts_parser_parse(ts_parser, tree, input);
+  /* This should be very rare (impossible, really): it only happens
+     when 1) language is not set (impossible in Emacs because the user
+     has to supply a language to create a parser), 2) parse canceled
+     due to timeout (impossible because we don't set a timeout), 3)
+     parse canceled due to cancellation flag (impossible because we
+     don't set the flag).  (See comments for ts_parser_parse in
+     tree_sitter/api.h.)  */
+  if (new_tree == NULL)
+    {
+      Lisp_Object buf;
+      XSETBUFFER (buf, buffer);
+      xsignal1 (Qtreesit_parse_error, buf);
+    }
+
+  ts_tree_delete (tree);
+  XTS_PARSER (parser)->tree = new_tree;
+  XTS_PARSER (parser)->need_reparse = false;
+}
+
+/* This is the read function provided to tree-sitter to read from a
+   buffer.  It reads one character at a time and automatically skips
+   the gap.  */
+const char*
+ts_read_buffer (void *parser, uint32_t byte_index,
+		TSPoint position, uint32_t *bytes_read)
+{
+  struct buffer *buffer =
+    XBUFFER (((struct Lisp_TS_Parser *) parser)->buffer);
+  ptrdiff_t visible_beg = ((struct Lisp_TS_Parser *) parser)->visible_beg;
+  ptrdiff_t visible_end = ((struct Lisp_TS_Parser *) parser)->visible_end;
+  ptrdiff_t byte_pos = byte_index + visible_beg;
+  /* We will make sure visible_beg = BUF_BEGV_BYTE before re-parse (in
+     ts_ensure_parsed), so byte_pos will never be smaller than
+     BUF_BEG_BYTE.  */
+  eassert (visible_beg = BUF_BEGV_BYTE (buffer));
+  eassert (visible_end = BUF_ZV_BYTE (buffer));
+
+  /* Read one character.  Tree-sitter wants us to set bytes_read to 0
+     if it reads to the end of buffer.  It doesn't say what it wants
+     for the return value in that case, so we just give it an empty
+     string.  */
+  char *beg;
+  int len;
+  /* This function could run from a user command, so it is better to
+     do nothing instead of raising an error. (It was a pain in the a**
+     to decrypt mega-if-conditions in Emacs source, so I wrote the two
+     branches separately.)  */
+  if (!BUFFER_LIVE_P (buffer))
+    {
+      beg = NULL;
+      len = 0;
+    }
+  /* Reached visible end-of-buffer, tell tree-sitter to read no more.  */
+  else if (byte_pos >= visible_end)
+    {
+      beg = NULL;
+      len = 0;
+    }
+  /* Normal case, read a character.  */
+  else
+    {
+      beg = (char *) BUF_BYTE_ADDRESS (buffer, byte_pos);
+      len = BYTES_BY_CHAR_HEAD ((int) *beg);
+    }
+  *bytes_read = (uint32_t) len;
+  return beg;
+}
+
+/*** Functions for parser and node object*/
+
+/* Wrap the parser in a Lisp_Object to be used in the Lisp machine.  */
+Lisp_Object
+make_ts_parser (Lisp_Object buffer, TSParser *parser,
+		TSTree *tree, Lisp_Object language_symbol)
+{
+  struct Lisp_TS_Parser *lisp_parser
+    = ALLOCATE_PSEUDOVECTOR
+    (struct Lisp_TS_Parser, buffer, PVEC_TS_PARSER);
+
+  lisp_parser->language_symbol = language_symbol;
+  lisp_parser->buffer = buffer;
+  lisp_parser->parser = parser;
+  lisp_parser->tree = tree;
+  TSInput input = {lisp_parser, ts_read_buffer, TSInputEncodingUTF8};
+  lisp_parser->input = input;
+  lisp_parser->need_reparse = true;
+  lisp_parser->visible_beg = BUF_BEGV (XBUFFER (buffer));
+  lisp_parser->visible_end = BUF_ZV (XBUFFER (buffer));
+  return make_lisp_ptr (lisp_parser, Lisp_Vectorlike);
+}
+
+/* Wrap the node in a Lisp_Object to be used in the Lisp machine.  */
+Lisp_Object
+make_ts_node (Lisp_Object parser, TSNode node)
+{
+  struct Lisp_TS_Node *lisp_node
+    = ALLOCATE_PSEUDOVECTOR (struct Lisp_TS_Node, parser, PVEC_TS_NODE);
+  lisp_node->parser = parser;
+  lisp_node->node = node;
+  lisp_node->timestamp = XTS_PARSER (parser)->timestamp;
+  return make_lisp_ptr (lisp_node, Lisp_Vectorlike);
+}
+
+DEFUN ("treesit-parser-p",
+       Ftreesit_parser_p, Streesit_parser_p, 1, 1, 0,
+       doc: /* Return t if OBJECT is a tree-sitter parser.  */)
+  (Lisp_Object object)
+{
+  if (TS_PARSERP (object))
+    return Qt;
+  else
+    return Qnil;
+}
+
+DEFUN ("treesit-node-p",
+       Ftreesit_node_p, Streesit_node_p, 1, 1, 0,
+       doc: /* Return t if OBJECT is a tree-sitter node.  */)
+  (Lisp_Object object)
+{
+  if (TS_NODEP (object))
+    return Qt;
+  else
+    return Qnil;
+}
+
+DEFUN ("treesit-node-parser",
+       Ftreesit_node_parser, Streesit_node_parser,
+       1, 1, 0,
+       doc: /* Return the parser to which NODE belongs.  */)
+  (Lisp_Object node)
+{
+  CHECK_TS_NODE (node);
+  return XTS_NODE (node)->parser;
+}
+
+DEFUN ("treesit-parser-create",
+       Ftreesit_parser_create, Streesit_parser_create,
+       2, 2, 0,
+       doc: /* Create and return a parser in BUFFER for LANGUAGE.
+
+The parser is automatically added to BUFFER's
+`treesit-parser-list'.  LANGUAGE should be the symbol of a
+function provided by a tree-sitter language dynamic module, e.g.,
+'treesit-json.  If BUFFER is nil, use the current buffer.  */)
+  (Lisp_Object buffer, Lisp_Object language)
+{
+  if (NILP (buffer))
+    buffer = Fcurrent_buffer ();
+
+  CHECK_BUFFER (buffer);
+  CHECK_SYMBOL (language);
+  ts_check_buffer_size (XBUFFER (buffer));
+
+  ts_initialize ();
+
+  TSParser *parser = ts_parser_new ();
+  TSLanguage *lang = ts_load_language (language, true);
+  /* We check language version when loading a language, so this should
+     always succeed.  */
+  ts_parser_set_language (parser, lang);
+
+  Lisp_Object lisp_parser
+    = make_ts_parser (buffer, parser, NULL, language);
+
+  struct buffer *old_buffer = current_buffer;
+  set_buffer_internal (XBUFFER (buffer));
+
+  Fset (Qtreesit_parser_list,
+	Fcons (lisp_parser, Fsymbol_value (Qtreesit_parser_list)));
+
+  set_buffer_internal (old_buffer);
+  return lisp_parser;
+}
+
+DEFUN ("treesit-parser-buffer",
+       Ftreesit_parser_buffer, Streesit_parser_buffer,
+       1, 1, 0,
+       doc: /* Return the buffer of PARSER.  */)
+  (Lisp_Object parser)
+{
+  CHECK_TS_PARSER (parser);
+  Lisp_Object buf;
+  XSETBUFFER (buf, XBUFFER (XTS_PARSER (parser)->buffer));
+  return buf;
+}
+
+DEFUN ("treesit-parser-language",
+       Ftreesit_parser_language, Streesit_parser_language,
+       1, 1, 0,
+       doc: /* Return parser's language symbol.
+This symbol is the one used to create the parser.  */)
+  (Lisp_Object parser)
+{
+  CHECK_TS_PARSER (parser);
+  return XTS_PARSER (parser)->language_symbol;
+}
+
+/*** Parser API */
+
+DEFUN ("treesit-parser-root-node",
+       Ftreesit_parser_root_node, Streesit_parser_root_node,
+       1, 1, 0,
+       doc: /* Return the root node of PARSER.  */)
+  (Lisp_Object parser)
+{
+  CHECK_TS_PARSER (parser);
+  ts_ensure_parsed (parser);
+  TSNode root_node = ts_tree_root_node (XTS_PARSER (parser)->tree);
+  return make_ts_node (parser, root_node);
+}
+
+/* Checks that the RANGES argument of
+   treesit-parser-set-included-ranges is valid.  */
+void
+ts_check_range_argument (Lisp_Object ranges)
+{
+  EMACS_INT last_point = 1;
+  for (Lisp_Object tail = ranges;
+       !NILP (tail); tail = XCDR (tail))
+    {
+      CHECK_CONS (tail);
+      Lisp_Object range = XCAR (tail);
+      CHECK_CONS (range);
+      CHECK_FIXNUM (XCAR (range));
+      CHECK_FIXNUM (XCDR (range));
+      EMACS_INT beg = XFIXNUM (XCAR (range));
+      EMACS_INT end = XFIXNUM (XCDR (range));
+      /* TODO: Maybe we should check for point-min/max, too?  */
+      if (!(last_point <= beg && beg <= end))
+	xsignal2 (Qtreesit_range_invalid,
+		  build_pure_c_string
+		  ("RANGE is either overlapping or out-of-order"),
+		  ranges);
+      last_point = end;
+    }
+}
+
+DEFUN ("treesit-parser-set-included-ranges",
+       Ftreesit_parser_set_included_ranges,
+       Streesit_parser_set_included_ranges,
+       2, 2, 0,
+       doc: /* Limit PARSER to RANGES.
+
+RANGES is a list of (BEG . END), each (BEG . END) confines a range in
+which the parser should operate in.  Each range must not overlap, and
+each range should come in order.  Signal `treesit-set-range-error'
+if the argument is invalid, or something else went wrong.  If RANGES
+is nil, set PARSER to parse the whole buffer.  */)
+  (Lisp_Object parser, Lisp_Object ranges)
+{
+  CHECK_TS_PARSER (parser);
+  CHECK_CONS (ranges);
+  ts_check_range_argument (ranges);
+
+  /* Before we parse, catch up with narrowing/widening.  */
+  ts_ensure_position_synced (parser);
+
+  bool success;
+  if (NILP (ranges))
+    {
+      /* If RANGES is nil, make parser to parse the whole document.
+	 To do that we give tree-sitter a 0 length, the range is a
+	 dummy.  */
+      TSRange ts_range = {0, 0, 0, 0};
+      success = ts_parser_set_included_ranges
+	(XTS_PARSER (parser)->parser, &ts_range , 0);
+    }
+  else
+    {
+      /* Set ranges for PARSER.  */
+      ptrdiff_t len = list_length (ranges);
+      TSRange *ts_ranges = malloc (sizeof(TSRange) * len);
+      struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
+
+      for (int idx=0; !NILP (ranges); idx++, ranges = XCDR (ranges))
+	{
+	  Lisp_Object range = XCAR (ranges);
+	  struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
+
+	  EMACS_INT beg_byte = buf_charpos_to_bytepos
+	    (buffer, XFIXNUM (XCAR (range)));
+	  EMACS_INT end_byte = buf_charpos_to_bytepos
+	    (buffer, XFIXNUM (XCDR (range)));
+	  /* We don't care about start and end points, put in dummy
+	     value.  */
+	  TSRange rg = {{0,0}, {0,0},
+			(uint32_t) beg_byte - BUF_BEGV_BYTE (buffer),
+			(uint32_t) end_byte - BUF_BEGV_BYTE (buffer)};
+	  ts_ranges[idx] = rg;
+	}
+      success = ts_parser_set_included_ranges
+	(XTS_PARSER (parser)->parser, ts_ranges, (uint32_t) len);
+      /* Although XFIXNUM could signal, it should be impossible
+	 because we have checked the input by ts_check_range_argument.
+	 So there is no need for unwind-protect.  */
+      free (ts_ranges);
+    }
+
+  if (!success)
+    xsignal2 (Qtreesit_range_invalid,
+	      build_pure_c_string
+	      ("Something went wrong when setting ranges"),
+	      ranges);
+
+  XTS_PARSER (parser)->need_reparse = true;
+  return Qnil;
+}
+
+DEFUN ("treesit-parser-included-ranges",
+       Ftreesit_parser_included_ranges,
+       Streesit_parser_included_ranges,
+       1, 1, 0,
+       doc: /* Return the ranges set for PARSER.
+See `treesit-parser-set-ranges'.  If no range is set, return
+nil.  */)
+  (Lisp_Object parser)
+{
+  CHECK_TS_PARSER (parser);
+  uint32_t len;
+  const TSRange *ranges = ts_parser_included_ranges
+    (XTS_PARSER (parser)->parser, &len);
+  if (len == 0)
+    return Qnil;
+  struct buffer *buffer = XBUFFER (XTS_PARSER (parser)->buffer);
+
+  Lisp_Object list = Qnil;
+  for (int idx=0; idx < len; idx++)
+    {
+      TSRange range = ranges[idx];
+      uint32_t beg_byte = range.start_byte + BUF_BEGV_BYTE (buffer);
+      uint32_t end_byte = range.end_byte + BUF_BEGV_BYTE (buffer);
+
+      Lisp_Object lisp_range =
+	Fcons (make_fixnum (buf_bytepos_to_charpos (buffer, beg_byte)) ,
+	       make_fixnum (buf_bytepos_to_charpos (buffer, end_byte)));
+      list = Fcons (lisp_range, list);
+    }
+  return Fnreverse (list);
+}
+
+/*** Node API  */
+
+/* Check that OBJ is a positive integer and signal an error if
+   otherwise. */
+static void
+ts_check_positive_integer (Lisp_Object obj)
+{
+  CHECK_INTEGER (obj);
+  if (XFIXNUM (obj) < 0)
+    xsignal1 (Qargs_out_of_range, obj);
+}
+
+static void
+ts_check_node (Lisp_Object obj)
+{
+  CHECK_TS_NODE (obj);
+  Lisp_Object lisp_parser = XTS_NODE (obj)->parser;
+  if (XTS_NODE (obj)->timestamp !=
+      XTS_PARSER (lisp_parser)->timestamp)
+    xsignal1 (Qtreesit_node_outdated, obj);
+}
+
+DEFUN ("treesit-node-type",
+       Ftreesit_node_type, Streesit_node_type, 1, 1, 0,
+       doc: /* Return the NODE's type as a string.
+If NODE is nil, return nil.  */)
+  (Lisp_Object node)
+{
+  if (NILP (node)) return Qnil;
+  ts_check_node (node);
+  TSNode ts_node = XTS_NODE (node)->node;
+  const char *type = ts_node_type (ts_node);
+  return build_string (type);
+}
+
+DEFUN ("treesit-node-start",
+       Ftreesit_node_start, Streesit_node_start, 1, 1, 0,
+       doc: /* Return the NODE's start position.
+If NODE is nil, return nil.  */)
+  (Lisp_Object node)
+{
+  if (NILP (node)) return Qnil;
+  ts_check_node (node);
+  TSNode ts_node = XTS_NODE (node)->node;
+  ptrdiff_t visible_beg =
+    XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
+  uint32_t start_byte_offset = ts_node_start_byte (ts_node);
+  struct buffer *buffer =
+    XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer);
+  ptrdiff_t start_pos = buf_bytepos_to_charpos
+    (buffer, start_byte_offset + visible_beg);
+  return make_fixnum (start_pos);
+}
+
+DEFUN ("treesit-node-end",
+       Ftreesit_node_end, Streesit_node_end, 1, 1, 0,
+       doc: /* Return the NODE's end position.
+If NODE is nil, return nil.  */)
+  (Lisp_Object node)
+{
+  if (NILP (node)) return Qnil;
+  ts_check_node (node);
+  TSNode ts_node = XTS_NODE (node)->node;
+  ptrdiff_t visible_beg =
+    XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
+  uint32_t end_byte_offset = ts_node_end_byte (ts_node);
+  struct buffer *buffer =
+    XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer);
+  ptrdiff_t end_pos = buf_bytepos_to_charpos
+    (buffer, end_byte_offset + visible_beg);
+  return make_fixnum (end_pos);
+}
+
+DEFUN ("treesit-node-string",
+       Ftreesit_node_string, Streesit_node_string, 1, 1, 0,
+       doc: /* Return the string representation of NODE.
+If NODE is nil, return nil.  */)
+  (Lisp_Object node)
+{
+  if (NILP (node)) return Qnil;
+  ts_check_node (node);
+  TSNode ts_node = XTS_NODE (node)->node;
+  char *string = ts_node_string (ts_node);
+  return make_string (string, strlen (string));
+}
+
+DEFUN ("treesit-node-parent",
+       Ftreesit_node_parent, Streesit_node_parent, 1, 1, 0,
+       doc: /* Return the immediate parent of NODE.
+Return nil if there isn't any.  If NODE is nil, return nil.  */)
+  (Lisp_Object node)
+{
+  if (NILP (node)) return Qnil;
+  ts_check_node (node);
+  TSNode ts_node = XTS_NODE (node)->node;
+  TSNode parent = ts_node_parent (ts_node);
+
+  if (ts_node_is_null (parent))
+    return Qnil;
+
+  return make_ts_node (XTS_NODE (node)->parser, parent);
+}
+
+DEFUN ("treesit-node-child",
+       Ftreesit_node_child, Streesit_node_child, 2, 3, 0,
+       doc: /* Return the Nth child of NODE.
+
+Return nil if there isn't any.  If NAMED is non-nil, look for named
+child only.  NAMED defaults to nil.  If NODE is nil, return nil.  */)
+  (Lisp_Object node, Lisp_Object n, Lisp_Object named)
+{
+  if (NILP (node)) return Qnil;
+  ts_check_node (node);
+  ts_check_positive_integer (n);
+  EMACS_INT idx = XFIXNUM (n);
+  if (idx > UINT32_MAX) xsignal1 (Qargs_out_of_range, n);
+  TSNode ts_node = XTS_NODE (node)->node;
+  TSNode child;
+  if (NILP (named))
+    child = ts_node_child (ts_node, (uint32_t) idx);
+  else
+    child = ts_node_named_child (ts_node, (uint32_t) idx);
+
+  if (ts_node_is_null (child))
+    return Qnil;
+
+  return make_ts_node (XTS_NODE (node)->parser, child);
+}
+
+DEFUN ("treesit-node-check",
+       Ftreesit_node_check, Streesit_node_check, 2, 2, 0,
+       doc: /* Return non-nil if NODE has PROPERTY, nil otherwise.
+
+PROPERTY could be 'named, 'missing, 'extra, 'has-changes, 'has-error.
+Named nodes correspond to named rules in the language definition,
+whereas "anonymous" nodes correspond to string literals in the
+language definition.
+
+Missing nodes are inserted by the parser in order to recover from
+certain kinds of syntax errors, i.e., should be there but not there.
+
+Extra nodes represent things like comments, which are not required the
+language definition, but can appear anywhere.
+
+A node "has changes" if the buffer changed since the node is
+created. (Don't forget the "s" at the end of 'has-changes.)
+
+A node "has error" if itself is a syntax error or contains any syntax
+errors.  */)
+  (Lisp_Object node, Lisp_Object property)
+{
+  if (NILP (node)) return Qnil;
+  ts_check_node (node);
+  CHECK_SYMBOL (property);
+  TSNode ts_node = XTS_NODE (node)->node;
+  bool result;
+  if (EQ (property, Qnamed))
+    result = ts_node_is_named (ts_node);
+  else if (EQ (property, Qmissing))
+    result = ts_node_is_missing (ts_node);
+  else if (EQ (property, Qextra))
+    result = ts_node_is_extra (ts_node);
+  else if (EQ (property, Qhas_error))
+    result = ts_node_has_error (ts_node);
+  else if (EQ (property, Qhas_changes))
+    result = ts_node_has_changes (ts_node);
+  else
+    signal_error ("Expecting 'named, 'missing, 'extra, 'has-changes or 'has-error, got",
+		  property);
+  return result ? Qt : Qnil;
+}
+
+DEFUN ("treesit-node-field-name-for-child",
+       Ftreesit_node_field_name_for_child,
+       Streesit_node_field_name_for_child, 2, 2, 0,
+       doc: /* Return the field name of the Nth child of NODE.
+
+Return nil if there isn't any child or no field is found.
+If NODE is nil, return nil.  */)
+  (Lisp_Object node, Lisp_Object n)
+{
+  if (NILP (node)) return Qnil;
+  ts_check_node (node);
+  ts_check_positive_integer (n);
+  EMACS_INT idx = XFIXNUM (n);
+  if (idx > UINT32_MAX) xsignal1 (Qargs_out_of_range, n);
+  TSNode ts_node = XTS_NODE (node)->node;
+  const char *name
+    = ts_node_field_name_for_child (ts_node, (uint32_t) idx);
+
+  if (name == NULL)
+    return Qnil;
+
+  return make_string (name, strlen (name));
+}
+
+DEFUN ("treesit-node-child-count",
+       Ftreesit_node_child_count,
+       Streesit_node_child_count, 1, 2, 0,
+       doc: /* Return the number of children of NODE.
+
+If NAMED is non-nil, count named child only.  NAMED defaults to
+nil.  If NODE is nil, return nil.  */)
+  (Lisp_Object node, Lisp_Object named)
+{
+  if (NILP (node)) return Qnil;
+  ts_check_node (node);
+  TSNode ts_node = XTS_NODE (node)->node;
+  uint32_t count;
+  if (NILP (named))
+    count = ts_node_child_count (ts_node);
+  else
+    count = ts_node_named_child_count (ts_node);
+  return make_fixnum (count);
+}
+
+DEFUN ("treesit-node-child-by-field-name",
+       Ftreesit_node_child_by_field_name,
+       Streesit_node_child_by_field_name, 2, 2, 0,
+       doc: /* Return the child of NODE with FIELD-NAME.
+Return nil if there isn't any.  If NODE is nil, return nil.  */)
+  (Lisp_Object node, Lisp_Object field_name)
+{
+  if (NILP (node)) return Qnil;
+  ts_check_node (node);
+  CHECK_STRING (field_name);
+  char *name_str = SSDATA (field_name);
+  TSNode ts_node = XTS_NODE (node)->node;
+  TSNode child
+    = ts_node_child_by_field_name (ts_node, name_str, strlen (name_str));
+
+  if (ts_node_is_null(child))
+    return Qnil;
+
+  return make_ts_node(XTS_NODE (node)->parser, child);
+}
+
+DEFUN ("treesit-node-next-sibling",
+       Ftreesit_node_next_sibling,
+       Streesit_node_next_sibling, 1, 2, 0,
+       doc: /* Return the next sibling of NODE.
+
+Return nil if there isn't any.  If NAMED is non-nil, look for named
+child only.  NAMED defaults to nil.  If NODE is nil, return nil.  */)
+  (Lisp_Object node, Lisp_Object named)
+{
+  if (NILP (node)) return Qnil;
+  ts_check_node (node);
+  TSNode ts_node = XTS_NODE (node)->node;
+  TSNode sibling;
+  if (NILP (named))
+    sibling = ts_node_next_sibling (ts_node);
+  else
+    sibling = ts_node_next_named_sibling (ts_node);
+
+  if (ts_node_is_null(sibling))
+    return Qnil;
+
+  return make_ts_node(XTS_NODE (node)->parser, sibling);
+}
+
+DEFUN ("treesit-node-prev-sibling",
+       Ftreesit_node_prev_sibling,
+       Streesit_node_prev_sibling, 1, 2, 0,
+       doc: /* Return the previous sibling of NODE.
+
+Return nil if there isn't any.  If NAMED is non-nil, look for named
+child only.  NAMED defaults to nil.  If NODE is nil, return nil.  */)
+  (Lisp_Object node, Lisp_Object named)
+{
+  if (NILP (node)) return Qnil;
+  ts_check_node (node);
+  TSNode ts_node = XTS_NODE (node)->node;
+  TSNode sibling;
+
+  if (NILP (named))
+    sibling = ts_node_prev_sibling (ts_node);
+  else
+    sibling = ts_node_prev_named_sibling (ts_node);
+
+  if (ts_node_is_null(sibling))
+    return Qnil;
+
+  return make_ts_node(XTS_NODE (node)->parser, sibling);
+}
+
+DEFUN ("treesit-node-first-child-for-pos",
+       Ftreesit_node_first_child_for_pos,
+       Streesit_node_first_child_for_pos, 2, 3, 0,
+       doc: /* Return the first child of NODE on POS.
+
+Specifically, return the first child that extends beyond POS.  POS is
+a position in the buffer.  Return nil if there isn't any.  If NAMED is
+non-nil, look for named child only.  NAMED defaults to nil.  Note that
+this function returns an immediate child, not the smallest
+(grand)child.  If NODE is nil, return nil.  */)
+  (Lisp_Object node, Lisp_Object pos, Lisp_Object named)
+{
+  if (NILP (node)) return Qnil;
+  ts_check_node (node);
+  ts_check_positive_integer (pos);
+
+  struct buffer *buf =
+    XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer);
+  ptrdiff_t visible_beg =
+    XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
+  ptrdiff_t byte_pos = buf_charpos_to_bytepos (buf, XFIXNUM (pos));
+
+  if (byte_pos < BUF_BEGV_BYTE (buf) || byte_pos > BUF_ZV_BYTE (buf))
+    xsignal1 (Qargs_out_of_range, pos);
+
+  TSNode ts_node = XTS_NODE (node)->node;
+  TSNode child;
+  if (NILP (named))
+    child = ts_node_first_child_for_byte
+      (ts_node, byte_pos - visible_beg);
+  else
+    child = ts_node_first_named_child_for_byte
+      (ts_node, byte_pos - visible_beg);
+
+  if (ts_node_is_null (child))
+    return Qnil;
+
+  return make_ts_node (XTS_NODE (node)->parser, child);
+}
+
+DEFUN ("treesit-node-descendant-for-range",
+       Ftreesit_node_descendant_for_range,
+       Streesit_node_descendant_for_range, 3, 4, 0,
+       doc: /* Return the smallest node that covers BEG to END.
+
+The returned node is a descendant of NODE.  POS is a position.  Return
+nil if there isn't any.  If NAMED is non-nil, look for named child
+only.  NAMED defaults to nil.  If NODE is nil, return nil.  */)
+  (Lisp_Object node, Lisp_Object beg, Lisp_Object end, Lisp_Object named)
+{
+  if (NILP (node)) return Qnil;
+  ts_check_node (node);
+  CHECK_INTEGER (beg);
+  CHECK_INTEGER (end);
+
+  struct buffer *buf =
+    XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer);
+  ptrdiff_t visible_beg =
+    XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
+  ptrdiff_t byte_beg = buf_charpos_to_bytepos (buf, XFIXNUM (beg));
+  ptrdiff_t byte_end = buf_charpos_to_bytepos (buf, XFIXNUM (end));
+
+  /* Checks for BUFFER_BEG <= BEG <= END <= BUFFER_END.  */
+  if (!(BUF_BEGV_BYTE (buf) <= byte_beg
+	&& byte_beg <= byte_end
+	&& byte_end <= BUF_ZV_BYTE (buf)))
+    xsignal2 (Qargs_out_of_range, beg, end);
+
+  TSNode ts_node = XTS_NODE (node)->node;
+  TSNode child;
+  if (NILP (named))
+    child = ts_node_descendant_for_byte_range
+      (ts_node, byte_beg - visible_beg , byte_end - visible_beg);
+  else
+    child = ts_node_named_descendant_for_byte_range
+      (ts_node, byte_beg - visible_beg, byte_end - visible_beg);
+
+  if (ts_node_is_null (child))
+    return Qnil;
+
+  return make_ts_node (XTS_NODE (node)->parser, child);
+}
+
+DEFUN ("treesit-node-eq",
+       Ftreesit_node_eq,
+       Streesit_node_eq, 2, 2, 0,
+       doc: /* Return non-nil if NODE1 and NODE2 are the same node.
+If any one of NODE1 and NODE2 is nil, return nil.  */)
+  (Lisp_Object node1, Lisp_Object node2)
+{
+  if (NILP (node1) || NILP (node2))
+    return Qnil;
+  CHECK_TS_NODE (node1);
+  CHECK_TS_NODE (node2);
+
+  TSNode ts_node_1 = XTS_NODE (node1)->node;
+  TSNode ts_node_2 = XTS_NODE (node2)->node;
+
+  bool same_node = ts_node_eq (ts_node_1, ts_node_2);
+  return same_node ? Qt : Qnil;
+}
+
+/*** Query functions */
+
+/* If we decide to pre-load tree-sitter.el, maybe we can implement
+   this function in Lisp.  */
+DEFUN ("treesit-expand-pattern",
+       Ftreesit_expand_pattern,
+       Streesit_expand_pattern, 1, 1, 0,
+       doc: /* Expand PATTERN to its string form.
+
+PATTERN can be
+
+    :anchor
+    :?
+    :*
+    :+
+    :equal
+    :match
+    (TYPE PATTERN...)
+    [PATTERN...]
+    FIELD-NAME:
+    @CAPTURE-NAME
+    (_)
+    _
+    \"TYPE\"
+
+Consult Info node `(elisp)Pattern Matching' form detailed
+explanation.  */)
+  (Lisp_Object pattern)
+{
+  if (EQ (pattern, intern_c_string (":anchor")))
+    return build_pure_c_string(".");
+  if (EQ (pattern, intern_c_string (":?")))
+    return build_pure_c_string("?");
+  if (EQ (pattern, intern_c_string (":*")))
+    return build_pure_c_string("*");
+  if (EQ (pattern, intern_c_string (":+")))
+    return build_pure_c_string("+");
+  if (EQ (pattern, intern_c_string (":equal")))
+    return build_pure_c_string("#equal");
+  if (EQ (pattern, intern_c_string (":match")))
+    return build_pure_c_string("#match");
+  Lisp_Object opening_delimeter =
+    build_pure_c_string (VECTORP (pattern) ? "[" : "(");
+  Lisp_Object closing_delimiter =
+    build_pure_c_string (VECTORP (pattern) ? "]" : ")");
+  if (VECTORP (pattern) || CONSP (pattern))
+    return concat3 (opening_delimeter,
+		    Fmapconcat (intern_c_string
+				("treesit-expand-pattern"),
+				pattern,
+				build_pure_c_string (" ")),
+		    closing_delimiter);
+  return CALLN (Fformat, build_pure_c_string("%S"), pattern);
+}
+
+DEFUN ("treesit-expand-query",
+       Ftreesit_expand_query,
+       Streesit_expand_query, 1, 1, 0,
+       doc: /* Expand sexp QUERY to its string form.
+
+A PATTERN in QUERY can be
+
+    :anchor
+    :?
+    :*
+    :+
+    :equal
+    :match
+    (TYPE PATTERN...)
+    [PATTERN...]
+    FIELD-NAME:
+    @CAPTURE-NAME
+    (_)
+    _
+    \"TYPE\"
+
+Consult Info node `(elisp)Pattern Matching' form detailed
+explanation.  */)
+  (Lisp_Object query)
+{
+  return Fmapconcat (intern_c_string ("treesit-expand-pattern"),
+		     query, build_pure_c_string (" "));
+}
+
+char*
+ts_query_error_to_string (TSQueryError error)
+{
+  switch (error)
+    {
+    case TSQueryErrorNone:
+      return "None";
+    case TSQueryErrorSyntax:
+      return "Syntax error at";
+    case TSQueryErrorNodeType:
+      return "Node type error at";
+    case TSQueryErrorField:
+      return "Field error at";
+    case TSQueryErrorCapture:
+      return "Capture error at";
+    case TSQueryErrorStructure:
+      return "Structure error at";
+    default:
+      return "Unknown error";
+    }
+}
+
+/* Collect predicates for this match and return them in a list.  Each
+   predicate is a list of strings and symbols.  */
+Lisp_Object
+ts_predicates_for_pattern
+(TSQuery *query, uint32_t pattern_index)
+{
+  uint32_t len;
+  const TSQueryPredicateStep *predicate_list =
+    ts_query_predicates_for_pattern (query, pattern_index, &len);
+  Lisp_Object result = Qnil;
+  Lisp_Object predicate = Qnil;
+  for (int idx=0; idx < len; idx++)
+    {
+      TSQueryPredicateStep step = predicate_list[idx];
+      switch (step.type)
+	{
+	case TSQueryPredicateStepTypeCapture:
+	  {
+	    uint32_t str_len;
+	    const char *str = ts_query_capture_name_for_id
+	      (query, step.value_id, &str_len);
+	    predicate = Fcons (intern_c_string_1 (str, str_len),
+			       predicate);
+	    break;
+	  }
+	case TSQueryPredicateStepTypeString:
+	  {
+	    uint32_t str_len;
+	    const char *str = ts_query_string_value_for_id
+	      (query, step.value_id, &str_len);
+	    predicate = Fcons (make_string (str, str_len), predicate);
+	    break;
+	  }
+	case TSQueryPredicateStepTypeDone:
+	  result = Fcons (Fnreverse (predicate), result);
+	  predicate = Qnil;
+	  break;
+	}
+    }
+  return Fnreverse (result);
+}
+
+/* Translate a capture NAME (symbol) to the text of the captured node.
+   Signals treesit-query-error if such node is not captured.  */
+Lisp_Object
+ts_predicate_capture_name_to_text (Lisp_Object name, Lisp_Object captures)
+{
+  Lisp_Object node = Qnil;
+  for (Lisp_Object tail = captures; !NILP (tail); tail = XCDR (tail))
+    {
+      if (EQ (XCAR (XCAR (tail)), name))
+	{
+	  node = XCDR (XCAR (tail));
+	  break;
+	}
+    }
+
+  if (NILP (node))
+    xsignal3 (Qtreesit_query_error,
+	      build_pure_c_string ("Cannot find captured node"),
+	      name, build_pure_c_string ("A predicate can only refer to captured nodes in the same pattern"));
+
+  struct buffer *old_buffer = current_buffer;
+  set_buffer_internal
+    (XBUFFER (XTS_PARSER (XTS_NODE (node)->parser)->buffer));
+  Lisp_Object text = Fbuffer_substring
+    (Ftreesit_node_start (node), Ftreesit_node_end (node));
+  set_buffer_internal (old_buffer);
+  return text;
+}
+
+/* Handles predicate (#equal A B).  Return true if A equals B; return
+   false otherwise. A and B can be either string, or a capture name.
+   The capture name evaluates to the text its captured node spans in
+   the buffer.  */
+bool
+ts_predicate_equal (Lisp_Object args, Lisp_Object captures)
+{
+  if (XFIXNUM (Flength (args)) != 2)
+    xsignal2 (Qtreesit_query_error, build_pure_c_string ("Predicate `equal' requires two arguments but only given"), Flength (args));
+
+  Lisp_Object arg1 = XCAR (args);
+  Lisp_Object arg2 = XCAR (XCDR (args));
+  Lisp_Object tail = captures;
+  Lisp_Object text1 = STRINGP (arg1) ? arg1 :
+    ts_predicate_capture_name_to_text (arg1, captures);
+  Lisp_Object text2 = STRINGP (arg2) ? arg2 :
+    ts_predicate_capture_name_to_text (arg2, captures);
+
+  if (NILP (Fstring_equal (text1, text2)))
+    return false;
+  else
+    return true;
+}
+
+/* Handles predicate (#match "regexp" @node).  Return true if "regexp"
+   matches the text spanned by @node; return false otherwise.  Matching
+   is case-sensitive.  */
+bool
+ts_predicate_match (Lisp_Object args, Lisp_Object captures)
+{
+  if (XFIXNUM (Flength (args)) != 2)
+    xsignal2 (Qtreesit_query_error, build_pure_c_string ("Predicate `equal' requires two arguments but only given"), Flength (args));
+
+  Lisp_Object regexp = XCAR (args);
+  Lisp_Object capture_name = XCAR (XCDR (args));
+  Lisp_Object tail = captures;
+  Lisp_Object text = ts_predicate_capture_name_to_text
+    (capture_name, captures);
+
+  /* It's probably common to get the argument order backwards.  Catch
+     this mistake early and show helpful explanation, because Emacs
+     loves you.  (We put the regexp first because that's what
+     string-match does.)  */
+  if (!STRINGP (regexp))
+    xsignal1 (Qtreesit_query_error, build_pure_c_string ("The first argument to `match' should be a regexp string, not a capture name"));
+  if (!SYMBOLP (capture_name))
+    xsignal1 (Qtreesit_query_error, build_pure_c_string ("The second argument to `match' should be a capture name, not a string"));
+
+  if (fast_string_match (regexp, text) >= 0)
+    return true;
+  else
+    return false;
+}
+
+/* About predicates: I decide to hard-code predicates in C instead of
+   implementing an extensible system where predicates are translated
+   to Lisp functions, and new predicates can be added by extending a
+   list of functions, because I really couldn't imagine any useful
+   predicates besides equal and match.  If we later found out that
+   such system is indeed useful and necessary, it can be easily
+   added.  */
+
+/* If all predicates in PREDICATES passes, return true; otherwise
+   return false.  */
+bool
+ts_eval_predicates (Lisp_Object captures, Lisp_Object predicates)
+{
+  bool pass = true;
+  /* Evaluate each predicates.  */
+  for (Lisp_Object tail = predicates;
+       !NILP (tail); tail = XCDR (tail))
+    {
+      Lisp_Object predicate = XCAR (tail);
+      Lisp_Object fn = XCAR (predicate);
+      Lisp_Object args = XCDR (predicate);
+      if (!NILP (Fstring_equal (fn, build_pure_c_string("equal"))))
+	pass = ts_predicate_equal (args, captures);
+      else if (!NILP (Fstring_equal
+		      (fn, build_pure_c_string("match"))))
+	pass = ts_predicate_match (args, captures);
+      else
+	xsignal3 (Qtreesit_query_error,
+		  build_pure_c_string ("Invalid predicate"),
+		  fn, build_pure_c_string ("Currently Emacs only supports equal and match predicate"));
+    }
+  /* If all predicates passed, add captures to result list.  */
+  return pass;
+}
+
+DEFUN ("treesit-query-capture",
+       Ftreesit_query_capture,
+       Streesit_query_capture, 2, 4, 0,
+       doc: /* Query NODE with patterns in QUERY.
+
+Return a list of (CAPTURE_NAME . NODE).  CAPTURE_NAME is the name
+assigned to the node in PATTERN.  NODE is the captured node.
+
+QUERY is either a string query or a sexp query.  See Info node
+`(elisp)Pattern Matching' for how to write a query in either string or
+s-expression form.
+
+BEG and END, if both non-nil, specifies the range in which the query
+is executed.
+
+Raise an treesit-query-error if QUERY is malformed, or something
+else goes wrong.  */)
+  (Lisp_Object node, Lisp_Object query,
+   Lisp_Object beg, Lisp_Object end)
+{
+  ts_check_node (node);
+  if (!NILP (beg))
+    CHECK_INTEGER (beg);
+  if (!NILP (end))
+    CHECK_INTEGER (end);
+
+  if (CONSP (query))
+    query = Ftreesit_expand_query (query);
+  else
+    CHECK_STRING (query);
+
+  /* Extract C values from Lisp objects.  */
+  TSNode ts_node = XTS_NODE (node)->node;
+  Lisp_Object lisp_parser = XTS_NODE (node)->parser;
+  ptrdiff_t visible_beg =
+    XTS_PARSER (XTS_NODE (node)->parser)->visible_beg;
+  const TSLanguage *lang = ts_parser_language
+    (XTS_PARSER (lisp_parser)->parser);
+  char *source = SSDATA (query);
+
+  /* Initialize query objects, and execute query.  */
+  uint32_t error_offset;
+  TSQueryError error_type;
+  /* TODO: We could cache the query object, so that repeatedly
+     querying with the same query can reuse the query object.  It also
+     saves us from expanding the sexp query into a string.  I don't
+     know how much time that could save though.  */
+  TSQuery *ts_query = ts_query_new (lang, source, strlen (source),
+				    &error_offset, &error_type);
+  TSQueryCursor *cursor = ts_query_cursor_new ();
+
+  if (ts_query == NULL)
+    {
+      xsignal2 (Qtreesit_query_error,
+		build_string (ts_query_error_to_string (error_type)),
+		make_fixnum (error_offset + 1));
+    }
+  if (!NILP (beg) && !NILP (end))
+    {
+      EMACS_INT beg_byte = XFIXNUM (beg);
+      EMACS_INT end_byte = XFIXNUM (end);
+      ts_query_cursor_set_byte_range
+	(cursor, (uint32_t) beg_byte - visible_beg,
+	 (uint32_t) end_byte - visible_beg);
+    }
+
+  ts_query_cursor_exec (cursor, ts_query, ts_node);
+  TSQueryMatch match;
+
+  /* Go over each match, collect captures and predicates.  Include the
+     captures in the return list if all predicates in that match
+     passes.  */
+  Lisp_Object result = Qnil;
+  while (ts_query_cursor_next_match (cursor, &match))
+    {
+      /* Get captured nodes.  */
+      Lisp_Object captures_lisp = Qnil;
+      const TSQueryCapture *captures = match.captures;
+      for (int idx=0; idx < match.capture_count; idx++)
+	{
+	  uint32_t capture_name_len;
+	  TSQueryCapture capture = captures[idx];
+	  Lisp_Object captured_node =
+	    make_ts_node(lisp_parser, capture.node);
+	  const char *capture_name = ts_query_capture_name_for_id
+	    (ts_query, capture.index, &capture_name_len);
+	  Lisp_Object cap =
+	    Fcons (intern_c_string_1 (capture_name, capture_name_len),
+		   captured_node);
+	  captures_lisp = Fcons (cap, captures_lisp);
+	}
+      /* Get predicates.  */
+      Lisp_Object predicates =
+	ts_predicates_for_pattern (ts_query, match.pattern_index);
+
+      captures_lisp = Fnreverse (captures_lisp);
+      if (ts_eval_predicates (captures_lisp, predicates))
+	{
+	  result = CALLN (Fnconc, result, captures_lisp);
+	}
+    }
+  ts_query_delete (ts_query);
+  ts_query_cursor_delete (cursor);
+  return result;
+}
+
+/*** Initialization */
+
+/* Initialize the tree-sitter routines.  */
+void
+syms_of_treesit (void)
+{
+  DEFSYM (Qtreesit_parser_p, "treesit-parser-p");
+  DEFSYM (Qtreesit_node_p, "treesit-node-p");
+  DEFSYM (Qnamed, "named");
+  DEFSYM (Qmissing, "missing");
+  DEFSYM (Qextra, "extra");
+  DEFSYM (Qhas_changes, "has-changes");
+  DEFSYM (Qhas_error, "has-error");
+
+  DEFSYM (Qtreesit_error, "treesit-error");
+  DEFSYM (Qtreesit_query_error, "treesit-query-error");
+  DEFSYM (Qtreesit_parse_error, "treesit-parse-error");
+  DEFSYM (Qtreesit_range_invalid, "treesit-range-invalid");
+  DEFSYM (Qtreesit_buffer_too_large,
+	  "treesit-buffer-too-large");
+  DEFSYM (Qtreesit_load_language_error,
+	  "treesit-load-language-error");
+  DEFSYM (Qtreesit_node_outdated,
+	  "treesit-node-outdated");
+  DEFSYM (Quser_emacs_directory,
+	  "user-emacs-directory");
+
+  define_error (Qtreesit_error, "Generic tree-sitter error", Qerror);
+  define_error (Qtreesit_query_error, "Query pattern is malformed",
+		Qtreesit_error);
+  /* Should be impossible, no need to document this error.  */
+  define_error (Qtreesit_parse_error, "Parse failed",
+		Qtreesit_error);
+  define_error (Qtreesit_range_invalid,
+		"RANGES are invalid, they have to be ordered and not overlapping",
+		Qtreesit_error);
+  define_error (Qtreesit_buffer_too_large, "Buffer too large (> 4GB)",
+		Qtreesit_error);
+  define_error (Qtreesit_load_language_error,
+		"Cannot load language definition",
+		Qtreesit_error);
+  define_error (Qtreesit_node_outdated,
+		"This node is outdated, please retrieve a new one",
+		Qtreesit_error);
+
+  DEFSYM (Qtreesit_parser_list, "treesit-parser-list");
+  DEFVAR_LISP ("treesit-parser-list", Vtreesit_parser_list,
+	       doc: /* A list of tree-sitter parsers.
+
+If you removed a parser from this list, do not put it back in.  Emacs
+keeps the parser in this list updated with any change in the buffer.
+If removed and put back in, there is no guarantee that the parser is in
+sync with the buffer's content.  */);
+  Vtreesit_parser_list = Qnil;
+  Fmake_variable_buffer_local (Qtreesit_parser_list);
+
+  DEFVAR_LISP ("treesit-load-name-override-list",
+	       Vtreesit_load_name_override_list,
+	       doc:
+	       /* An override list for unconventional tree-sitter libraries.
+
+By default, Emacs assumes the dynamic library for LANG is
+libtree-sitter-LANG.EXT, where EXT is the OS specific extension for
+dynamic libraries.  Emacs also assumes that the name of the C function
+the library provides is tree_sitter_LANG.  If that is not the case,
+add an entry
+
+    (LANG LIBRARY-BASE-NAME FUNCTION-NAME)
+
+to this list, where LIBRARY-BASE-NAME is the filename of the dynamic
+library without extension, FUNCTION-NAME is the function provided by
+the library.  */);
+  Vtreesit_load_name_override_list = Qnil;
+
+  DEFVAR_LISP ("treesit-extra-load-path",
+	       Vtreesit_extra_load_path,
+	       doc:
+	       /* Extra load paths of tree-sitter language definitions.
+When trying to load a tree-sitter language definition,
+Emacs looks at directories in this variable,
+`user-emacs-directory'/tree-sitter, and system default locations for
+dynamic libraries, in that order.  */);
+  Vtreesit_extra_load_path = Qnil;
+
+  defsubr (&Streesit_language_available_p);
+
+  defsubr (&Streesit_parser_p);
+  defsubr (&Streesit_node_p);
+
+  defsubr (&Streesit_node_parser);
+
+  defsubr (&Streesit_parser_create);
+  defsubr (&Streesit_parser_buffer);
+  defsubr (&Streesit_parser_language);
+
+  defsubr (&Streesit_parser_root_node);
+  /* defsubr (&Streesit_parse_string); */
+
+  defsubr (&Streesit_parser_set_included_ranges);
+  defsubr (&Streesit_parser_included_ranges);
+
+  defsubr (&Streesit_node_type);
+  defsubr (&Streesit_node_start);
+  defsubr (&Streesit_node_end);
+  defsubr (&Streesit_node_string);
+  defsubr (&Streesit_node_parent);
+  defsubr (&Streesit_node_child);
+  defsubr (&Streesit_node_check);
+  defsubr (&Streesit_node_field_name_for_child);
+  defsubr (&Streesit_node_child_count);
+  defsubr (&Streesit_node_child_by_field_name);
+  defsubr (&Streesit_node_next_sibling);
+  defsubr (&Streesit_node_prev_sibling);
+  defsubr (&Streesit_node_first_child_for_pos);
+  defsubr (&Streesit_node_descendant_for_range);
+  defsubr (&Streesit_node_eq);
+
+  defsubr (&Streesit_expand_pattern);
+  defsubr (&Streesit_expand_query);
+  defsubr (&Streesit_query_capture);
+}
diff --git a/src/treesit.h b/src/treesit.h
new file mode 100644
index 0000000000..639c4eedc5
--- /dev/null
+++ b/src/treesit.h
@@ -0,0 +1,137 @@
+/* Header file for the tree-sitter integration.
+
+Copyright (C) 2021 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or (at
+your option) any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.  */
+
+#ifndef EMACS_TREESIT_H
+#define EMACS_TREESIT_H
+
+#include <tree_sitter/api.h>
+#include "lisp.h"
+
+INLINE_HEADER_BEGIN
+
+/* A wrapper for a tree-sitter parser, but also contains a parse tree
+   and other goodies for convenience.  */
+struct Lisp_TS_Parser
+{
+  union vectorlike_header header;
+  /* A symbol represents the language this parser uses.  See the
+     manual for more explanation.  */
+  Lisp_Object language_symbol;
+  /* The buffer associated with this parser.  */
+  Lisp_Object buffer;
+  /* The pointer to the tree-sitter parser.  Never NULL.  */
+  TSParser *parser;
+  /* Pointer to the syntax tree.  Initially is NULL, so check for NULL
+     before use.  */
+  TSTree *tree;
+  /* Teaches tree-sitter how to read an Emacs buffer.  */
+  TSInput input;
+  /* Re-parsing an unchanged buffer is not free for tree-sitter, so we
+     only make it re-parse when need_reparse == true.  That usually
+     means some change is made in the buffer.  But others could set
+     this field to true to force tree-sitter to re-parse.  */
+  bool need_reparse;
+  /* These two positions record the buffer byte position (1-based) of
+     the "visible region" that tree-sitter sees.  Unlike markers,
+     These two positions do not change as the user inserts and deletes
+     text around them. Before re-parse, we move these positions to
+     match BUF_BEGV_BYTE and BUF_ZV_BYTE.  Note that we don't need to
+     synchronize these positions when retrieving them in a function
+     that involves a node: if the node is not outdated, these
+     positions are synchronized.  */
+  ptrdiff_t visible_beg;
+  ptrdiff_t visible_end;
+  /* This counter is incremented every time a change is made to the
+     buffer in ts_record_change.  The node retrieved from this parser
+     inherits this timestamp.  This way we can make sure the node is
+     not outdated when we access its information.  */
+  ptrdiff_t timestamp;
+};
+
+/* A wrapper around a tree-sitter node.  */
+struct Lisp_TS_Node
+{
+  union vectorlike_header header;
+  /* This prevents gc from collecting the tree before the node is done
+     with it.  TSNode contains a pointer to the tree it belongs to,
+     and the parser object, when collected by gc, will free that
+     tree. */
+  Lisp_Object parser;
+  TSNode node;
+  /* A node inherits its parser's timestamp at creation time.  The
+     parser's timestamp increments as the buffer changes.  This way we
+     can make sure the node is not outdated when we access its
+     information.  */
+  ptrdiff_t timestamp;
+};
+
+INLINE bool
+TS_PARSERP (Lisp_Object x)
+{
+  return PSEUDOVECTORP (x, PVEC_TS_PARSER);
+}
+
+INLINE struct Lisp_TS_Parser *
+XTS_PARSER (Lisp_Object a)
+{
+  eassert (TS_PARSERP (a));
+  return XUNTAG (a, Lisp_Vectorlike, struct Lisp_TS_Parser);
+}
+
+INLINE bool
+TS_NODEP (Lisp_Object x)
+{
+  return PSEUDOVECTORP (x, PVEC_TS_NODE);
+}
+
+INLINE struct Lisp_TS_Node *
+XTS_NODE (Lisp_Object a)
+{
+  eassert (TS_NODEP (a));
+  return XUNTAG (a, Lisp_Vectorlike, struct Lisp_TS_Node);
+}
+
+INLINE void
+CHECK_TS_PARSER (Lisp_Object parser)
+{
+  CHECK_TYPE (TS_PARSERP (parser), Qtreesit_parser_p, parser);
+}
+
+INLINE void
+CHECK_TS_NODE (Lisp_Object node)
+{
+  CHECK_TYPE (TS_NODEP (node), Qtreesit_node_p, node);
+}
+
+void
+ts_record_change (ptrdiff_t start_byte, ptrdiff_t old_end_byte,
+		  ptrdiff_t new_end_byte);
+
+Lisp_Object
+make_ts_parser (Lisp_Object buffer, TSParser *parser,
+		TSTree *tree, Lisp_Object language_symbol);
+
+Lisp_Object
+make_ts_node (Lisp_Object parser, TSNode node);
+
+extern void syms_of_treesit (void);
+
+INLINE_HEADER_END
+
+#endif /* EMACS_TREESIT_H */
diff --git a/test/src/treesit-tests.el b/test/src/treesit-tests.el
new file mode 100644
index 0000000000..eb6e85c3fd
--- /dev/null
+++ b/test/src/treesit-tests.el
@@ -0,0 +1,366 @@
+;;; treesit-tests.el --- tests for src/treesit.c         -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2021 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Code:
+
+(require 'ert)
+(require 'treesit)
+
+(ert-deftest treesit-basic-parsing ()
+  "Test basic parsing routines."
+  (with-temp-buffer
+    (let ((parser (treesit-parser-create
+                   (current-buffer) 'json)))
+      (should
+       (eq parser (car treesit-parser-list)))
+      (should
+       (equal (treesit-node-string
+               (treesit-parser-root-node parser))
+              "(ERROR)"))
+
+      (insert "[1,2,3]")
+      (should
+       (equal (treesit-node-string
+               (treesit-parser-root-node parser))
+              "(document (array (number) (number) (number)))"))
+
+      (goto-char (point-min))
+      (forward-char 3)
+      (insert "{\"name\": \"Bob\"},")
+      (should
+       (equal
+        (treesit-node-string
+         (treesit-parser-root-node parser))
+        "(document (array (number) (object (pair key: (string (string_content)) value: (string (string_content)))) (number) (number)))")))))
+
+(ert-deftest treesit-node-api ()
+  "Tests for node API."
+  (with-temp-buffer
+    (let (parser root-node doc-node object-node pair-node)
+      (progn
+        (insert "[1,2,{\"name\": \"Bob\"},3]")
+        (setq parser (treesit-parser-create
+                      (current-buffer) 'json))
+        (setq root-node (treesit-parser-root-node
+                         parser)))
+      ;; `treesit-node-type'.
+      (should (equal "document" (treesit-node-type root-node)))
+      ;; `treesit-node-check'.
+      (should (eq t (treesit-node-check root-node 'named)))
+      (should (eq nil (treesit-node-check root-node 'missing)))
+      (should (eq nil (treesit-node-check root-node 'extra)))
+      (should (eq nil (treesit-node-check root-node 'has-error)))
+      ;; `treesit-node-child'.
+      (setq doc-node (treesit-node-child root-node 0))
+      (should (equal "array" (treesit-node-type doc-node)))
+      (should (equal (treesit-node-string doc-node)
+                     "(array (number) (number) (object (pair key: (string (string_content)) value: (string (string_content)))) (number))"))
+      ;; `treesit-node-child-count'.
+      (should (eql 9 (treesit-node-child-count doc-node)))
+      (should (eql 4 (treesit-node-child-count doc-node t)))
+      ;; `treesit-node-field-name-for-child'.
+      (setq object-node (treesit-node-child doc-node 2 t))
+      (setq pair-node (treesit-node-child object-node 0 t))
+      (should (equal "object" (treesit-node-type object-node)))
+      (should (equal "pair" (treesit-node-type pair-node)))
+      (should (equal "key"
+                     (treesit-node-field-name-for-child
+                      pair-node 0)))
+      ;; `treesit-node-child-by-field-name'.
+      (should (equal "(string (string_content))"
+                     (treesit-node-string
+                      (treesit-node-child-by-field-name
+                       pair-node "key"))))
+      ;; `treesit-node-next-sibling'.
+      (should (equal "(number)"
+                     (treesit-node-string
+                      (treesit-node-next-sibling object-node t))))
+      (should (equal "(\",\")"
+                     (treesit-node-string
+                      (treesit-node-next-sibling object-node))))
+      ;; `treesit-node-prev-sibling'.
+      (should (equal "(number)"
+                     (treesit-node-string
+                      (treesit-node-prev-sibling object-node t))))
+      (should (equal "(\",\")"
+                     (treesit-node-string
+                      (treesit-node-prev-sibling object-node))))
+      ;; `treesit-node-first-child-for-pos'.
+      (should (equal "(number)"
+                     (treesit-node-string
+                      (treesit-node-first-child-for-pos
+                       doc-node 3 t))))
+      (should (equal "(\",\")"
+                     (treesit-node-string
+                      (treesit-node-first-child-for-pos
+                       doc-node 3))))
+      ;; `treesit-node-descendant-for-range'.
+      (should (equal "(\"{\")"
+                     (treesit-node-string
+                      (treesit-node-descendant-for-range
+                       root-node 6 7))))
+      (should (equal "(object (pair key: (string (string_content)) value: (string (string_content))))"
+                     (treesit-node-string
+                      (treesit-node-descendant-for-range
+                       root-node 6 7 t))))
+      ;; `treesit-node-eq'.
+      (should (treesit-node-eq root-node root-node))
+      (should (not (treesit-node-eq root-node doc-node))))))
+
+(ert-deftest treesit-query-api ()
+  "Tests for query API."
+  (with-temp-buffer
+    (let (parser root-node pattern doc-node object-node pair-node)
+      (progn
+        (insert "[1,2,{\"name\": \"Bob\"},3]")
+        (setq parser (treesit-parser-create
+                      (current-buffer) 'json))
+        (setq root-node (treesit-parser-root-node
+                         parser)))
+
+      (dolist (pattern
+               '("(string) @string
+(pair key: (_) @keyword)
+((_) @bob (#match \"^B.b$\" @bob))
+(number) @number
+((number) @n3 (#equal \"3\" @n3)) "
+                 ((string) @string
+                  (pair key: (_) @keyword)
+                  ((_) @bob (:match "^B.b$" @bob))
+                  (number) @number
+                  ((number) @n3 (:equal "3" @n3)))))
+        (should
+         (equal
+          '((number . "1") (number . "2")
+            (keyword . "\"name\"")
+            (string . "\"name\"")
+            (string . "\"Bob\"")
+            (bob . "Bob")
+            (number . "3")
+            (n3 . "3"))
+          (mapcar (lambda (entry)
+                    (cons (car entry)
+                          (treesit-node-text
+                           (cdr entry))))
+                  (treesit-query-capture root-node pattern))))
+        (should
+         (equal
+          "(type field: (_) @capture .) ? * + \"return\""
+          (treesit-expand-query
+           '((type field: (_) @capture :anchor)
+             :? :* :+ "return"))))))))
+
+(ert-deftest treesit-narrow ()
+  "Tests if narrowing works."
+  (with-temp-buffer
+    (let (parser root-node pattern doc-node object-node pair-node)
+      (progn
+        (insert "xxx[1,{\"name\": \"Bob\"},2,3]xxx")
+        (narrow-to-region (+ (point-min) 3) (- (point-max) 3))
+        (setq parser (treesit-parser-create
+                      (current-buffer) 'json))
+        (setq root-node (treesit-parser-root-node
+                         parser)))
+      ;; This test is from the basic test.
+      (should
+       (equal
+        (treesit-node-string
+         (treesit-parser-root-node parser))
+        "(document (array (number) (object (pair key: (string (string_content)) value: (string (string_content)))) (number) (number)))"))
+
+      (widen)
+      (goto-char (point-min))
+      (insert "ooo")
+      (should (equal "oooxxx[1,{\"name\": \"Bob\"},2,3]xxx"
+                     (buffer-string)))
+      (delete-region 10 26)
+      (should (equal "oooxxx[1,2,3]xxx"
+                     (buffer-string)))
+      (narrow-to-region (+ (point-min) 6) (- (point-max) 3))
+      ;; This test is also from the basic test.
+      (should
+       (equal (treesit-node-string
+               (treesit-parser-root-node parser))
+              "(document (array (number) (number) (number)))"))
+      (widen)
+      (goto-char (point-max))
+      (insert "[1,2]")
+      (should (equal "oooxxx[1,2,3]xxx[1,2]"
+                     (buffer-string)))
+      (narrow-to-region (- (point-max) 5) (point-max))
+      (should
+       (equal (treesit-node-string
+               (treesit-parser-root-node parser))
+              "(document (array (number) (number)))"))
+      (widen)
+      (goto-char (point-min))
+      (insert "[1]")
+      (should (equal "[1]oooxxx[1,2,3]xxx[1,2]"
+                     (buffer-string)))
+      (narrow-to-region (point-min) (+ (point-min) 3))
+      (should
+       (equal (treesit-node-string
+               (treesit-parser-root-node parser))
+              "(document (array (number)))")))))
+
+(ert-deftest treesit-range ()
+  "Tests if range works."
+  (with-temp-buffer
+    (let (parser root-node pattern doc-node object-node pair-node)
+      (progn
+        (insert "[[1],oooxxx[1,2,3],xxx[1,2]]")
+        (setq parser (treesit-parser-create
+                      (current-buffer) 'json))
+        (setq root-node (treesit-parser-root-node
+                         parser)))
+      (should-error
+       (treesit-parser-set-included-ranges
+        parser '((1 . 6) (5 . 20)))
+       :type '(treesit-range-invalid))
+
+      (treesit-parser-set-included-ranges
+       parser '((1 . 6) (12 . 20) (23 . 29)))
+      (should (equal '((1 . 6) (12 . 20) (23 . 29))
+                     (treesit-parser-included-ranges parser)))
+      (should (equal "(document (array (array (number)) (array (number) (number) (number)) (array (number) (number))))"
+                     (treesit-node-string
+                      (treesit-parser-root-node parser))))
+      ;; TODO: More tests.
+      )))
+
+(ert-deftest treesit-multi-lang ()
+  "Tests if parsing multiple language works."
+  (with-temp-buffer
+    (let (html css js html-range css-range js-range)
+      (progn
+        (insert "<html><script>1</script><style>body {}</style></html>")
+        (setq html (treesit-get-parser-create 'html))
+        (setq css (treesit-get-parser-create 'css))
+        (setq js (treesit-get-parser-create 'javascript)))
+      ;; JavaScript.
+      (setq js-range
+            (treesit-query-range
+             'html
+             '((script_element (raw_text) @capture))))
+      (should (equal '((15 . 16)) js-range))
+      (treesit-parser-set-included-ranges js js-range)
+      (should (equal "(program (expression_statement (number)))"
+                     (treesit-node-string
+                      (treesit-parser-root-node js))))
+      ;; CSS.
+      (setq css-range
+            (treesit-query-range
+             'html
+             '((style_element (raw_text) @capture))))
+      (should (equal '((32 . 39)) css-range))
+      (treesit-parser-set-included-ranges css css-range)
+      (should
+       (equal "(stylesheet (rule_set (selectors (tag_name)) (block)))"
+              (treesit-node-string
+               (treesit-parser-root-node css))))
+      ;; TODO: More tests.
+      )))
+
+(ert-deftest treesit-parser-supplemental ()
+  "Supplemental node functions."
+  ;; `treesit-get-parser'.
+  (with-temp-buffer
+    (should (equal (treesit-get-parser 'json) nil)))
+  ;; `treesit-get-parser-create'.
+  (with-temp-buffer
+    (should (not (equal (treesit-get-parser-create 'json)
+                        nil))))
+  ;; `treesit-parse-string'.
+  (should (equal (treesit-node-string
+                  (treesit-parse-string
+                   "[1,2,{\"name\": \"Bob\"},3]"
+                   'json))
+                 "(document (array (number) (number) (object (pair key: (string (string_content)) value: (string (string_content)))) (number)))"))
+  (with-temp-buffer
+    (let (parser root-node doc-node object-node pair-node)
+      (progn
+        (insert "[1,2,{\"name\": \"Bob\"},3]")
+        (setq parser (treesit-parser-create
+                      (current-buffer) 'json))
+        (setq root-node (treesit-parser-root-node
+                         parser))
+        (setq doc-node (treesit-node-child root-node 0)))
+      ;; `treesit-get-parser'.
+      (should (not (equal (treesit-get-parser 'json)
+                          nil)))
+      ;; `treesit-language-at'.
+      (should (equal (treesit-language-at (point))
+                     'json))
+      ;; `treesit-set-ranges', `treesit-get-ranges'.
+      (treesit-set-ranges 'json
+                          '((1 . 2)))
+      (should (equal (treesit-get-ranges 'json)
+                     '((1 . 2)))))))
+
+(ert-deftest treesit-node-supplemental ()
+  "Supplemental node functions."
+  (let (parser root-node doc-node array-node)
+    (progn
+      (insert "[1,2,{\"name\": \"Bob\"},3]")
+      (setq parser (treesit-parser-create
+                    (current-buffer) 'json))
+      (setq root-node (treesit-parser-root-node
+                       parser))
+      (setq doc-node (treesit-node-child root-node 0)))
+    ;; `treesit-node-buffer'.
+    (should (equal (treesit-node-buffer root-node)
+                   (current-buffer)))
+    ;; `treesit-node-language'.
+    (should (eq (treesit-node-language root-node)
+                'json))
+    ;; `treesit-node-at'.
+    (should (equal (treesit-node-string
+                    (treesit-node-at 1 2 'json))
+                   "(\"[\")"))
+    ;; `treesit-buffer-root-node'.
+    (should (treesit-node-eq
+             (treesit-buffer-root-node 'json)
+             root-node))
+    ;; `treesit-filter-child'.
+    (should (equal (mapcar
+                    (lambda (node)
+                      (treesit-node-type node))
+                    (treesit-filter-child
+                     doc-node (lambda (node)
+                                (treesit-node-check node 'named))))
+                   '("number" "number" "object" "number")))
+    ;; `treesit-node-text'.
+    (should (equal (treesit-node-text doc-node)
+                   "[1,2,{\"name\": \"Bob\"},3]"))
+    ;; `treesit-node-index'.
+    (should (eq (treesit-node-index doc-node)
+                0))
+    ;; TODO:
+    ;; `treesit-parent-until'
+    ;; `treesit-parent-while'
+    ;; `treesit-node-children'
+    ;; `treesit-node-field-name'
+    ))
+
+;; TODO
+;; - Functions in treesit.el
+;; - treesit-load-name-override-list
+
+(provide 'treesit-tests)
+;;; treesit-tests.el ends here