aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-11-03 01:17:53 +0100
committerKim Alvefur <zash@zash.se>2017-11-03 01:17:53 +0100
commit772fed8862a33dc06b00550f380fae852f20ff79 (patch)
tree1b26745b4408f42a4919b6f5161132763178f52c
parentdb152d626b282e87090cc6c1c5bf61b13a691b47 (diff)
parent7cd68eaac1feb8b9d06d872c76bc781da1e3e400 (diff)
downloadprosody-772fed8862a33dc06b00550f380fae852f20ff79.tar.gz
prosody-772fed8862a33dc06b00550f380fae852f20ff79.zip
Merge 0.10->trunk
-rw-r--r--util/termcolours.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/util/termcolours.lua b/util/termcolours.lua
index 53633b45..23c9156b 100644
--- a/util/termcolours.lua
+++ b/util/termcolours.lua
@@ -30,7 +30,8 @@ local _ENV = nil;
local stylemap = {
reset = 0; bright = 1, dim = 2, underscore = 4, blink = 5, reverse = 7, hidden = 8;
black = 30; red = 31; green = 32; yellow = 33; blue = 34; magenta = 35; cyan = 36; white = 37;
- ["black background"] = 40; ["red background"] = 41; ["green background"] = 42; ["yellow background"] = 43; ["blue background"] = 44; ["magenta background"] = 45; ["cyan background"] = 46; ["white background"] = 47;
+ ["black background"] = 40; ["red background"] = 41; ["green background"] = 42; ["yellow background"] = 43;
+ ["blue background"] = 44; ["magenta background"] = 45; ["cyan background"] = 46; ["white background"] = 47;
bold = 1, dark = 2, underline = 4, underlined = 4, normal = 0;
}