diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-04-26 16:52:49 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-04-26 16:52:49 +0200 |
| commit | 759d81549c1340185f0d92524c563bb37697ea88 (patch) | |
| tree | 910d6ade5a87da555b5fc89906de272fd5953b2c | |
| parent | 07b761a012958ca91fa420f9c86a33675ddca943 (diff) | |
| download | vim-git-759d81549c1340185f0d92524c563bb37697ea88.tar.gz | |
patch 8.2.0646: t_Co uses the value of $COLORS in the GUIv8.2.0646
Problem: t_Co uses the value of $COLORS in the GUI. (Masato Nishihata)
Solution: Ignore $COLORS for the GUI. (closes #5992)
| -rw-r--r-- | src/os_unix.c | 7 | ||||
| -rw-r--r-- | src/term.c | 18 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 15 insertions, 12 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index c6d386b92..66903e081 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -4160,11 +4160,6 @@ set_child_environment( static char envbuf_Servername[60]; # endif # endif - long colors = -# ifdef FEAT_GUI - gui.in_use ? 256*256*256 : -# endif - t_colors; # ifdef HAVE_SETENV setenv("TERM", term, 1); @@ -4174,7 +4169,7 @@ set_child_environment( setenv("LINES", (char *)envbuf, 1); sprintf((char *)envbuf, "%ld", columns); setenv("COLUMNS", (char *)envbuf, 1); - sprintf((char *)envbuf, "%ld", colors); + sprintf((char *)envbuf, "%d", t_colors); setenv("COLORS", (char *)envbuf, 1); # ifdef FEAT_TERMINAL if (is_terminal) 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); + } } } diff --git a/src/version.c b/src/version.c index 392ac1893..16145f2d6 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 646, +/**/ 645, /**/ 644, |