thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.0646: t_Co uses the value of $COLORS in the GUI

Browse Source 
Problem:    t_Co uses the value of $COLORS in the GUI. (Masato Nishihata)
Solution:   Ignore $COLORS for the GUI. (closes #5992)
This commit is contained in:
Bram Moolenaar
2020-04-26 16:52:49 +02:00
parent 07b761a012
commit 759d81549c
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/term.c
View File

@@ -3122,15 +3122,21 @@ ttest(int pairs)
}
need_gather = TRUE;
// Set t_colors to the value of $COLORS or t_Co.
// Set t_colors to the value of $COLORS or t_Co. Ignore $COLORS in the
// GUI.
t_colors = atoi((char *)T_CCO);
env_colors = mch_getenv((char_u *)"COLORS");
if (env_colors != NULL && isdigit(*env_colors))
#ifdef FEAT_GUI
if (!gui.in_use)
#endif
{
int colors = atoi((char *)env_colors);
env_colors = mch_getenv((char_u *)"COLORS");
if (env_colors != NULL && isdigit(*env_colors))
{
int colors = atoi((char *)env_colors);
if (colors != t_colors)
set_color_count(colors);
if (colors != t_colors)
set_color_count(colors);
}
}
}