Skip to content

Commit cf8a25a

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 de30fb5 commit cf8a25a

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
@@ -2626,9 +2626,20 @@ static void setup_windows_environment(void)
26262626
convert_slashes(tmp);
26272627
}
26282628

2629-
/* simulate TERM to enable auto-color (see color.c) */
2630-
if (!getenv("TERM"))
2631-
setenv("TERM", "cygwin", 1);
2629+
2630+
/*
2631+
* Make sure TERM is set up correctly to enable auto-color
2632+
* (see color.c .) Use "cygwin" for older OS releases which
2633+
* works correctly with MSYS2 utilities on older consoles.
2634+
*/
2635+
if (!getenv("TERM")) {
2636+
if ((GetVersion() >> 16) < 15063)
2637+
setenv("TERM", "cygwin", 0);
2638+
else {
2639+
setenv("TERM", "xterm-256color", 0);
2640+
setenv("COLORTERM", "truecolor", 0);
2641+
}
2642+
}
26322643

26332644
/* calculate HOME if not set */
26342645
if (!getenv("HOME")) {

0 commit comments

Comments
 (0)