mirror of
https://github.com/git/git
synced 2024-10-02 14:45:21 +00:00
color: support strike-through attribute
This is the only remaining attribute that is commonly supported (at least by xterm) that we don't support. Let's add it for completeness. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
54590a0eda
commit
9dc3515cf0
|
@ -160,8 +160,9 @@ Colors may also be given as numbers between 0 and 255; these use ANSI
|
||||||
your terminal supports it, you may also specify 24-bit RGB values as
|
your terminal supports it, you may also specify 24-bit RGB values as
|
||||||
hex, like `#ff0ab3`.
|
hex, like `#ff0ab3`.
|
||||||
+
|
+
|
||||||
The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, and
|
The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`,
|
||||||
`italic`. The position of any attributes with respect to the colors
|
`italic`, and `strike` (for crossed-out or "strikethrough" letters).
|
||||||
|
The position of any attributes with respect to the colors
|
||||||
(before, after, or in between), doesn't matter. Specific attributes may
|
(before, after, or in between), doesn't matter. Specific attributes may
|
||||||
be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`,
|
be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`,
|
||||||
`no-ul`, etc).
|
`no-ul`, etc).
|
||||||
|
|
3
color.c
3
color.c
|
@ -136,7 +136,8 @@ static int parse_attr(const char *name, size_t len)
|
||||||
ATTR("italic", 3, 23),
|
ATTR("italic", 3, 23),
|
||||||
ATTR("ul", 4, 24),
|
ATTR("ul", 4, 24),
|
||||||
ATTR("blink", 5, 25),
|
ATTR("blink", 5, 25),
|
||||||
ATTR("reverse", 7, 27)
|
ATTR("reverse", 7, 27),
|
||||||
|
ATTR("strike", 9, 29)
|
||||||
#undef ATTR
|
#undef ATTR
|
||||||
};
|
};
|
||||||
int negate = 0;
|
int negate = 0;
|
||||||
|
|
4
color.h
4
color.h
|
@ -17,9 +17,9 @@ struct strbuf;
|
||||||
* The space for attributes is also slightly overallocated, as
|
* The space for attributes is also slightly overallocated, as
|
||||||
* the negation for some attributes is the same (e.g., nobold and nodim).
|
* the negation for some attributes is the same (e.g., nobold and nodim).
|
||||||
*
|
*
|
||||||
* We allocate space for 6 attributes.
|
* We allocate space for 7 attributes.
|
||||||
*/
|
*/
|
||||||
#define COLOR_MAXLEN 70
|
#define COLOR_MAXLEN 75
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* IMPORTANT: Due to the way these color codes are emulated on Windows,
|
* IMPORTANT: Due to the way these color codes are emulated on Windows,
|
||||||
|
|
|
@ -61,8 +61,8 @@ test_expect_success 'long color specification' '
|
||||||
test_expect_success 'absurdly long color specification' '
|
test_expect_success 'absurdly long color specification' '
|
||||||
color \
|
color \
|
||||||
"#ffffff #ffffff bold nobold dim nodim italic noitalic
|
"#ffffff #ffffff bold nobold dim nodim italic noitalic
|
||||||
ul noul blink noblink reverse noreverse" \
|
ul noul blink noblink reverse noreverse strike nostrike" \
|
||||||
"[1;2;3;4;5;7;22;23;24;25;27;38;2;255;255;255;48;2;255;255;255m"
|
"[1;2;3;4;5;7;9;22;23;24;25;27;29;38;2;255;255;255;48;2;255;255;255m"
|
||||||
'
|
'
|
||||||
|
|
||||||
test_expect_success '0-7 are aliases for basic ANSI color names' '
|
test_expect_success '0-7 are aliases for basic ANSI color names' '
|
||||||
|
|
Loading…
Reference in a new issue