patch 8.2.1477: Vim9: error when using bufnr('%')

Problem:    Vim9: error when using bufnr('%').
Solution:   Don't give an error for using a string argument. (closes #6723)

diff --git a/src/evalbuffer.c b/src/evalbuffer.c
index df5270a95332571791292906c7cb48001a7ef7e6..2d738f12495c9bf60518d09df64ce233987031ac 100644 (file)
--- a/src/evalbuffer.c
+++ b/src/evalbuffer.c
@@ -390,7 +390,8 @@ f_bufnr(typval_T *argvars, typval_T *rettv)
        buf = curbuf;
     else
     {
-       (void)tv_get_number(&argvars[0]);    // issue errmsg if type error
+       if (argvars[0].v_type != VAR_STRING)
+           (void)tv_get_number(&argvars[0]);    // issue errmsg if type error
        ++emsg_off;
        buf = tv_get_buf(&argvars[0], FALSE);
        --emsg_off;

diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 38d613ae0ba04797aaeeb529e63d25779f0af271..446ee4d03da8c35537ca9692b6d29de2e7c5400c 100644 (file)
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -1315,6 +1315,11 @@ def Test_filter_return_type()
   assert_equal(6, res)
 enddef
 
+def Test_bufnr()
+  let buf = bufnr()
+  assert_equal(buf, bufnr('%'))
+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 734d2ba2ffc0aca3e737b4a9baf9a72b94f410c4..e332c011eddbab1802c990d2771cd0e4dba1e1b7 100644 (file)
--- 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 */
+/**/
+    1477,
 /**/
     1476,
 /**/