Merge from origin/emacs-29

0154f5885e3 Merge branch 'emacs-29' of git.sv.gnu.org:/srv/git/emacs ...
111efb0dd7f Merge branch 'emacs-29' of git.sv.gnu.org:/srv/git/emacs ...
948b471756e Require ls-lisp in Tramp only when needed
90c03ffcd4b After minibuffer action, don't make the minibuffer current

diff --cc lisp/net/tramp-compat.el
index 40ea47ede40685bd60300774404864afed5e1535,673c6679dbe55aca480aceb254cda2b1ca80bfdc..bb7b266dd3513cbd6de64cefcbc74fe6d47a0eea
--- 1/lisp/net/tramp-compat.el
--- 2/lisp/net/tramp-compat.el
+++ b/lisp/net/tramp-compat.el
@@@ -29,10 -29,8 +29,9 @@@
  
  ;;; Code:
  
 +(require 'ansi-color)
  (require 'auth-source)
  (require 'format-spec)
- (require 'ls-lisp) ;; Due to `tramp-handle-insert-directory'.
  (require 'parse-time)
  (require 'shell)
  (require 'subr-x)

diff --cc lisp/net/tramp-sh.el
Simple merge

diff --cc lisp/net/tramp.el
Simple merge