commit | 39f7aa3c3124065b50f182b1d2f7ac92a0918656 | [log] [tgz] |
---|---|---|
author | Bram Moolenaar <Bram@vim.org> | Mon Aug 31 22:00:05 2020 +0200 |
committer | Bram Moolenaar <Bram@vim.org> | Mon Aug 31 22:00:05 2020 +0200 |
tree | 238fc2ad919f9e66aca9519d9dd30585ae918d2a | |
parent | 7d6979608ee83b06ccfab2589da3047b143defae [diff] [blame] |
patch 8.2.1556: cursorline highlighting always overrules sign highlighting Problem: Cursorline highlighting always overrules sign highlighting. Solution: Combine the highlighting, use the priority to decide how. (closes #6812)
diff --git a/src/version.c b/src/version.c index f5c83be..022c90a 100644 --- a/src/version.c +++ b/src/version.c
@@ -755,6 +755,8 @@ static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1556, +/**/ 1555, /**/ 1554,