diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-11-21 14:24:33 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-11-21 14:24:33 +0000 |
| commit | 78a00c845cc4d4e80f36f7cda71e0ca9ea13dcf4 (patch) | |
| tree | 293ff608c1e12ad04b811b5410beb8bd50386c49 /tmux.c | |
| parent | 2c482939fdd92f1bd187cdcc661890dfa4e45512 (diff) | |
| parent | 933929cd622478bb43afe590670613da2e9ff359 (diff) | |
| download | rtmux-78a00c845cc4d4e80f36f7cda71e0ca9ea13dcf4.tar.gz rtmux-78a00c845cc4d4e80f36f7cda71e0ca9ea13dcf4.tar.bz2 rtmux-78a00c845cc4d4e80f36f7cda71e0ca9ea13dcf4.zip | |
Merge branch 'obsd-master'
Conflicts:
tmux.h
Diffstat (limited to 'tmux.c')
| -rw-r--r-- | tmux.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -295,14 +295,14 @@ main(int argc, char **argv) environ_set(global_environ, "PWD", tmp); global_options = options_create(NULL); - options_table_populate_tree(server_options_table, global_options); + options_table_populate_tree(OPTIONS_TABLE_SERVER, global_options); global_s_options = options_create(NULL); - options_table_populate_tree(session_options_table, global_s_options); + options_table_populate_tree(OPTIONS_TABLE_SESSION, global_s_options); options_set_string(global_s_options, "default-shell", "%s", getshell()); global_w_options = options_create(NULL); - options_table_populate_tree(window_options_table, global_w_options); + options_table_populate_tree(OPTIONS_TABLE_WINDOW, global_w_options); /* Override keys to vi if VISUAL or EDITOR are set. */ if ((s = getenv("VISUAL")) != NULL || (s = getenv("EDITOR")) != NULL) { |