# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1573595106 -3600
# Node ID 63d855ad505c9fd8dcb60524016e9674cfb046c9
# Parent  06e161213e8830326daaaca574853c9292ee97fe
patch 8.1.2296: text properties are not combined with syntax by default

Commit: https://github.com/vim/vim/commit/58e32ab503141e049c0e8c504a379bff8eddffdd
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Nov 12 22:44:22 2019 +0100

    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 https://github.com/vim/vim/issues/5190)

diff --git a/src/testdir/test_textprop.vim b/src/testdir/test_textprop.vim
--- 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
--- 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 */
 /**/
+    2296,
+/**/
     2295,
 /**/
     2294,