summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-03-08 12:56:33 +0100
committerBram Moolenaar <Bram@vim.org>2016-03-08 12:56:33 +0100
commitaf6e36ff16736106a1bc63bb4d01f51fdfeb29a2 (patch)
tree12d4c87c4da420415f12f7cc0bc8b881d3eeed2e
parent5f148ec0b5a6cedd9129b3abac351034b83cc4f7 (diff)
patch 7.4.1511v7.4.1511
Problem: Statusline highlighting is sometimes wrong. Solution: Check for Highlight type. (Christian Brabandt)
-rw-r--r--src/buffer.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/buffer.c b/src/buffer.c
index 26d77236f7..9ef8a50822 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3722,7 +3722,7 @@ build_stl_str_hl(
{
/* remove group if all items are empty */
for (n = groupitem[groupdepth] + 1; n < curitem; n++)
- if (item[n].type == Normal)
+ if (item[n].type == Normal || item[n].type == Highlight)
break;
if (n == curitem)
{
diff --git a/src/version.c b/src/version.c
index e2615be189..6141a2e4eb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1511,
+/**/
1510,
/**/
1509,