summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/evalvars.c9
-rw-r--r--src/testdir/test_vim9_func.vim3
-rw-r--r--src/version.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/evalvars.c b/src/evalvars.c
index ecd0ce6bd..efab6ab16 100644
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -3662,10 +3662,8 @@ f_getbufvar(typval_T *argvars, typval_T *rettv)
dictitem_T *v;
int done = FALSE;
- (void)tv_get_number(&argvars[0]); // issue errmsg if type error
varname = tv_get_string_chk(&argvars[1]);
- ++emsg_off;
- buf = tv_get_buf(&argvars[0], FALSE);
+ buf = tv_get_buf_from_arg(&argvars[0]);
rettv->v_type = VAR_STRING;
rettv->vval.v_string = NULL;
@@ -3717,8 +3715,6 @@ f_getbufvar(typval_T *argvars, typval_T *rettv)
if (!done && argvars[2].v_type != VAR_UNKNOWN)
// use the default value
copy_tv(&argvars[2], rettv);
-
- --emsg_off;
}
/*
@@ -3789,9 +3785,8 @@ f_setbufvar(typval_T *argvars, typval_T *rettv UNUSED)
if (check_secure())
return;
- (void)tv_get_number(&argvars[0]); // issue errmsg if type error
varname = tv_get_string_chk(&argvars[1]);
- buf = tv_get_buf(&argvars[0], FALSE);
+ buf = tv_get_buf_from_arg(&argvars[0]);
varp = &argvars[2];
if (buf != NULL && varname != NULL && varp != NULL)
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index 057583644..09c84576d 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -1426,6 +1426,9 @@ def Test_setbufvar()
settabwinvar(1, 1, '&ts', 15)
assert_equal(15, &ts)
setlocal ts=8
+
+ setbufvar('%', 'myvar', 123)
+ assert_equal(123, getbufvar('%', 'myvar'))
enddef
def Test_setreg()
diff --git a/src/version.c b/src/version.c
index f2d89f672..d606f1ec9 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 */
/**/
+ 1563,
+/**/
1562,
/**/
1561,