Eli Zaretskii 46978fa1ef Merge from origin/emacs-29 ... 4776d90c31 Add new Tramp test ca5b48fd76 Fix tmm-mid-prompt :type (Bug#66179) 7447d3df94 Fix tree-sitter indentation conflict with multiple languages bee18e5273 Fix bug#66093 in Tramp 7d5fee0fea Support regeneration of ja-dic.el under '--with-small-ja-... Conflicts: make-dist		2023-09-30 13:50:07 -04:00
..
gnu/emacs	Merge from origin/emacs-29	2023-09-30 13:50:07 -04:00