From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 22 Jun 2023 09:01:23 +0000 (+0200)
Subject: Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8ca8fb484143a639f08987146bfdebf97d1541f4;p=emacs.git

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
---

8ca8fb484143a639f08987146bfdebf97d1541f4
diff --cc lisp/net/tramp-compat.el
index 40ea47ede40,673c6679dbe..bb7b266dd35
--- a/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)