diff options
| author | Mike Pall <mike> | 2016-09-19 21:23:35 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2016-09-19 21:23:35 +0200 |
| commit | 4ca39095470ac12fe893662b2dca887c278f0682 (patch) | |
| tree | e7784645984e8f21ec76d734c1bec2ab3272d5f5 | |
| parent | 1a9a26435636c642a83d22d955ba5782e74ef747 (diff) | |
| parent | 8ada57eb49fb03d4d1c3cb37e534b97fbb92a5e6 (diff) | |
| download | luajit-4ca39095470ac12fe893662b2dca887c278f0682.tar.gz luajit-4ca39095470ac12fe893662b2dca887c278f0682.tar.bz2 luajit-4ca39095470ac12fe893662b2dca887c278f0682.zip | |
Merge branch 'master' into v2.1
| -rw-r--r-- | src/jit/dump.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/jit/dump.lua b/src/jit/dump.lua index 1eca12a8..fbadccec 100644 --- a/src/jit/dump.lua +++ b/src/jit/dump.lua | |||
| @@ -653,7 +653,8 @@ end | |||
| 653 | local function dumpon(opt, outfile) | 653 | local function dumpon(opt, outfile) |
| 654 | if active then dumpoff() end | 654 | if active then dumpoff() end |
| 655 | 655 | ||
| 656 | local colormode = os.getenv("COLORTERM") and "A" or "T" | 656 | local term = os.getenv("TERM") |
| 657 | local colormode = (term and term:match("color") or os.getenv("COLORTERM")) and "A" or "T" | ||
| 657 | if opt then | 658 | if opt then |
| 658 | opt = gsub(opt, "[TAH]", function(mode) colormode = mode; return ""; end) | 659 | opt = gsub(opt, "[TAH]", function(mode) colormode = mode; return ""; end) |
| 659 | end | 660 | end |