diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-09-05 18:45:29 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-09-05 18:45:29 +0200 |
| commit | 04637e243d39f791cfc97c3ce96d99ef1bf047e1 (patch) | |
| tree | 9a0b639ceed7fdde69ca0deeaa9c2bfd9e5404c0 | |
| parent | b02628b8a20ad0c42a097207b3b49ae5169d04d7 (diff) | |
| download | vim-git-8.2.1606.tar.gz | |
patch 8.2.1606: Vim9: cannot use "true" with has()v8.2.1606
Problem: Vim9: cannot use "true" with has().
Solution: Use tv_get_bool(). (closes #6876)
| -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 aefb1bf4b..9e384da49 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -4763,7 +4763,7 @@ f_has(typval_T *argvars, typval_T *rettv) } } - if (argvars[1].v_type != VAR_UNKNOWN && tv_get_number(&argvars[1]) != 0) + if (argvars[1].v_type != VAR_UNKNOWN && tv_get_bool(&argvars[1])) // return whether feature could ever be enabled rettv->vval.v_number = x; else diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index eb608c51e..dcc8087f4 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -1516,6 +1516,10 @@ def Test_getcompletion() set wildignore& enddef +def Test_has() + assert_equal(1, has('eval', true)) +enddef + def Fibonacci(n: number): number if n < 2 return n diff --git a/src/version.c b/src/version.c index 69aececd0..70f736d15 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 */ /**/ + 1606, +/**/ 1605, /**/ 1604, |