master updated (e6dd64aaba5 -> 4ca131b7f54)

[Eli Zaretskii]

eliz pushed a change to branch master.

      from  e6dd64aaba5 ; * lisp/progmodes/elixir-ts-mode.el (treesit-node-p): 
Declare.
      adds  7d5fee0feaa Support regeneration of ja-dic.el under 
'--with-small-ja-dic'
      adds  bee18e52737 Fix bug#66093 in Tramp
      adds  7447d3df94e Fix tree-sitter indentation conflict with multiple 
languages
      adds  ca5b48fd76d Fix tmm-mid-prompt :type (Bug#66179)
      adds  4776d90c31b Add new Tramp test
       new  46978fa1eff Merge from origin/emacs-29
       new  4ca131b7f54 Merge etc/NEWS from origin/emacs-29


Summary of changes:
 .gitignore                                       |  1 +
 etc/NEWS.29                                      | 19 ++++++--
 java/org/gnu/emacs/EmacsDesktopNotification.java |  2 +-
 leim/Makefile.in                                 |  9 +++-
 lisp/international/ja-dic-cnv.el                 |  2 +
 lisp/net/tramp-sshfs.el                          |  4 +-
 lisp/net/tramp.el                                | 11 +++--
 lisp/tmm.el                                      |  3 +-
 lisp/treesit.el                                  |  4 +-
 make-dist                                        |  5 +-
 test/lisp/net/tramp-tests.el                     | 61 +++++++++++++++++++++++-
 11 files changed, 104 insertions(+), 17 deletions(-)