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.
This commit is contained in:
parent
594267395d
commit
33a8415eb7
1 changed files with 15 additions and 9 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue