From c444f032e43611b95612882cd06380866f8da0fd Mon Sep 17 00:00:00 2001 From: Eyal Soha Date: Tue, 21 Jan 2020 08:56:23 -0800 Subject: color.c: alias RGB colors 8-15 to aixterm colors This results in shorter output, and is _probably_ more portable. There is at least one environment (GitHub Actions) which supports 16-color mode but not 256-color mode. It's possible there are environments which go the other way, but it seems unlikely. Signed-off-by: Eyal Soha Signed-off-by: Junio C Hamano --- color.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'color.c') diff --git a/color.c b/color.c index 0c0ec4672f..64f52a4f93 100644 --- a/color.c +++ b/color.c @@ -136,11 +136,16 @@ static int parse_color(struct color *out, const char *name, int len) else if (val < 0) { out->type = COLOR_NORMAL; return 0; - /* Rewrite low numbers as more-portable standard colors. */ + /* Rewrite 0-7 as more-portable standard colors. */ } else if (val < 8) { out->type = COLOR_ANSI; out->value = val + COLOR_FOREGROUND_ANSI; return 0; + /* Rewrite 8-15 as more-portable aixterm colors. */ + } else if (val < 16) { + out->type = COLOR_ANSI; + out->value = val - 8 + COLOR_FOREGROUND_BRIGHT_ANSI; + return 0; } else if (val < 256) { out->type = COLOR_256; out->value = val; -- cgit v1.2.3