Merge branch 'obsd-master' into master

This commit is contained in:
Thomas Adam
2021-10-26 16:01:11 +01:00
6 changed files with 31 additions and 11 deletions

2
tmux.h
View File

@ -2033,7 +2033,7 @@ char *format_grid_line(struct grid *, u_int);
/* format-draw.c */
void format_draw(struct screen_write_ctx *,
const struct grid_cell *, u_int, const char *,
struct style_ranges *);
struct style_ranges *, int);
u_int format_width(const char *);
char *format_trim_left(const char *, u_int);
char *format_trim_right(const char *, u_int);