Instead of separate tables for different types of options, give each

option a scope type (server, session, window) in one table.

1 files changed, 3 insertions, 3 deletions

diff --git a/tmux.c b/tmux.c
index 5429a7cb..9baa8183 100644
--- a/tmux.c
+++ b/tmux.c
@@ -288,14 +288,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) {