diff options
| author | Dmitry Gutov <dgutov@yandex.ru> | 2022-12-09 23:21:10 +0200 |
|---|---|---|
| committer | Dmitry Gutov <dgutov@yandex.ru> | 2022-12-09 23:21:28 +0200 |
| commit | 33a8415eb7e2f5baebffc529a422fb17dc3fd09e (patch) | |
| tree | ae06ae623947185d8ec2a001dcd18a316dccc5e0 /lisp | |
| parent | 594267395d5b082d14d3009278213f1dbe91cd46 (diff) | |
| download | emacs-33a8415eb7e2f5baebffc529a422fb17dc3fd09e.tar.gz emacs-33a8415eb7e2f5baebffc529a422fb17dc3fd09e.tar.bz2 emacs-33a8415eb7e2f5baebffc529a422fb17dc3fd09e.zip | |
Use 'project--value-in-dir' for 'project-vc-include-untracked' too
* lisp/progmodes/project.el (project--vc-list-files): Use
'project--value-in-dir' for 'project-vc-include-untracked' too.
So that is can be reliably set through dir-locals.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/progmodes/project.el | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index 342ee239c7e..016dfdd5b4d 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el @@ -609,13 +609,16 @@ project backend implementation of `project-external-roots'.") (defvar vc-git-use-literal-pathspecs) (pcase backend (`Git - (let ((default-directory (expand-file-name (file-name-as-directory dir))) - (args '("-z")) - (vc-git-use-literal-pathspecs nil) - files) + (let* ((default-directory (expand-file-name (file-name-as-directory dir))) + (args '("-z")) + (vc-git-use-literal-pathspecs nil) + (include-untracked (project--value-in-dir + 'project-vc-include-untracked + dir)) + files) (setq args (append args '("-c" "--exclude-standard") - (and project-vc-include-untracked '("-o")))) + (and include-untracked '("-o")))) (when extra-ignores (setq args (append args (cons "--" @@ -666,10 +669,13 @@ project backend implementation of `project-external-roots'.") ;; XXX: Better solutions welcome, but this seems cheap enough. (delete-consecutive-dups files))) (`Hg - (let ((default-directory (expand-file-name (file-name-as-directory dir))) - (args (list (concat "-mcard" (and project-vc-include-untracked "u")) - "--no-status" - "-0"))) + (let* ((default-directory (expand-file-name (file-name-as-directory dir))) + (include-untracked (project--value-in-dir + 'project-vc-include-untracked + dir)) + (args (list (concat "-mcard" (and include-untracked "u")) + "--no-status" + "-0"))) (when extra-ignores (setq args (nconc args (mapcan |