Merge pull request #4427 from nicdumz/vim-7.4.1511

vim-patch:7.4.1511
This commit is contained in:
Justin M. Keyes 2016-03-09 01:33:14 -05:00
commit a40a4e2431
2 changed files with 2 additions and 1 deletions

View File

@ -3014,7 +3014,7 @@ int build_stl_str_hl(
&& item[groupitem[groupdepth]].minwid == 0) { && item[groupitem[groupdepth]].minwid == 0) {
bool has_normal_items = false; bool has_normal_items = false;
for (long n = groupitem[groupdepth] + 1; n < curitem; n++) { 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; has_normal_items = true;
break; break;
} }

View File

@ -69,6 +69,7 @@ static char *features[] = {
// clang-format off // clang-format off
static int included_patches[] = { static int included_patches[] = {
1511,
1366, 1366,
// 1219 NA // 1219 NA