aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

patch 8.1.1278: missing change for "combine" field

Browse Source 
Problem:    Missing change for "combine" field.
Solution:   Also change the textprop implementation.
This commit is contained in:
Bram Moolenaar
2019-05-05 16:33:47 +02:00
parent 8fc0271e9a
commit 58187f1c8a
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/textprop.c
View File

@@ -733,6 +733,15 @@ prop_type_set(typval_T *argvars, int add)
prop->pt_hl_id = hl_id; prop->pt_hl_id = hl_id;
} }
di = dict_find(dict, (char_u *)"combine", -1);
if (di != NULL)
{
if (tv_get_number(&di->di_tv))
prop->pt_flags |= PT_FLAG_COMBINE;
else
prop->pt_flags &= ~PT_FLAG_COMBINE;
}
di = dict_find(dict, (char_u *)"priority", -1); di = dict_find(dict, (char_u *)"priority", -1);
if (di != NULL) if (di != NULL)
prop->pt_priority = tv_get_number(&di->di_tv); prop->pt_priority = tv_get_number(&di->di_tv);
@@ -845,6 +854,8 @@ f_prop_type_get(typval_T *argvars, typval_T *rettv UNUSED)
if (prop->pt_hl_id > 0) if (prop->pt_hl_id > 0)
dict_add_string(d, "highlight", syn_id2name(prop->pt_hl_id)); dict_add_string(d, "highlight", syn_id2name(prop->pt_hl_id));
dict_add_number(d, "priority", prop->pt_priority); dict_add_number(d, "priority", prop->pt_priority);
dict_add_number(d, "combine",
(prop->pt_flags & PT_FLAG_COMBINE) ? 1 : 0);
dict_add_number(d, "start_incl", dict_add_number(d, "start_incl",
(prop->pt_flags & PT_FLAG_INS_START_INCL) ? 1 : 0); (prop->pt_flags & PT_FLAG_INS_START_INCL) ? 1 : 0);
dict_add_number(d, "end_incl", dict_add_number(d, "end_incl",

2
src/version.c
View File

@@ -767,6 +767,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 */
/**/
1278,
/**/ /**/
1277, 1277,
/**/ /**/