Mercurial > vim
changeset 23483:ce7d6b461660 v8.2.2284
patch 8.2.2284: Vim9: cannot set an option to a boolean value
Commit: https://github.com/vim/vim/commit/31a201a04aa95708af5d62070d2d397a201cc1a5
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jan 3 14:47:25 2021 +0100
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 https://github.com/vim/vim/issues/7603)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 03 Jan 2021 15:00:04 +0100 |
| parents | bcb2ec1434b6 |
| children | bf49220e07b2 |
| files | src/evalvars.c src/testdir/test_vim9_builtin.vim src/version.c |
| diffstat | 3 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalvars.c +++ b/src/evalvars.c @@ -3508,7 +3508,9 @@ set_option_from_tv(char_u *varname, typv 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)
--- 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)