# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1598995803 -7200
# Node ID ee967cdcf749a5286cf169175391b78e4bc8aa5d
# Parent  bb8eb10491b8f5b8c44a1fb47851dbbe61546445
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)

diff --git a/src/evalvars.c b/src/evalvars.c
--- 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)
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
--- 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
--- 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,