diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-03-09 01:33:14 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-03-09 01:33:14 -0500 |
| commit | a40a4e2431ccae5f2855df1ffdbf1c94de681886 (patch) | |
| tree | 43673b0a823b5922f007233c480a65a1c3feac1e | |
| parent | 890ce792af102abe37f24f9674b5924b79fbfa27 (diff) | |
| parent | 7bd570cd9a510b93e031a84bd6ae45fc38cfaadf (diff) | |
| download | rneovim-a40a4e2431ccae5f2855df1ffdbf1c94de681886.tar.gz rneovim-a40a4e2431ccae5f2855df1ffdbf1c94de681886.tar.bz2 rneovim-a40a4e2431ccae5f2855df1ffdbf1c94de681886.zip | |
Merge pull request #4427 from nicdumz/vim-7.4.1511
vim-patch:7.4.1511
| -rw-r--r-- | src/nvim/buffer.c | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 1 |
2 files changed, 2 insertions, 1 deletions
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 |