From 759d81549c1340185f0d92524c563bb37697ea88 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 26 Apr 2020 16:52:49 +0200 Subject: patch 8.2.0646: t_Co uses the value of $COLORS in the GUI Problem: t_Co uses the value of $COLORS in the GUI. (Masato Nishihata) Solution: Ignore $COLORS for the GUI. (closes #5992) --- src/term.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'src/term.c') diff --git a/src/term.c b/src/term.c index ef91b8fac..f5d5dbc6f 100644 --- a/src/term.c +++ b/src/term.c @@ -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); + } } } -- cgit v1.2.1