Merge branch 'obsd-master' into master

This commit is contained in:
Thomas Adam
2021-02-22 10:01:22 +00:00
6 changed files with 121 additions and 35 deletions

6
tmux.h
View File

@ -1888,7 +1888,6 @@ const char *sig2name(int);
const char *find_cwd(void);
const char *find_home(void);
const char *getversion(void);
void expand_paths(const char *, char ***, u_int *);
/* proc.c */
struct imsg;
@ -1908,13 +1907,14 @@ pid_t proc_fork_and_daemon(int *);
/* cfg.c */
extern int cfg_finished;
extern struct client *cfg_client;
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_from_buffer(const void *, size_t, const char *,
struct client *, struct cmdq_item *, int, struct cmdq_item **);
void set_cfg_file(const char *);
const char *get_cfg_file(void);
void printflike(1, 2) cfg_add_cause(const char *, ...);
void cfg_print_causes(struct cmdq_item *);
void cfg_show_causes(struct session *);