Merge branch 'master' into v2.1

This commit is contained in:
Mike Pall 2016-09-19 21:23:35 +02:00
commit 4ca3909547

View File

@ -653,7 +653,8 @@ end
local function dumpon(opt, outfile) local function dumpon(opt, outfile)
if active then dumpoff() end 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 if opt then
opt = gsub(opt, "[TAH]", function(mode) colormode = mode; return ""; end) opt = gsub(opt, "[TAH]", function(mode) colormode = mode; return ""; end)
end end