patch 7.4.1511

Problem:    Statusline highlighting is sometimes wrong.
Solution:   Check for Highlight type. (Christian Brabandt)

diff --git a/src/buffer.c b/src/buffer.c
index 26d77236f7c7331ccfcee06dea2add9330f5ea69..9ef8a5082262f08cfb678383410d20626a12bdc7 100644 (file)
--- 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 e2615be189c2d1dc23f43677dfb9f58b54482e61..6141a2e4eb8badbb908b12b12fa4289aaec60b7b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1511,
 /**/
     1510,
 /**/