mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	Merge branch 'obsd-master'
This commit is contained in:
		
							
								
								
									
										10
									
								
								tmux.h
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								tmux.h
									
									
									
									
									
								
							@@ -2136,10 +2136,11 @@ extern char **cfg_files;
 | 
			
		||||
extern u_int cfg_nfiles;
 | 
			
		||||
extern int cfg_quiet;
 | 
			
		||||
void	start_cfg(void);
 | 
			
		||||
int	load_cfg(const char *, struct client *, struct cmdq_item *, int,
 | 
			
		||||
	    struct cmdq_item **);
 | 
			
		||||
int	load_cfg(const char *, struct client *, struct cmdq_item *,
 | 
			
		||||
            struct cmd_find_state *, int, struct cmdq_item **);
 | 
			
		||||
int	load_cfg_from_buffer(const void *, size_t, const char *,
 | 
			
		||||
	    struct client *, struct cmdq_item *, int, struct cmdq_item **);
 | 
			
		||||
  	    struct client *, struct cmdq_item *, struct cmd_find_state *,
 | 
			
		||||
	    int, struct cmdq_item **);
 | 
			
		||||
void printflike(1, 2) cfg_add_cause(const char *, ...);
 | 
			
		||||
void	cfg_print_causes(struct cmdq_item *);
 | 
			
		||||
void	cfg_show_causes(struct session *);
 | 
			
		||||
@@ -2595,7 +2596,8 @@ struct cmd_parse_result *cmd_parse_from_arguments(struct args_value *, u_int,
 | 
			
		||||
struct cmdq_state *cmdq_new_state(struct cmd_find_state *, struct key_event *,
 | 
			
		||||
		     int);
 | 
			
		||||
struct cmdq_state *cmdq_link_state(struct cmdq_state *);
 | 
			
		||||
struct cmdq_state *cmdq_copy_state(struct cmdq_state *);
 | 
			
		||||
struct cmdq_state *cmdq_copy_state(struct cmdq_state *,
 | 
			
		||||
		     struct cmd_find_state *);
 | 
			
		||||
void		  cmdq_free_state(struct cmdq_state *);
 | 
			
		||||
void printflike(3, 4) cmdq_add_format(struct cmdq_state *, const char *,
 | 
			
		||||
		     const char *, ...);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user