From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 12 Nov 2019 21:44:22 +0000 (+0100)
Subject: patch 8.1.2296: text properties are not combined with syntax by default
X-Git-Tag: v8.1.2296
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58e32ab503141e049c0e8c504a379bff8eddffdd;p=thirdparty%2Fvim.git

patch 8.1.2296: text properties are not combined with syntax by default

Problem:    Text properties are not combined with syntax by default.
Solution:   Make it work as documented. (closes #5190)
---

diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
index 002933d322..467d833497 100644
--- a/src/testdir/test_textprop.vim
+++ b/src/testdir/test_textprop.vim
@@ -681,7 +681,7 @@ func Test_textprop_screenshot_various()
 	\ "call prop_type_add('background', {'highlight': 'BackgroundProp', 'combine': 0})",
 	\ "call prop_type_add('backgroundcomb', {'highlight': 'NumberProp', 'combine': 1})",
 	\ "eval 'backgroundcomb'->prop_type_change({'highlight': 'BackgroundProp'})",
-	\ "call prop_type_add('error', {'highlight': 'UnderlineProp', 'combine': 1})",
+	\ "call prop_type_add('error', {'highlight': 'UnderlineProp'})",
 	\ "call prop_add(1, 4, {'end_lnum': 3, 'end_col': 3, 'type': 'long'})",
 	\ "call prop_add(2, 9, {'length': 3, 'type': 'number'})",
 	\ "call prop_add(2, 24, {'length': 4, 'type': 'number'})",
diff --git a/src/version.c b/src/version.c
index ae85a956a3..314f164a3f 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 */
+/**/
+    2296,
 /**/
     2295,
 /**/