Merge branch 'obsd-master' into master

This commit is contained in:
Thomas Adam
2021-10-25 12:01:11 +01:00
6 changed files with 87 additions and 46 deletions

3
tmux.h
View File

@ -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 *);