diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-09-02 21:53:11 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-09-02 21:53:11 +0200 |
| commit | 5892ea151197c8a6363c7ce2322d84277b97353e (patch) | |
| tree | e1e00a4ad4c3cb97dd1c6174e871fa2d5ce112f1 | |
| parent | 67ff97ded70a87bc77f58d0bf9a261710ae88112 (diff) | |
patch 8.2.1574: Vim9: glob() doesnot take "true" as argumentv8.2.1574
Problem: Vim9: glob() doesnot take "true" as argument.
Solution: Use tv_get_bool_chk(). (closes #6821)
| -rw-r--r-- | src/filepath.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_vim9_func.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/filepath.c b/src/filepath.c index e4798d2a04..9f05434f5d 100644 --- a/src/filepath.c +++ b/src/filepath.c @@ -1174,14 +1174,14 @@ f_glob(typval_T *argvars, typval_T *rettv) rettv->v_type = VAR_STRING; if (argvars[1].v_type != VAR_UNKNOWN) { - if (tv_get_number_chk(&argvars[1], &error)) + if (tv_get_bool_chk(&argvars[1], &error)) options |= WILD_KEEP_ALL; if (argvars[2].v_type != VAR_UNKNOWN) { - if (tv_get_number_chk(&argvars[2], &error)) + if (tv_get_bool_chk(&argvars[2], &error)) rettv_list_set(rettv, NULL); if (argvars[3].v_type != VAR_UNKNOWN - && tv_get_number_chk(&argvars[3], &error)) + && tv_get_bool_chk(&argvars[3], &error)) options |= WILD_ALLLINKS; } } diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index 8d8e0d48ea..ac676803f8 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -1509,6 +1509,10 @@ def Test_getreg() assert_equal(lines, getreg('a', true, true)) enddef +def Test_glob() + assert_equal(['runtest.vim'], glob('runtest.vim', true, true, true)) +enddef + def Test_recursive_call() assert_equal(6765, Fibonacci(20)) enddef diff --git a/src/version.c b/src/version.c index 886cd4ef41..5761f832e5 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1574, +/**/ 1573, /**/ 1572, |