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 #7615)

diff --git a/src/evalvars.c b/src/evalvars.c
index 42ff828a549f3bef306c0597f03f49565fa09072..8aac7667d4cffecdbc9cb9557f71de001ce71ca8 100644 (file)
--- 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
index bdae6350a6418f6849f4eecf2c42e06cd59df7f7..da5e782a2ba3b082ce1037e584a7f01f53b63959 100644 (file)
--- 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
index 7be57284fdab6149826c1543d3dd6be00e3c699c..f173735672c5cd0a8e89743eafa2b29db3c2115c 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 */
+/**/
+    2297,
 /**/
     2296,
 /**/