From 9c6a7203fb0c6034771011a8ac58ae447726b919 Mon Sep 17 00:00:00 2001
From: KWSys Robot <kwrobot@kitware.com>
Date: Fri, 16 Oct 2015 09:04:33 -0400
Subject: [PATCH] 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
---
 Terminal.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Terminal.c b/Terminal.c
index d13f79ad7..a8abb6cc6 100644
--- a/Terminal.c
+++ b/Terminal.c
@@ -184,14 +184,25 @@ static const char* kwsysTerminalVT100Names[] =
 static int kwsysTerminalStreamIsVT100(FILE* stream, int default_vt100,
                                       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
      seem to claim the TERM is xterm even though they do not support
      VT100 escapes.  */
+  {
   const char* emacs = getenv("EMACS");
   if(emacs && *emacs == 't')
     {
     return 0;
     }
+  }
 
   /* Check for a valid terminal.  */
   if(!default_vt100)