summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPär Bohrarper <par.bohrarper@gmail.com>2024-06-14 04:04:20 +0300
committerDmitry Gutov <dmitry@gutov.dev>2024-06-14 04:05:46 +0300
commit2dae603c4140a0a449b2ddaf572fe94de3908f31 (patch)
tree9cb2939dddb5a8a919d874a4a5a40011a3bac02a
parent4973801c198a4292992b7df0488b3d467c99571e (diff)
Fix file listing in submodules with project-files-relative-names=t
* lisp/progmodes/project.el (project--vc-list-files): Prepend module names to files when project-files-relative-names is non-nil (bug#71538).
-rw-r--r--lisp/progmodes/project.el14
1 files changed, 10 insertions, 4 deletions
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index a16ff30395b..17550a83f95 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -714,10 +714,16 @@ See `project-vc-extra-root-markers' for the marker value format.")
(mapcar
(lambda (module)
(when (file-directory-p module)
- (project--vc-list-files
- (concat default-directory module)
- backend
- extra-ignores)))
+ (let ((sub-files
+ (project--vc-list-files
+ (concat default-directory module)
+ backend
+ extra-ignores)))
+ (if project-files-relative-names
+ (mapcar (lambda (file)
+ (concat (file-name-as-directory module) file))
+ sub-files)
+ sub-files))))
submodules)))
(setq files
(apply #'nconc files sub-files))))