diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-11-12 22:44:22 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-11-12 22:44:22 +0100 |
| commit | 58e32ab503141e049c0e8c504a379bff8eddffdd (patch) | |
| tree | c5ffb670201e4f8cc86ce6d54caf6c2a999cba45 | |
| parent | 4eb7dae255abc271cf313d4c75839577f1424183 (diff) | |
patch 8.1.2296: text properties are not combined with syntax by defaultv8.1.2296
Problem: Text properties are not combined with syntax by default.
Solution: Make it work as documented. (closes #5190)
| -rw-r--r-- | src/testdir/test_textprop.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
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 @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2296, +/**/ 2295, /**/ 2294, |