changeset 18609:efad02c0e3e1 v8.1.2298

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/
author Bram Moolenaar <Bram@vim.org>
date Wed, 13 Nov 2019 16:45:04 +0100
parents 4f57e45eea67
children 3ef71254a154
files src/textprop.c src/version.c
diffstat 2 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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)
 	{
--- 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,