kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-23 20:55:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4657 from brcolow/vim-7.4.1036

Browse Source 
vim-patch: 7.4.1036
This commit is contained in:
Justin M. Keyes 2016-05-19 09:06:04 -04:00
commit 509089d053
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/nvim/syntax.c
View File

@ -6370,18 +6370,14 @@ do_highlight (
} else
HL_TABLE()[idx].sg_cterm &= ~HL_BOLD;
}
color &= 7; /* truncate to 8 colors */
} else if (t_colors == 16 || t_colors == 88 || t_colors == 256) {
switch (t_colors) {
case 16:
color = color_numbers_8[i];
break;
case 88:
color = color_numbers_88[i];
break;
case 256:
color = color_numbers_256[i];
break;
color &= 7; // truncate to 8 colors
} else if (t_colors == 16 || t_colors == 88 || t_colors >= 256) {
if (t_colors == 88) {
color = color_numbers_88[i];
} else if (t_colors >= 256) {
color = color_numbers_256[i];
} else {
color = color_numbers_8[i];
}
}
}

2
src/nvim/version.c
View File

@ -648,7 +648,7 @@ static int included_patches[] = {
// 1039,
// 1038 NA
1037,
// 1036,
1036,
1035,
// 1034,
// 1033 NA