aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2021-02-22 10:01:22 +0000
committerThomas Adam <thomas@xteddy.org>2021-02-22 10:01:22 +0000
commit0cd5ed9e9b56b082e38e7a5be298803ccb68564c (patch)
tree4d8d57ba1f03dd4edfabcb627113456a7e284283 /tmux.h
parentcb7e6698f3241cecfac31a045b907988a4c286f1 (diff)
parent5f425ee31810c964ae5cf1256d0d7fe5dde7536c (diff)
downloadrtmux-0cd5ed9e9b56b082e38e7a5be298803ccb68564c.tar.gz
rtmux-0cd5ed9e9b56b082e38e7a5be298803ccb68564c.tar.bz2
rtmux-0cd5ed9e9b56b082e38e7a5be298803ccb68564c.zip
Merge branch 'obsd-master' into master
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/tmux.h b/tmux.h
index 7d08e0db..401bf82f 100644
--- a/tmux.h
+++ b/tmux.h
@@ -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 *);