From: Philipp Stephani <phst@google.com>
Date: Mon, 17 May 2021 19:59:57 +0000 (+0200)
Subject: Fix find invocation for macOS (Bug#48471).
X-Git-Tag: emacs-28.0.90~2352
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2e55201b8085d64c76d9a35bffff90a02133647e;p=emacs.git

Fix find invocation for macOS (Bug#48471).

* lisp/progmodes/project.el (project--files-in-directory): Instead of
appending a slash (which doesn't work well with macOS find), remove
trailing slash and pass -H instead.
---

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 047f55ed1ae..eab60756c8f 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -297,11 +297,10 @@ to find the list of ignores for each directory."
          ;; expanded and not left for the shell command
          ;; to interpret.
          (localdir (file-name-unquote (file-local-name (expand-file-name dir))))
-         (command (format "%s %s %s -type f %s -print0"
+         (command (format "%s -H %s %s -type f %s -print0"
                           find-program
                           (shell-quote-argument
-                           ;; In case DIR is a symlink.
-                           (file-name-as-directory localdir))
+                           (directory-file-name localdir)) ; Bug#48471
                           (xref--find-ignores-arguments ignores localdir)
                           (if files
                               (concat (shell-quote-argument "(")