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 002933d322caadf130f27523d97bfa2f5ecd3c9c..467d833497ef5b7953a4c559cfac8dc7b9cbf47e 100644 (file)
--- 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 ae85a956a3e11214a33d1ed00dfdc871a33384eb..314f164a3fe43e818106fd78d6adf3f182eddcce 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 */
+/**/
+    2296,
 /**/
     2295,
 /**/