Skip to content

Commit e3bf65b

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 8829704 commit e3bf65b

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

compat/mingw.c

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2614,9 +2614,20 @@ static void setup_windows_environment(void)
26142614
convert_slashes(tmp);
26152615
}
26162616

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

26212632
/* calculate HOME if not set */
26222633
if (!getenv("HOME")) {

0 commit comments

Comments
 (0)