aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.1613: Vim9: cannot pass "true" to prop_type_add()

Browse Source 
Problem:    Vim9: cannot pass "true" to prop_type_add().
Solution:   Use tv_get_bool(). (closes #6850)
This commit is contained in:
Bram Moolenaar 2020-09-05 21:00:00 +02:00
parent a5a40c5696
commit fa2e38df76
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/testdir/test_textprop.vim
View File

@ -321,6 +321,17 @@ func Test_prop_remove()
bwipe! bwipe!
endfunc 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() def Test_prop_remove_vim9()
new new
call AddPropTypes() call AddPropTypes()

6
src/textprop.c
View File

@ -1007,7 +1007,7 @@ prop_type_set(typval_T *argvars, int add)
di = dict_find(dict, (char_u *)"combine", -1); di = dict_find(dict, (char_u *)"combine", -1);
if (di != NULL) if (di != NULL)
{ {
if (tv_get_number(&di->di_tv)) if (tv_get_bool(&di->di_tv))
prop->pt_flags |= PT_FLAG_COMBINE; prop->pt_flags |= PT_FLAG_COMBINE;
else else
prop->pt_flags &= ~PT_FLAG_COMBINE; 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); di = dict_find(dict, (char_u *)"start_incl", -1);
if (di != NULL) 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; prop->pt_flags |= PT_FLAG_INS_START_INCL;
else else
prop->pt_flags &= ~PT_FLAG_INS_START_INCL; 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); di = dict_find(dict, (char_u *)"end_incl", -1);
if (di != NULL) 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; prop->pt_flags |= PT_FLAG_INS_END_INCL;
else else
prop->pt_flags &= ~PT_FLAG_INS_END_INCL; prop->pt_flags &= ~PT_FLAG_INS_END_INCL;

2
src/version.c
View File

@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1613,
/**/ /**/
1612, 1612,
/**/ /**/