circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 09:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2015-05-13 09:44:11 +01:00
parent 4165ed96f8 3f4ee98162
commit 00471dc783
9 changed files with 139 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
options-table.c
View File

@@ -48,7 +48,7 @@ const char *options_table_status_position_list[] = {
"top", "bottom", NULL
};
const char *options_table_bell_action_list[] = {
"none", "any", "current", NULL
"none", "any", "current", "other", NULL
};
/* Server options. */
@@ -295,7 +295,7 @@ const struct options_table_entry session_options_table[] = {
{ .name = "set-titles-string",
.type = OPTIONS_TABLE_STRING,
.default_str = "#S:#I:#W - \"#T\""
.default_str = "#S:#I:#W - \"#T\" #{session_alerts}"
},
{ .name = "status",
@@ -484,20 +484,6 @@ const struct options_table_entry window_options_table[] = {
"#{?pane_dead,[dead],}"
},
{ .name = "c0-change-trigger",
.type = OPTIONS_TABLE_NUMBER,
.default_num = 250,
.minimum = 0,
.maximum = USHRT_MAX
},
{ .name = "c0-change-interval",
.type = OPTIONS_TABLE_NUMBER,
.default_num = 100,
.minimum = 1,
.maximum = USHRT_MAX
},
{ .name = "clock-mode-colour",
.type = OPTIONS_TABLE_COLOUR,
.default_num = 4