changeset 22127:9d3dfd420a45 v8.2.1613

patch 8.2.1613: Vim9: cannot pass "true" to prop_type_add() Commit: https://github.com/vim/vim/commit/fa2e38df76b3e0919dc01dd1836257dce0ba62b1 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Sep 5 21:00:00 2020 +0200 patch 8.2.1613: Vim9: cannot pass "true" to prop_type_add() Problem: Vim9: cannot pass "true" to prop_type_add(). Solution: Use tv_get_bool(). (closes https://github.com/vim/vim/issues/6850)
author Bram Moolenaar <Bram@vim.org>
date Sat, 05 Sep 2020 21:15:04 +0200
parents 4d6795e03a8d
children cee113d6f754
files src/testdir/test_textprop.vim src/textprop.c src/version.c
diffstat 3 files changed, 16 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -321,6 +321,17 @@ func Test_prop_remove()
   bwipe!
 endfunc
 
+def Test_prop_add_vim9()
+  prop_type_add('comment', #{
+      highlight: 'Directory',
+      priority: 123,
+      start_incl: true,
+      end_incl: true,
+      combine: false,
+    })
+  prop_type_delete('comment')
+enddef
+
 def Test_prop_remove_vim9()
   new
   call AddPropTypes()
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1007,7 +1007,7 @@ prop_type_set(typval_T *argvars, int add
 	di = dict_find(dict, (char_u *)"combine", -1);
 	if (di != NULL)
 	{
-	    if (tv_get_number(&di->di_tv))
+	    if (tv_get_bool(&di->di_tv))
 		prop->pt_flags |= PT_FLAG_COMBINE;
 	    else
 		prop->pt_flags &= ~PT_FLAG_COMBINE;
@@ -1020,7 +1020,7 @@ prop_type_set(typval_T *argvars, int add
 	di = dict_find(dict, (char_u *)"start_incl", -1);
 	if (di != NULL)
 	{
-	    if (tv_get_number(&di->di_tv))
+	    if (tv_get_bool(&di->di_tv))
 		prop->pt_flags |= PT_FLAG_INS_START_INCL;
 	    else
 		prop->pt_flags &= ~PT_FLAG_INS_START_INCL;
@@ -1029,7 +1029,7 @@ prop_type_set(typval_T *argvars, int add
 	di = dict_find(dict, (char_u *)"end_incl", -1);
 	if (di != NULL)
 	{
-	    if (tv_get_number(&di->di_tv))
+	    if (tv_get_bool(&di->di_tv))
 		prop->pt_flags |= PT_FLAG_INS_END_INCL;
 	    else
 		prop->pt_flags &= ~PT_FLAG_INS_END_INCL;
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1613,
+/**/
     1612,
 /**/
     1611,