From: Dmitry Gutov <dgutov@yandex.ru>
Date: Sat, 4 Jun 2022 00:42:00 +0000 (+0300)
Subject: Post-review additions
X-Git-Tag: emacs-29.0.90~1910^2~253
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7fed00f9ba9f4838633009037a156aa439a6b069;p=emacs.git

Post-review additions

* lisp/progmodes/project.el (project-vc-include-untracked):
Add :version.
(project--vc-list-files): Use 'and' instead of 'when'.
---

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 60fbb302f7b..859ad2e047b 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -385,6 +385,7 @@ you might have to restart Emacs to see the effect."
 (defcustom project-vc-include-untracked t
   "When non-nil, the VC project backend includes untracked files."
   :type 'boolean
+  :version "29.1"
   :safe #'booleanp)
 
 ;; FIXME: Using the current approach, major modes are supposed to set
@@ -519,7 +520,7 @@ backend implementation of `project-external-roots'.")
            files)
        (setq args (append args
                           '("-c" "--exclude-standard")
-                          (when project-vc-include-untracked '("-o"))))
+                          (and project-vc-include-untracked '("-o"))))
        (when extra-ignores
          (setq args (append args
                             (cons "--"
@@ -571,7 +572,7 @@ backend implementation of `project-external-roots'.")
        (delete-consecutive-dups files)))
     (`Hg
      (let ((default-directory (expand-file-name (file-name-as-directory dir)))
-           (args (list (concat "-mcard" (when project-vc-include-untracked "u"))
+           (args (list (concat "-mcard" (and project-vc-include-untracked "u"))
                        "--no-status"
                        "-0")))
        (when extra-ignores