diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-05-05 16:33:47 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-05-05 16:33:47 +0200 |
| commit | 58187f1c8a7095dbe0237a8208fa7f7bc899f246 (patch) | |
| tree | 5bdfe4abf2aef4cc0de1bb6e00643363bde8d17b | |
| parent | 8fc0271e9a5b67b849abb861f630f50e612b330b (diff) | |
| download | vim-git-8.1.1278.tar.gz | |
patch 8.1.1278: missing change for "combine" fieldv8.1.1278
Problem: Missing change for "combine" field.
Solution: Also change the textprop implementation.
| -rw-r--r-- | src/textprop.c | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/textprop.c b/src/textprop.c index 34738adc4..b44810a82 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -733,6 +733,15 @@ prop_type_set(typval_T *argvars, int add) 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); if (di != NULL) 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) dict_add_string(d, "highlight", syn_id2name(prop->pt_hl_id)); 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", (prop->pt_flags & PT_FLAG_INS_START_INCL) ? 1 : 0); dict_add_number(d, "end_incl", diff --git a/src/version.c b/src/version.c index 7930e3c90..0b47695ee 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1278, +/**/ 1277, /**/ 1276, |