# HG changeset patch # User Bram Moolenaar # Date 1609764304 -3600 # Node ID 18f3dc6974af50b0bbb2bb32944f34675d160855 # Parent 66c2449bef2e2574c688aeab1e7db9035019b213 patch 8.2.2297: Vim9: cannot set 'number' to a boolean value Commit: https://github.com/vim/vim/commit/0ea04408653be843e37d03ce574f5d2eae682339 Author: Bram Moolenaar Date: Mon Jan 4 13:37:54 2021 +0100 patch 8.2.2297: Vim9: cannot set 'number' to a boolean value Problem: Vim9: cannot set 'number' to a boolean value. Solution: Use tv_get_bool(). (closes https://github.com/vim/vim/issues/7615) diff --git a/src/evalvars.c b/src/evalvars.c --- a/src/evalvars.c +++ b/src/evalvars.c @@ -1370,8 +1370,14 @@ ex_let_one( || opt_type == gov_hidden_bool || opt_type == gov_hidden_number) && (tv->v_type != VAR_STRING || !in_vim9script())) - // number, possibly hidden - n = (long)tv_get_number(tv); + { + if (opt_type == gov_bool || opt_type == gov_hidden_bool) + // bool, possibly hidden + n = (long)tv_get_bool(tv); + else + // number, possibly hidden + n = (long)tv_get_number(tv); + } // Avoid setting a string option to the text "v:false" or similar. // In Vim9 script also don't convert a number to string. diff --git a/src/testdir/test_vim9_assign.vim b/src/testdir/test_vim9_assign.vim --- a/src/testdir/test_vim9_assign.vim +++ b/src/testdir/test_vim9_assign.vim @@ -161,6 +161,15 @@ def Test_assignment() assert_equal(6, &g:ts) &g:ts += 2 assert_equal(8, &g:ts) + + &number = true + assert_equal(true, &number) + &number = 0 + assert_equal(false, &number) + &number = 1 + assert_equal(true, &number) + &number = false + assert_equal(false, &number) END CheckDefAndScriptSuccess(lines) diff --git a/src/version.c b/src/version.c --- 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 */ /**/ + 2297, +/**/ 2296, /**/ 2295,