mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Instead of separate tables for different types of options, give each
option a scope type (server, session, window) in one table.
This commit is contained in:
		
							
								
								
									
										6
									
								
								tmux.c
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								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) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user