Mercurial > vim
diff src/evalvars.c @ 22027:ee967cdcf749 v8.2.1563
patch 8.2.1563: Vim9: error when using '%" with setbufvar() r getbufvar()
Commit: https://github.com/vim/vim/commit/6f84b6db10ab86bca85e33f3fc6ee735eec8bbe5
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Sep 1 23:16:32 2020 +0200
patch 8.2.1563: Vim9: error when using '%" with setbufvar() r getbufvar()
Problem: Vim9: error when using '%" with setbufvar() or getbufvar().
Solution: Use tv_get_buf_from_arg(). (closes https://github.com/vim/vim/issues/6816)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 01 Sep 2020 23:30:03 +0200 |
| parents | a98211c3e14e |
| children | 7899b4e2880c |
line wrap: on
line diff
--- a/src/evalvars.c +++ b/src/evalvars.c @@ -3662,10 +3662,8 @@ f_getbufvar(typval_T *argvars, typval_T 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 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 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)