From fa03fd6c4a9fe05274d62ddefd645cb5801d2023 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 2 Jan 2016 22:03:00 +0100 Subject: patch 7.4.1036 Problem: Only terminals with up to 256 colors work properly. Solution: Use the 256 color behavior for all terminals with 256 or more colors. (Robert de Bath, closes #504) --- src/syntax.c | 25 +++++++++++-------------- src/version.c | 2 ++ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/syntax.c b/src/syntax.c index a16715a957..ae3a88a61a 100644 --- a/src/syntax.c +++ b/src/syntax.c @@ -7700,7 +7700,7 @@ do_highlight(line, forceit, init) color &= 7; /* truncate to 8 colors */ } else if (t_colors == 16 || t_colors == 88 - || t_colors == 256) + || t_colors >= 256) { /* * Guess: if the termcap entry ends in 'm', it is @@ -7711,19 +7711,16 @@ do_highlight(line, forceit, init) p = T_CAF; else p = T_CSF; - if (*p != NUL && *(p + STRLEN(p) - 1) == 'm') - 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; - } + if (*p != NUL && (t_colors > 256 + || *(p + STRLEN(p) - 1) == 'm')) + { + 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/version.c b/src/version.c index 49eebc12cc..48c848529b 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1036, /**/ 1035, /**/ -- cgit v1.2.3