feature/android updated (eb72569dbef -> d8e42afeaca)

[Po Lu]

oldosfan pushed a change to branch feature/android.

      from  eb72569dbef Merge remote-tracking branch 'origin/master' into 
feature/android
      adds  99e40959f40 Fix password prompt in Tramp (do not merge)
      adds  48ed4228a75 ; Merge from origin/emacs-29
      adds  dda4baa58b7 ; Fix build and startup without tree-sitter
      adds  f67a9a12b7b Fix interactive use of `keymap-local-set' and 
`keymap-global-set'
      adds  c53952164fe Merge from origin/emacs-29
       new  d8e42afeaca Merge remote-tracking branch 'origin/master' into 
feature/android


Summary of changes:
 lisp/keymap.el                 | 13 ++++++-------
 lisp/progmodes/c-ts-common.el  |  1 +
 lisp/progmodes/rust-ts-mode.el |  1 +
 lisp/treesit.el                | 31 +++++++++++++++++--------------
 4 files changed, 25 insertions(+), 21 deletions(-)