branch: elpa/magit
commit c06dd3ff49b9a6ff76f56addd3ff248003a3affd
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-insert-untracked-files: Fix thinko and typo
Also recognize more boolean spellings.
---
lisp/magit-status.el | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lisp/magit-status.el b/lisp/magit-status.el
index 952cca50827..75d421efbae 100644
--- a/lisp/magit-status.el
+++ b/lisp/magit-status.el
@@ -750,16 +750,16 @@ remote in alphabetic order."
List files if `magit-status-show-untracked-files' is non-nil, but also
take the local value of Git variable `status.showUntrackedFiles' into
-account. The local value of the Lisp variable takes precedence over
-the local value of the Git variable. The global value of the Git is
-always ignored."
+account. The local value of the Lisp variable takes precedence over the
+local value of the Git variable. The global value of the Git variable
+is always ignored."
(when-let*
((value (or (and (local-variable-p 'magit-status-show-untracked-files)
magit-status-show-untracked-files)
(pcase (magit-get "--local" "status.showUntrackedFiles")
- ((or "no" "false") 'no)
- ("all" 'all)
- (_ t))
+ ((or "no" "off" "false" "0") 'no)
+ ((or "yes" "on" "true" "1") t)
+ ("all" 'all))
magit-status-show-untracked-files))
((not (eq value 'no))))
(magit-insert-files
