diff options
| author | Pär Bohrarper | 2024-06-14 04:04:20 +0300 |
|---|---|---|
| committer | Dmitry Gutov | 2024-06-14 04:05:46 +0300 |
| commit | 2dae603c4140a0a449b2ddaf572fe94de3908f31 (patch) | |
| tree | 9cb2939dddb5a8a919d874a4a5a40011a3bac02a /lisp/progmodes | |
| parent | 4973801c198a4292992b7df0488b3d467c99571e (diff) | |
| download | emacs-2dae603c4140a0a449b2ddaf572fe94de3908f31.tar.gz emacs-2dae603c4140a0a449b2ddaf572fe94de3908f31.zip | |
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).
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/project.el | 14 |
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.") | |||
| 714 | (mapcar | 714 | (mapcar |
| 715 | (lambda (module) | 715 | (lambda (module) |
| 716 | (when (file-directory-p module) | 716 | (when (file-directory-p module) |
| 717 | (project--vc-list-files | 717 | (let ((sub-files |
| 718 | (concat default-directory module) | 718 | (project--vc-list-files |
| 719 | backend | 719 | (concat default-directory module) |
| 720 | extra-ignores))) | 720 | backend |
| 721 | extra-ignores))) | ||
| 722 | (if project-files-relative-names | ||
| 723 | (mapcar (lambda (file) | ||
| 724 | (concat (file-name-as-directory module) file)) | ||
| 725 | sub-files) | ||
| 726 | sub-files)))) | ||
| 721 | submodules))) | 727 | submodules))) |
| 722 | (setq files | 728 | (setq files |
| 723 | (apply #'nconc files sub-files)))) | 729 | (apply #'nconc files sub-files)))) |