diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-09-01 23:16:32 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-09-01 23:16:32 +0200 |
| commit | 6f84b6db10ab86bca85e33f3fc6ee735eec8bbe5 (patch) | |
| tree | 910da8245fbb1832bf346284451556126ab35bab | |
| parent | 3767e3a3302d745349eff8cfe45411f03e13de43 (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)
| -rw-r--r-- | src/evalvars.c | 9 | ||||
| -rw-r--r-- | src/testdir/test_vim9_func.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 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) diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index 0575836443..09c84576de 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 f2d89f6728..d606f1ec92 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, |