Skip to content

Commit 95095ad

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 e0054c2 commit 95095ad

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
@@ -2617,9 +2617,20 @@ static void setup_windows_environment(void)
26172617
convert_slashes(tmp);
26182618
}
26192619

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

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

0 commit comments

Comments
 (0)