Skip to content

Commit e5608f0

Browse files
rkitoverdscho
authored andcommitted
mingw: $env:TERM="xterm-256color" for newer OSes
For Windows builds >= 15063 set $env:TERM to "xterm-256color" instead of "cygwin" because they have a more capable console system that supports this. Also set $env:COLORTERM="truecolor" if unset. $env:TERM is initialized so that ANSI colors in color.c work, see 29a3963 (Win32: patch Windows environment on startup, 2012-01-15). See #3629 regarding problems caused by always setting $env:TERM="cygwin". This is the same heuristic used by the Cygwin runtime. Signed-off-by: Rafael Kitover <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 787bfe4 commit e5608f0

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

compat/mingw.c

+14-3
Original file line numberDiff line numberDiff line change
@@ -2618,9 +2618,20 @@ static void setup_windows_environment(void)
26182618
convert_slashes(tmp);
26192619
}
26202620

2621-
/* simulate TERM to enable auto-color (see color.c) */
2622-
if (!getenv("TERM"))
2623-
setenv("TERM", "cygwin", 1);
2621+
2622+
/*
2623+
* Make sure TERM is set up correctly to enable auto-color
2624+
* (see color.c .) Use "cygwin" for older OS releases which
2625+
* works correctly with MSYS2 utilities on older consoles.
2626+
*/
2627+
if (!getenv("TERM")) {
2628+
if ((GetVersion() >> 16) < 15063)
2629+
setenv("TERM", "cygwin", 0);
2630+
else {
2631+
setenv("TERM", "xterm-256color", 0);
2632+
setenv("COLORTERM", "truecolor", 0);
2633+
}
2634+
}
26242635

26252636
/* calculate HOME if not set */
26262637
if (!getenv("HOME")) {

0 commit comments

Comments
 (0)