From: Po Lu <luangruo@yahoo.com>
Date: Mon, 30 Jan 2023 13:47:39 +0000 (+0800)
Subject: Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c53952164fe54fee41343fd4008f610f7a284d26;p=emacs.git

Merge from origin/emacs-29

f67a9a12b7b Fix interactive use of `keymap-local-set' and `keymap-glo...
dda4baa58b7 ; Fix build and startup without tree-sitter
---

c53952164fe54fee41343fd4008f610f7a284d26
diff --cc lisp/treesit.el
index 202a383ed7d,98f446a1456..059707b0123
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@@ -86,8 -86,8 +86,9 @@@
  
  (declare-function treesit-search-subtree "treesit.c")
  (declare-function treesit-search-forward "treesit.c")
 +(declare-function treesit-subtree-stat "treesit.c")
  (declare-function treesit-induce-sparse-tree "treesit.c")
+ (declare-function treesit-subtree-stat "treesit.c")
  
  (declare-function treesit-available-p "treesit.c")