From f39397e515067d5a314be99778e63fe0acf93c51 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 17 Aug 2020 22:21:36 +0200 Subject: [PATCH] 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) --- src/evalbuffer.c | 3 ++- src/testdir/test_vim9_func.vim | 5 +++++ src/version.c | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/evalbuffer.c b/src/evalbuffer.c index df5270a95..2d738f124 100644 --- 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 38d613ae0..446ee4d03 100644 --- 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 734d2ba2f..e332c011e 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 */ +/**/ + 1477, /**/ 1476, /**/ -- 2.40.0