From: Michael Albinus <michael.albinus@gmx.de>
Date: Sun, 2 Jun 2024 13:09:44 +0000 (+0200)
Subject: Fix bug#71235
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cb089e3443a41f74fb65158bc8482d359fc58457;p=emacs.git

Fix bug#71235

* lisp/dired.el (dired-insert-directory): Fix remote case.

* lisp/net/tramp.el (tramp-remote-path): Add "/opt/homebrew/bin".

(cherry picked from commit a37e812d9677a1e97daf112ec2d821aaacd7664f)
---

diff --git a/lisp/dired.el b/lisp/dired.el
index f2a75df6ef1..c51e5e42c29 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1710,9 +1710,10 @@ see `dired-use-ls-dired' for more details.")
       (cond ((and dir-wildcard (files--use-insert-directory-program-p))
              (setq switches (concat "-d " switches))
              (let* ((default-directory (car dir-wildcard))
+                    (ls (or (and remotep "ls")
+                            insert-directory-program))
                     (script (format "%s %s %s"
-                                    insert-directory-program
-                                    switches (cdr dir-wildcard)))
+                                    ls switches (cdr dir-wildcard)))
                     (sh (or (and remotep "/bin/sh")
                             (executable-find shell-file-name)
                             (executable-find "sh")))
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 06ba0cd59eb..3cd0fdf5a86 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1370,7 +1370,7 @@ let-bind this variable."
   '(tramp-default-remote-path "/bin" "/usr/bin" "/sbin" "/usr/sbin"
     "/usr/local/bin" "/usr/local/sbin" "/local/bin" "/local/freeware/bin"
     "/local/gnu/bin" "/usr/freeware/bin" "/usr/pkg/bin" "/usr/contrib/bin"
-    "/opt/bin" "/opt/sbin" "/opt/local/bin")
+    "/opt/bin" "/opt/sbin" "/opt/local/bin" "/opt/homebrew/bin")
   "List of directories to search for executables on remote host.
 For every remote host, this variable will be set buffer local,
 keeping the list of existing directories on that host.