aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2021-10-25 12:01:11 +0100
committerThomas Adam <thomas@xteddy.org>2021-10-25 12:01:11 +0100
commit3934d9b24de376cf0b6868c56751b55bd2d60399 (patch)
tree2170d81ee872281d53659623a721618a6a6a744c /tmux.h
parent619d934d7b64ec86dcc08f182c390273d1604e06 (diff)
parentef46eb91a5e0b6e2b023544f45dbc98c8fe1377f (diff)
downloadrtmux-3934d9b24de376cf0b6868c56751b55bd2d60399.tar.gz
rtmux-3934d9b24de376cf0b6868c56751b55bd2d60399.tar.bz2
rtmux-3934d9b24de376cf0b6868c56751b55bd2d60399.zip
Merge branch 'obsd-master' into master
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/tmux.h b/tmux.h
index 198ca381..a5dde71b 100644
--- a/tmux.h
+++ b/tmux.h
@@ -3157,7 +3157,8 @@ typedef void (*popup_finish_edit_cb)(char *, size_t, void *);
int popup_display(int, int, struct cmdq_item *, u_int, u_int,
u_int, u_int, struct environ *, const char *, int, char **,
const char *, const char *, struct client *,
- struct session *, popup_close_cb, void *);
+ struct session *, const char *, const char *,
+ popup_close_cb, void *);
int popup_editor(struct client *, const char *, size_t,
popup_finish_edit_cb, void *);