0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

patch 8.0.1174: Mac Terminal.app has wrong color for white

Problem:    Mac Terminal.app has wrong color for white.
Solution:   Use white from the color cube.
This commit is contained in:
Bram Moolenaar 2017-10-04 18:04:16 +02:00
parent 19a3d68b2c
commit a0a6f2776e
4 changed files with 12 additions and 0 deletions

View File

@ -380,6 +380,9 @@ EXTERN int cterm_normal_bg_color INIT(= 0);
EXTERN guicolor_T cterm_normal_fg_gui_color INIT(= INVALCOLOR);
EXTERN guicolor_T cterm_normal_bg_gui_color INIT(= INVALCOLOR);
#endif
#ifdef FEAT_TERMRESPONSE
EXTERN int is_mac_terminal INIT(= FALSE); /* recognized Terminal.app */
#endif
#ifdef FEAT_AUTOCMD
EXTERN int autocmd_busy INIT(= FALSE); /* Is apply_autocmds() busy? */

View File

@ -7350,6 +7350,10 @@ lookup_color(int idx, int foreground, int *boldp)
else
color = color_numbers_8[idx];
}
if (t_colors >= 256 && color == 15 && is_mac_terminal)
/* Terminal.app has a bug: 15 is light grey. Use white
* from the color cube instead. */
color = 231;
}
return color;
}

View File

@ -4557,7 +4557,10 @@ check_termcode(
/* Mac Terminal.app sends 1;95;0 */
if (version == 95
&& STRNCMP(tp + extra - 2, "1;95;0c", 7) == 0)
{
is_not_xterm = TRUE;
is_mac_terminal = TRUE;
}
/* Gnome terminal sends 1;3801;0, 1;4402;0 or 1;2501;0.
* xfce4-terminal sends 1;2802;0.

View File

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