circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-01-12 11:18:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master' into master

Browse Source
This commit is contained in:
Thomas Adam 2022-03-24 14:01:11 +00:00
commit b638886716
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
colour.c
View File

@ -128,7 +128,7 @@ colour_tostring(int c)
u_char r, g, b; u_char r, g, b;
if (c == -1) if (c == -1)
return ("invalid"); return ("none");
if (c & COLOUR_FLAG_RGB) { if (c & COLOUR_FLAG_RGB) {
colour_split_rgb(c, &r, &g, &b); colour_split_rgb(c, &r, &g, &b);

1
options-table.c
View File

@ -277,6 +277,7 @@ const struct options_table_entry options_table[] = {
.minimum = 0, .minimum = 0,
.maximum = INT_MAX, .maximum = INT_MAX,
.default_num = 500, .default_num = 500,
.unit = "milliseconds",
.text = "Time to wait before assuming a key is Escape." .text = "Time to wait before assuming a key is Escape."
}, },

4
window-customize.c
View File

@ -680,9 +680,7 @@ window_customize_draw_option(struct window_customize_modedata *data,
} }
ft = format_create_from_state(NULL, NULL, &fs); ft = format_create_from_state(NULL, NULL, &fs);
if (oe == NULL) if (oe == NULL || oe->text == NULL)
text = "This is a user option.";
else if (oe->text == NULL)
text = "This option doesn't have a description."; text = "This option doesn't have a description.";
else else
text = oe->text; text = oe->text;