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

Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2016-04-28 10:01:10 +01:00
parent bac7a68023 dd8ba0b5a8
commit 7a02910feb
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server-client.c
View File

@ -1098,12 +1098,13 @@ server_client_dispatch(struct imsg *imsg, void *arg)
if (gettimeofday(&c->activity_time, NULL) != 0)
fatal("gettimeofday failed");
if (s != NULL)
session_update_activity(s, &c->activity_time);
tty_start_tty(&c->tty);
server_redraw_client(c);
recalculate_sizes();
if (s != NULL)
session_update_activity(s, &c->activity_time);
break;
case MSG_SHELL:
if (datalen != 0)

2
window-choose.c
View File

@ -497,7 +497,7 @@ window_choose_expand(struct window_pane *wp, struct session *s, u_int pos)
sizeof *data->list);
memmove(&data->list[pos + 2],
&data->list[pos + 1],
(data->list_size - pos) *
(data->list_size - (pos + 1)) *
sizeof *data->list);
memcpy(&data->list[pos + 1],
&data->old_list[i],