From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 4 Sep 2020 17:50:57 +0000 (+0200)
Subject: patch 8.2.1592: Vim9: passing "true" to char2nr() fails
X-Git-Tag: v8.2.1592
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24f7750ffa9730579736d779b7cc94faff325fc1;p=vim

patch 8.2.1592: Vim9: passing "true" to char2nr() fails

Problem:    Vim9: passing "true" to char2nr() fails.
Solution:   Use tv_get_bool_chk(). (closes #6865)
---

diff --git a/src/evalfunc.c b/src/evalfunc.c
index ac75a7d56..110935df3 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -1710,7 +1710,7 @@ f_char2nr(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)
 	    rettv->vval.v_number = utf_ptr2char(tv_get_string(&argvars[0]));
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index ad3268af5..3e217300f 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -1339,6 +1339,10 @@ def Test_col()
   assert_equal(5, col([1, '$']))
 enddef
 
+def Test_char2nr()
+  assert_equal(12354, char2nr('あ', true))
+enddef
+
 def Test_getreg_return_type()
   let s1: string = getreg('"')
   let s2: string = getreg('"', 1)
diff --git a/src/version.c b/src/version.c
index 60c62945a..111405fb1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1592,
 /**/
     1591,
 /**/