diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-09-05 17:51:23 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-09-05 17:51:23 +0200 |
| commit | c08cc72947fdfab484f53c5d9bbea662bc5a9c8f (patch) | |
| tree | a8932d9a70fc31e6e567bba1cf56e776a3104cc1 | |
| parent | 036c2cf719e3de445779a275514030be66e26883 (diff) | |
patch 8.2.1603: Vim9: cannot use "true" with getchar()v8.2.1603
Problem: Vim9: cannot use "true" with getchar().
Solution: use tv_get_bool_chk(). (closes #6874)
| -rw-r--r-- | src/getchar.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/getchar.c b/src/getchar.c index a8778e0c61..4f5ea46390 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -2037,7 +2037,7 @@ f_getchar(typval_T *argvars, typval_T *rettv) if (argvars[0].v_type == VAR_UNKNOWN) // getchar(): blocking wait. n = plain_vgetc(); - else if (tv_get_number_chk(&argvars[0], &error) == 1) + else if (tv_get_bool_chk(&argvars[0], &error)) // getchar(1): only check if char avail n = vpeekc_any(); else if (error || vpeekc_any() == NUL) diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index 7303db997d..3453f44888 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -1505,6 +1505,10 @@ def Test_getbufinfo() bwipe Xtestfile1 Xtestfile2 enddef +def Test_getchar() + assert_equal(0, getchar(true)) +enddef + def Fibonacci(n: number): number if n < 2 return n diff --git a/src/version.c b/src/version.c index 9a58f113c1..7ce5eb2412 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 */ /**/ + 1603, +/**/ 1602, /**/ 1601, |