| commit | de24a8701328b1cce7cad0ee11b415369b482420 | [log] [tgz] |
|---|---|---|
| author | Bram Moolenaar <Bram@vim.org> | Sun May 05 15:48:00 2019 +0200 |
| committer | Bram Moolenaar <Bram@vim.org> | Sun May 05 15:48:00 2019 +0200 |
| tree | 9b5cef424fb7aafb173240dfc41e6d62afdeb3d0 | |
| parent | cf6a55c4b0cbf38b0c3fbed5ffd9a3fd0d2ede0e [diff] [blame] |
patch 8.1.1276: cannot combine text properties with syntax highlighting Problem: Cannot combine text properties with syntax highlighting. Solution: Add the "combine" field to prop_type_add(). (closes #4343)
diff --git a/src/version.c b/src/version.c index 6838624..3e2f472 100644 --- a/src/version.c +++ b/src/version.c
@@ -768,6 +768,8 @@ static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1276, +/**/ 1275, /**/ 1274,