mirror of
https://github.com/tmux/tmux.git
synced 2024-12-04 19:58:48 +00:00
Add unit (milliseconds) to escape-time, show unset colours as "none"
rather than "invalid" and don't show the same text twice for user options in customize mode.
This commit is contained in:
parent
792d13af49
commit
938130bc69
2
colour.c
2
colour.c
@ -128,7 +128,7 @@ colour_tostring(int c)
|
||||
u_char r, g, b;
|
||||
|
||||
if (c == -1)
|
||||
return ("invalid");
|
||||
return ("none");
|
||||
|
||||
if (c & COLOUR_FLAG_RGB) {
|
||||
colour_split_rgb(c, &r, &g, &b);
|
||||
|
@ -278,6 +278,7 @@ const struct options_table_entry options_table[] = {
|
||||
.minimum = 0,
|
||||
.maximum = INT_MAX,
|
||||
.default_num = 500,
|
||||
.unit = "milliseconds",
|
||||
.text = "Time to wait before assuming a key is Escape."
|
||||
},
|
||||
|
||||
|
@ -680,9 +680,7 @@ window_customize_draw_option(struct window_customize_modedata *data,
|
||||
}
|
||||
ft = format_create_from_state(NULL, NULL, &fs);
|
||||
|
||||
if (oe == NULL)
|
||||
text = "This is a user option.";
|
||||
else if (oe->text == NULL)
|
||||
if (oe == NULL || oe->text == NULL)
|
||||
text = "This option doesn't have a description.";
|
||||
else
|
||||
text = oe->text;
|
||||
|
Loading…
Reference in New Issue
Block a user