patch 8.2.2284: Vim9: cannot set an option to a boolean value

Problem:    Vim9: cannot set an option to a boolean value.
Solution:   Check for VAR_BOOL. (closes #7603)

diff --git a/src/evalvars.c b/src/evalvars.c
index 7fb190c3db9c6aef5488b340bb4e90f3d72aabba..42b7ef58d70df82bafc2b6586fbd048eb537b3c0 100644 (file)
--- a/src/evalvars.c
+++ b/src/evalvars.c
@@ -3508,7 +3508,9 @@ set_option_from_tv(char_u *varname, typval_T *varp)
     char_u     nbuf[NUMBUFLEN];
     int                error = FALSE;
 
-    if (!in_vim9script() || varp->v_type != VAR_STRING)
+    if (varp->v_type == VAR_BOOL)
+       numval = (long)varp->vval.v_number;
+    else if (!in_vim9script() || varp->v_type != VAR_STRING)
        numval = (long)tv_get_number_chk(varp, &error);
     strval = tv_get_string_buf_chk(varp, nbuf);
     if (!error && strval != NULL)

diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index c86b0df6c489d98e734f9a8b30c673fc5f923826..74031d4d095be3760d0d3741138ecf6be65265a4 100644 (file)
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -652,11 +652,19 @@ def Test_setbufvar()
   &syntax->assert_equal('vim')
   setbufvar(bufnr('%'), '&ts', 16)
   &ts->assert_equal(16)
+  setbufvar(bufnr('%'), '&ai', true)
+  &ai->assert_equal(true)
+  setbufvar(bufnr('%'), '&ft', 'filetype')
+  &ft->assert_equal('filetype')
+
   settabwinvar(1, 1, '&syntax', 'vam')
   &syntax->assert_equal('vam')
   settabwinvar(1, 1, '&ts', 15)
   &ts->assert_equal(15)
   setlocal ts=8
+  settabwinvar(1, 1, '&list', true)
+  &list->assert_equal(true)
+  setlocal list&
 
   setbufvar('%', 'myvar', 123)
   getbufvar('%', 'myvar')->assert_equal(123)

diff --git a/src/version.c b/src/version.c
index 30eac83f886e0b968530dcc4d63811bf20c385e1..cf7964ccbce2cf6ec051325df9942383633425b7 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2284,
 /**/
     2283,
 /**/