summaryrefslogtreecommitdiffstats
path: root/src/evalvars.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-09-01 23:16:32 +0200
committerBram Moolenaar <Bram@vim.org>2020-09-01 23:16:32 +0200
commit6f84b6db10ab86bca85e33f3fc6ee735eec8bbe5 (patch)
tree910da8245fbb1832bf346284451556126ab35bab /src/evalvars.c
parent3767e3a3302d745349eff8cfe45411f03e13de43 (diff)
patch 8.2.1563: Vim9: error when using '%" with setbufvar() r getbufvar()v8.2.1563
Problem: Vim9: error when using '%" with setbufvar() or getbufvar(). Solution: Use tv_get_buf_from_arg(). (closes #6816)
Diffstat (limited to 'src/evalvars.c')
-rw-r--r--src/evalvars.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/evalvars.c b/src/evalvars.c
index ecd0ce6bd5..efab6ab163 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)