diff options
| author | Philipp Stephani | 2021-05-17 21:59:57 +0200 |
|---|---|---|
| committer | Philipp Stephani | 2021-05-23 13:03:49 +0200 |
| commit | 2e55201b8085d64c76d9a35bffff90a02133647e (patch) | |
| tree | ece9a2f0124064543d7339e4bcf6f99ac8ca65d6 | |
| parent | fc87cdf95986667bf083fdab01df20a6a07d5d0f (diff) | |
| download | emacs-2e55201b8085d64c76d9a35bffff90a02133647e.tar.gz emacs-2e55201b8085d64c76d9a35bffff90a02133647e.zip | |
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.
| -rw-r--r-- | lisp/progmodes/project.el | 5 |
1 files changed, 2 insertions, 3 deletions
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." | |||
| 297 | ;; expanded and not left for the shell command | 297 | ;; expanded and not left for the shell command |
| 298 | ;; to interpret. | 298 | ;; to interpret. |
| 299 | (localdir (file-name-unquote (file-local-name (expand-file-name dir)))) | 299 | (localdir (file-name-unquote (file-local-name (expand-file-name dir)))) |
| 300 | (command (format "%s %s %s -type f %s -print0" | 300 | (command (format "%s -H %s %s -type f %s -print0" |
| 301 | find-program | 301 | find-program |
| 302 | (shell-quote-argument | 302 | (shell-quote-argument |
| 303 | ;; In case DIR is a symlink. | 303 | (directory-file-name localdir)) ; Bug#48471 |
| 304 | (file-name-as-directory localdir)) | ||
| 305 | (xref--find-ignores-arguments ignores localdir) | 304 | (xref--find-ignores-arguments ignores localdir) |
| 306 | (if files | 305 | (if files |
| 307 | (concat (shell-quote-argument "(") | 306 | (concat (shell-quote-argument "(") |