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
index 914b9e098bcb319db025d5212bbf18dc44f08586..71d671d6b8c7f7f62df4657fc536a2e7839a0acd 100644 (file)
--- 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 4987b784f564daa8d1ef9980f7f58a98f9b0d04b..d763e4c60011aa8532c18621db4705bd80914250 100644 (file)
--- 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,
 /**/