1
0
forked from aniani/vim

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)
This commit is contained in:
Bram Moolenaar
2016-01-02 22:03:00 +01:00
parent a3306958dc
commit fa03fd6c4a
2 changed files with 13 additions and 14 deletions

View File

@@ -7700,7 +7700,7 @@ do_highlight(line, forceit, init)
color &= 7; /* truncate to 8 colors */ color &= 7; /* truncate to 8 colors */
} }
else if (t_colors == 16 || t_colors == 88 else if (t_colors == 16 || t_colors == 88
|| t_colors == 256) || t_colors >= 256)
{ {
/* /*
* Guess: if the termcap entry ends in 'm', it is * Guess: if the termcap entry ends in 'm', it is
@@ -7711,18 +7711,15 @@ do_highlight(line, forceit, init)
p = T_CAF; p = T_CAF;
else else
p = T_CSF; p = T_CSF;
if (*p != NUL && *(p + STRLEN(p) - 1) == 'm') if (*p != NUL && (t_colors > 256
switch (t_colors) || *(p + STRLEN(p) - 1) == 'm'))
{ {
case 16: if (t_colors == 88)
color = color_numbers_8[i];
break;
case 88:
color = color_numbers_88[i]; color = color_numbers_88[i];
break; else if (t_colors >= 256)
case 256:
color = color_numbers_256[i]; color = color_numbers_256[i];
break; else
color = color_numbers_8[i];
} }
} }
} }

View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1036,
/**/ /**/
1035, 1035,
/**/ /**/