diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2020-11-03 08:35:52 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2020-11-03 08:35:52 +0000 |
| commit | ba9962b568dd111455963c88b0458cf8847c9690 (patch) | |
| tree | a13a66498befbd75237a3a7a3869ccd2c52b8452 /options-table.c | |
| parent | 733abfcfc5b05cb3e1f2cf08f00a9325c6f6fa04 (diff) | |
| parent | ff53eed402abb146096673963da39b5036a5c861 (diff) | |
| download | rtmux-ba9962b568dd111455963c88b0458cf8847c9690.tar.gz rtmux-ba9962b568dd111455963c88b0458cf8847c9690.tar.bz2 rtmux-ba9962b568dd111455963c88b0458cf8847c9690.zip | |
Merge branch 'master' into 3.2-rc
Diffstat (limited to 'options-table.c')
| -rw-r--r-- | options-table.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/options-table.c b/options-table.c index 0555d43e..873f8d67 100644 --- a/options-table.c +++ b/options-table.c @@ -170,6 +170,14 @@ static const char *options_table_status_format_default[] = { .separator = "" \ } +/* Map of name conversions. */ +const struct options_name_map options_other_names[] = { + { "display-panes-color", "display-panes-colour" }, + { "display-panes-active-color", "display-panes-active-colour" }, + { "clock-mode-color", "clock-mode-colour" }, + { NULL, NULL } +}; + /* Top-level options. */ const struct options_table_entry options_table[] = { /* Server options. */ @@ -1120,6 +1128,7 @@ const struct options_table_entry options_table[] = { OPTIONS_TABLE_PANE_HOOK("pane-focus-out", ""), OPTIONS_TABLE_PANE_HOOK("pane-mode-changed", ""), OPTIONS_TABLE_PANE_HOOK("pane-set-clipboard", ""), + OPTIONS_TABLE_PANE_HOOK("pane-title-changed", ""), OPTIONS_TABLE_HOOK("session-closed", ""), OPTIONS_TABLE_HOOK("session-created", ""), OPTIONS_TABLE_HOOK("session-renamed", ""), |