aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/syntax.c20
-rw-r--r--src/nvim/version.c2
2 files changed, 9 insertions, 13 deletions
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index b04180ad1c..765207928a 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -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];
}
}
}
diff --git a/src/nvim/version.c b/src/nvim/version.c
index a8612e10f9..56ede1aa78 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -648,7 +648,7 @@ static int included_patches[] = {
// 1039,
// 1038 NA
1037,
- // 1036,
+ 1036,
1035,
// 1034,
// 1033 NA