circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-04 18:08:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2020-04-18 16:01:34 +01:00
commit 2ccf15e5d8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
format.c
View File

@ -954,7 +954,7 @@ format_cb_cursor_character(struct format_tree *ft, struct format_entry *fe)
char * char *
format_grid_word(struct grid *gd, u_int x, u_int y) format_grid_word(struct grid *gd, u_int x, u_int y)
{ {
struct grid_line *gl; const struct grid_line *gl;
struct grid_cell gc; struct grid_cell gc;
const char *ws; const char *ws;
struct utf8_data *ud = NULL; struct utf8_data *ud = NULL;

4
tmux.h
View File

@ -936,8 +936,8 @@ struct window_pane {
char *searchstr; char *searchstr;
int searchregex; int searchregex;
u_int written; size_t written;
u_int skipped; size_t skipped;
TAILQ_ENTRY(window_pane) entry; TAILQ_ENTRY(window_pane) entry;
RB_ENTRY(window_pane) tree_entry; RB_ENTRY(window_pane) tree_entry;