Merge from origin/emacs-29

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

diff --cc lisp/treesit.el
index 202a383ed7d23494262214302ba8975d6f26e054,98f446a14565915cf1510d22625b86f9a6d8153b..059707b01236ec121d22a5dc95b3dcfbd1155d89
--- 1/lisp/treesit.el
--- 2/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")