[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-690-ga376dc0

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a376dc0290cc0086e1c13b816b6e0975b44874ed (commit)
       via  c6d75294b2827a7f24baed4814046d9d0bd6a61d (commit)
       via  9c6a7203fb0c6034771011a8ac58ae447726b919 (commit)
      from  a478b43f4f505b79ff41b2068c70fcfc588f5336 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a376dc0290cc0086e1c13b816b6e0975b44874ed
commit a376dc0290cc0086e1c13b816b6e0975b44874ed
Merge: a478b43 c6d7529
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 19 09:17:03 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 19 09:17:03 2015 -0400

    Merge topic 'update-kwsys' into next
    
    c6d75294 Merge branch 'upstream-kwsys' into update-kwsys
    9c6a7203 KWSys 2015-10-16 (a7e5360f)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6d75294b2827a7f24baed4814046d9d0bd6a61d
commit c6d75294b2827a7f24baed4814046d9d0bd6a61d
Merge: bf7d21b 9c6a720
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 19 09:16:32 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 19 09:16:32 2015 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c6a7203fb0c6034771011a8ac58ae447726b919
commit 9c6a7203fb0c6034771011a8ac58ae447726b919
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Fri Oct 16 09:04:33 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 19 09:16:26 2015 -0400

    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

diff --git a/Terminal.c b/Terminal.c
index d13f79a..a8abb6c 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)

-----------------------------------------------------------------------

Summary of changes:
 Source/kwsys/Terminal.c |   11 +++++++++++
 1 file changed, 11 insertions(+)


hooks/post-receive
-- 
CMake