diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-11-13 16:37:31 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-11-13 16:37:31 +0100 |
| commit | 0743ef9f8a5b09787e2e0719d96e28e953a79189 (patch) | |
| tree | df4f34d8fb6c788d74949a75060835262c102a57 | |
| parent | d6a98a3a9768568b668f91a53267b36f86b84466 (diff) | |
patch 8.1.2298: missing part of 8.1.2296v8.1.2298
Problem: Missing part of 8.1.2296.
Solution: s/test/text/
| -rw-r--r-- | src/textprop.c | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/textprop.c b/src/textprop.c index 914b9e098b..71d671d6b8 100644 --- a/src/textprop.c +++ b/src/textprop.c @@ -749,6 +749,7 @@ prop_type_set(typval_T *argvars, int add) return; STRCPY(prop->pt_name, name); prop->pt_id = ++proptype_id; + prop->pt_flags = PT_FLAG_COMBINE; htp = buf == NULL ? &global_proptypes : &buf->b_proptypes; if (*htp == NULL) { diff --git a/src/version.c b/src/version.c index 4987b784f5..d763e4c600 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2298, +/**/ 2297, /**/ 2296, |