diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-09-05 17:30:44 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-09-05 17:30:44 +0200 |
| commit | 2df47310422f4a77e85de7901a5299923a1addd3 (patch) | |
| tree | 9bf3704471a7e350eac404dea284019572bb9888 | |
| parent | 44b4a246b62e0622550b963bcf3034dce3bcfc0c (diff) | |
| download | vim-git-2df47310422f4a77e85de7901a5299923a1addd3.tar.gz | |
patch 8.2.1601: Vim9: cannot use 'true" with garbagecollect()v8.2.1601
Problem: Vim9: cannot use 'true" with garbagecollect().
Solution: Use tv_get_bool(). (closes #6871)
| -rw-r--r-- | src/evalfunc.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_vim9_func.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 1764f414e..aefb1bf4b 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -2936,7 +2936,7 @@ f_garbagecollect(typval_T *argvars, typval_T *rettv UNUSED) // using Lists and Dicts internally. E.g.: ":echo [garbagecollect()]". want_garbage_collect = TRUE; - if (argvars[0].v_type != VAR_UNKNOWN && tv_get_number(&argvars[0]) == 1) + if (argvars[0].v_type != VAR_UNKNOWN && tv_get_bool(&argvars[0]) == 1) garbage_collect_at_exit = TRUE; } diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index 8651ef8eb..7cc323c1e 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -1285,6 +1285,10 @@ def Test_extend_return_type() assert_equal(6, res) enddef +def Test_garbagecollect() + garbagecollect(true) +enddef + def Test_insert_return_type() let l = insert([2, 1], 3) let res = 0 diff --git a/src/version.c b/src/version.c index 8ebf9a716..ab9c0c41d 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 */ /**/ + 1601, +/**/ 1600, /**/ 1599, |