Mercurial > vim
changeset 16549:08557bad0b9d v8.1.1278
patch 8.1.1278: missing change for "combine" field
commit https://github.com/vim/vim/commit/58187f1c8a7095dbe0237a8208fa7f7bc899f246
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun May 5 16:33:47 2019 +0200
patch 8.1.1278: missing change for "combine" field
Problem: Missing change for "combine" field.
Solution: Also change the textprop implementation.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 05 May 2019 16:45:05 +0200 |
| parents | 37e39c5ddf12 |
| children | 0352bcc175cb |
| files | src/textprop.c src/version.c |
| diffstat | 2 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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, typva 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",