From 0743ef9f8a5b09787e2e0719d96e28e953a79189 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 13 Nov 2019 16:37:31 +0100
Subject: patch 8.1.2298: missing part of 8.1.2296

Problem:    Missing part of 8.1.2296.
Solution:   s/test/text/
---
 src/textprop.c | 1 +
 src/version.c  | 2 ++
 2 files changed, 3 insertions(+)

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
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2298,
 /**/
     2297,
 /**/
-- 
cgit v1.2.3