# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1573659904 -3600
# Node ID efad02c0e3e1c39561c5e55eccf8f8eccafaa9ed
# Parent  4f57e45eea67a923306da3a8b1f9c424c8447f20
patch 8.1.2298: missing part of 8.1.2296

Commit: https://github.com/vim/vim/commit/0743ef9f8a5b09787e2e0719d96e28e953a79189
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Nov 13 16:37:31 2019 +0100

    patch 8.1.2298: missing part of 8.1.2296

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

diff --git a/src/textprop.c b/src/textprop.c
--- 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
--- 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,