commit 0743ef9f8a5b09787e2e0719d96e28e953a79189
author Bram Moolenaar <Bram@vim.org> Wed Nov 13 16:37:31 2019 +0100
committer Bram Moolenaar <Bram@vim.org> Wed Nov 13 16:37:31 2019 +0100
tree df4f34d8fb6c788d74949a75060835262c102a57
parent d6a98a3a9768568b668f91a53267b36f86b84466

patch 8.1.2298: missing part of 8.1.2296

Problem:    Missing part of 8.1.2296.
Solution:   s/test/text/

src/textprop.c

diff --git a/src/textprop.c b/src/textprop.c
index 914b9e0..71d671d 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -749,6 +749,7 @@
 	    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)
 	{

src/version.c

diff --git a/src/version.c b/src/version.c
index 4987b78..d763e4c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2298,
+/**/
     2297,
 /**/
     2296,