diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-09-05 21:00:00 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-09-05 21:00:00 +0200 |
| commit | fa2e38df76b3e0919dc01dd1836257dce0ba62b1 (patch) | |
| tree | a8b9b8b6a6340e834ba01e15711b83c866ccf728 | |
| parent | a5a40c569695a750cace7d29824101ec8ef2b48f (diff) | |
patch 8.2.1613: Vim9: cannot pass "true" to prop_type_add()v8.2.1613
Problem: Vim9: cannot pass "true" to prop_type_add().
Solution: Use tv_get_bool(). (closes #6850)
| -rw-r--r-- | src/testdir/test_textprop.vim | 11 | ||||
| -rw-r--r-- | src/textprop.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 16 insertions, 3 deletions
diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim index f7718124b3..99ca31a378 100644 --- 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() diff --git a/src/textprop.c b/src/textprop.c index c291a295fe..639c5df8a1 100644 --- 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; diff --git a/src/version.c b/src/version.c index 34516ac769..4b9100cc45 100644 --- 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, |