circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

pull/218/merge
Thomas Adam 2017-05-16 16:01:28 +01:00
parent b74b6dc77f 31625c2d17
commit 3df4e78492
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
grid.c
View File

@ -665,8 +665,7 @@ grid_string_cells_bg(const struct grid_cell *gc, int *values)
/* /*
* Returns ANSI code to set particular attributes (colour, bold and so on) * Returns ANSI code to set particular attributes (colour, bold and so on)
* given a current state. The output buffer must be able to hold at least 57 * given a current state.
* bytes.
*/ */
static void static void
grid_string_cells_code(const struct grid_cell *lastgc, grid_string_cells_code(const struct grid_cell *lastgc,

3
server-client.c
View File

@ -49,7 +49,8 @@ static void server_client_dispatch_shell(struct client *);
/* Identify mode callback. */ /* Identify mode callback. */
static void static void
server_client_callback_identify(__unused int fd, __unused short events, void *data) server_client_callback_identify(__unused int fd, __unused short events,
void *data)
{ {
server_client_clear_identify(data, NULL); server_client_clear_identify(data, NULL);
} }