emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 2e55201: Fix find invocation for macOS (Bug#48471).


From: Philipp Stephani
Subject: master 2e55201: Fix find invocation for macOS (Bug#48471).
Date: Sun, 23 May 2021 07:05:01 -0400 (EDT)

branch: master
commit 2e55201b8085d64c76d9a35bffff90a02133647e
Author: Philipp Stephani <phst@google.com>
Commit: Philipp Stephani <phst@google.com>

    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.
---
 lisp/progmodes/project.el | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 047f55e..eab6075 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 "(")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]