diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-01-03 14:47:25 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-01-03 14:47:25 +0100 |
| commit | 31a201a04aa95708af5d62070d2d397a201cc1a5 (patch) | |
| tree | 9aeafa7c1a327d786357f79578162bfc83764030 | |
| parent | e68b02a1c40388bbb85e7b825bc538298963e1e1 (diff) | |
| download | vim-git-31a201a04aa95708af5d62070d2d397a201cc1a5.tar.gz | |
patch 8.2.2284: Vim9: cannot set an option to a boolean valuev8.2.2284
Problem: Vim9: cannot set an option to a boolean value.
Solution: Check for VAR_BOOL. (closes #7603)
| -rw-r--r-- | src/evalvars.c | 4 | ||||
| -rw-r--r-- | src/testdir/test_vim9_builtin.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/src/evalvars.c b/src/evalvars.c index 7fb190c3d..42b7ef58d 100644 --- 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 c86b0df6c..74031d4d0 100644 --- 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 30eac83f8..cf7964ccb 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2284, +/**/ 2283, /**/ 2282, |