diff options
| author | Thomas Adam <thomas@xteddy.org> | 2021-10-20 14:01:15 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2021-10-20 14:01:15 +0100 |
| commit | 1bf2f811ea8835dd24bdb773b5be4df517767d1f (patch) | |
| tree | 0c9b68c65c797a0cb14fb9dbf8a34f4dfa299e2c /tmux.h | |
| parent | 65bb36d6bdec631cbab33ae6896e1dad29a8fffe (diff) | |
| parent | acba07629ebf2dc2f0c316f110493e720b30757c (diff) | |
| download | rtmux-1bf2f811ea8835dd24bdb773b5be4df517767d1f.tar.gz rtmux-1bf2f811ea8835dd24bdb773b5be4df517767d1f.tar.bz2 rtmux-1bf2f811ea8835dd24bdb773b5be4df517767d1f.zip | |
Merge branch 'obsd-master' into master
Diffstat (limited to 'tmux.h')
| -rw-r--r-- | tmux.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -2738,7 +2738,7 @@ void screen_write_vline(struct screen_write_ctx *, u_int, int, int); void screen_write_menu(struct screen_write_ctx *, struct menu *, int, const struct grid_cell *); void screen_write_box(struct screen_write_ctx *, u_int, u_int, int, - const struct grid_cell *); + const struct grid_cell *, const char *); void screen_write_preview(struct screen_write_ctx *, struct screen *, u_int, u_int); void screen_write_backspace(struct screen_write_ctx *); @@ -3156,8 +3156,8 @@ typedef void (*popup_close_cb)(int, void *); 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 *, struct client *, struct session *, - popup_close_cb, void *); + const char *, const char *, struct client *, + struct session *, popup_close_cb, void *); int popup_editor(struct client *, const char *, size_t, popup_finish_edit_cb, void *); |