patch 8.2.1572: Vim9: expand() does not take "true" as argument
Problem: Vim9: expand() does not take "true" as argument.
Solution: Use tv_get_bool_chk(). (closes #6819)
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 771e393..69f7816 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -2434,7 +2434,7 @@
rettv->v_type = VAR_STRING;
if (argvars[1].v_type != VAR_UNKNOWN
&& argvars[2].v_type != VAR_UNKNOWN
- && tv_get_number_chk(&argvars[2], &error)
+ && tv_get_bool_chk(&argvars[2], &error)
&& !error)
rettv_list_set(rettv, NULL);
@@ -2458,7 +2458,7 @@
// When the optional second argument is non-zero, don't remove matches
// for 'wildignore' and don't put matches for 'suffixes' at the end.
if (argvars[1].v_type != VAR_UNKNOWN
- && tv_get_number_chk(&argvars[1], &error))
+ && tv_get_bool_chk(&argvars[1], &error))
options |= WILD_KEEP_ALL;
if (!error)
{
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 8f4928a..cf48ba8 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -1497,6 +1497,12 @@
assert_equal(0, count('ABC ABC ABC', 'b', false))
enddef
+def Test_expand()
+ split SomeFile
+ assert_equal(['SomeFile'], expand('%', true, true))
+ close
+enddef
+
def Test_recursive_call()
assert_equal(6765, Fibonacci(20))
enddef
diff --git a/src/version.c b/src/version.c
index 9399221..c674148 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1572,
+/**/
1571,
/**/
1570,