Merge branch 'master' into v2.1

lukego · Sep 19, 2016 · 4ca3909 · 4ca3909
2 parents 1a9a264 + 8ada57e
commit 4ca3909
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/jit/dump.lua b/src/jit/dump.lua
@@ -653,7 +653,8 @@ end
 local function dumpon(opt, outfile)
   if active then dumpoff() end
 
-  local colormode = os.getenv("COLORTERM") and "A" or "T"
+  local term = os.getenv("TERM")
+  local colormode = (term and term:match("color") or os.getenv("COLORTERM")) and "A" or "T"
   if opt then
     opt = gsub(opt, "[TAH]", function(mode) colormode = mode; return ""; end)
   end