summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-09-05 20:29:41 +0200
committerBram Moolenaar <Bram@vim.org>2020-09-05 20:29:41 +0200
commited6a430fae72c077ec106c9620379b69cfec3035 (patch)
tree3d39b63491993a9254ad79f2c63ca297f1c22265
parenta48f786787e8e070c1a611146fd1f0f7e141e60a (diff)
patch 8.2.1611: Vim9: cannot pass "true" to nr2char()v8.2.1611
Problem: Vim9: cannot pass "true" to nr2char(). Solution: use tv_get_bool_chk(). (closes #6878)
-rw-r--r--src/evalfunc.c2
-rw-r--r--src/testdir/test_vim9_func.vim4
-rw-r--r--src/version.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c
index b4e4220412..2a8281230e 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -5874,7 +5874,7 @@ f_nr2char(typval_T *argvars, typval_T *rettv)
int utf8 = 0;
if (argvars[1].v_type != VAR_UNKNOWN)
- utf8 = (int)tv_get_number_chk(&argvars[1], NULL);
+ utf8 = (int)tv_get_bool_chk(&argvars[1], NULL);
if (utf8)
buf[utf_char2bytes((int)tv_get_number(&argvars[0]), buf)] = NUL;
else
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 84fc7c9557..b3b6b32251 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -1529,6 +1529,10 @@ def Test_list2str_str2list_utf8()
assert_equal(s, list2str(l, true))
enddef
+def Test_nr2char()
+ assert_equal('a', nr2char(97, true))
+enddef
+
def Fibonacci(n: number): number
if n < 2
return n
diff --git a/src/version.c b/src/version.c
index a8cf1680a3..bcece94d53 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 */
/**/
+ 1611,
+/**/
1610,
/**/
1609,