From 7bd570cd9a510b93e031a84bd6ae45fc38cfaadf Mon Sep 17 00:00:00 2001
From: Nicolas Dumazet <ndumazet@google.com>
Date: Tue, 8 Mar 2016 17:01:47 +0100
Subject: vim-patch:7.4.1511

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

https://github.com/vim/vim/commit/af6e36ff16736106a1bc63bb4d01f51fdfeb29a2
---
 src/nvim/buffer.c  | 2 +-
 src/nvim/version.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 62ab7495da..8f5ae3445e 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -3014,7 +3014,7 @@ int build_stl_str_hl(
           && item[groupitem[groupdepth]].minwid == 0) {
         bool has_normal_items = false;
         for (long n = groupitem[groupdepth] + 1; n < curitem; n++) {
-          if (item[n].type == Normal) {
+          if (item[n].type == Normal || item[n].type == Highlight) {
             has_normal_items = true;
             break;
           }
diff --git a/src/nvim/version.c b/src/nvim/version.c
index d3c07c56ce..b934ac6d47 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -69,6 +69,7 @@ static char *features[] = {
 
 // clang-format off
 static int included_patches[] = {
+  1511,
   1366,
 
   // 1219 NA
-- 
cgit