aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-04-25 20:01:11 +0100
committerThomas Adam <thomas@xteddy.org>2017-04-25 20:01:11 +0100
commit0daeefefdbd4adce019944c7db66e7830c831d9e (patch)
tree2215539bcc9c3af06ab2fc2b0cb0fc7018a5f40c /tmux.h
parent65d6278f883b08673e9dbfefc376864ee01d9655 (diff)
parentd520dae6ac9acf980d48fbc8307ac83a5cee2938 (diff)
downloadrtmux-0daeefefdbd4adce019944c7db66e7830c831d9e.tar.gz
rtmux-0daeefefdbd4adce019944c7db66e7830c831d9e.tar.bz2
rtmux-0daeefefdbd4adce019944c7db66e7830c831d9e.zip
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tmux.h b/tmux.h
index 583a6f8b..3b39129a 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1103,6 +1103,7 @@ struct tty_ctx {
struct window_pane *wp;
const struct grid_cell *cell;
+ int wrapped;
u_int num;
void *ptr;
@@ -1474,7 +1475,6 @@ void proc_kill_peer(struct tmuxpeer *);
/* cfg.c */
extern int cfg_finished;
-extern struct client *cfg_client;
void start_cfg(void);
int load_cfg(const char *, struct client *, struct cmdq_item *, int);
void set_cfg_file(const char *);