KWSys 2015-10-16 (a7e5360f)
Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ a7e5360f | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' ed82989c..a7e5360f Jan Niklas Hasse (1): a7e5360f Terminal: Force color output when CLICOLOR_FORCE is set != 0
This commit is contained in:
parent
13c22d280e
commit
9c6a7203fb
11
Terminal.c
11
Terminal.c
|
@ -184,14 +184,25 @@ static const char* kwsysTerminalVT100Names[] =
|
||||||
static int kwsysTerminalStreamIsVT100(FILE* stream, int default_vt100,
|
static int kwsysTerminalStreamIsVT100(FILE* stream, int default_vt100,
|
||||||
int default_tty)
|
int default_tty)
|
||||||
{
|
{
|
||||||
|
/* Force color according to http://bixense.com/clicolors/ convention. */
|
||||||
|
{
|
||||||
|
const char* clicolor_force = getenv("CLICOLOR_FORCE");
|
||||||
|
if (clicolor_force && *clicolor_force && strcmp(clicolor_force, "0") != 0)
|
||||||
|
{
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* If running inside emacs the terminal is not VT100. Some emacs
|
/* If running inside emacs the terminal is not VT100. Some emacs
|
||||||
seem to claim the TERM is xterm even though they do not support
|
seem to claim the TERM is xterm even though they do not support
|
||||||
VT100 escapes. */
|
VT100 escapes. */
|
||||||
|
{
|
||||||
const char* emacs = getenv("EMACS");
|
const char* emacs = getenv("EMACS");
|
||||||
if(emacs && *emacs == 't')
|
if(emacs && *emacs == 't')
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* Check for a valid terminal. */
|
/* Check for a valid terminal. */
|
||||||
if(!default_vt100)
|
if(!default_vt100)
|
||||||
|
|
Loading…
Reference in New Issue