circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-05 01:56:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	Makefile
	cmd-link-window.c
	cmd-unlink-window.c
This commit is contained in:
Thomas Adam
2014-10-29 12:50:05 +00:00
parent 201036ad80 10a9440055
commit 35ffd093d7
21 changed files with 134 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server-client.c
View File

@@ -159,7 +159,7 @@ server_client_lost(struct client *c)
evbuffer_free(c->stdin_data);
evbuffer_free(c->stdout_data);
if (c->stderr_data != c->stdout_data)
evbuffer_free (c->stderr_data);
evbuffer_free(c->stderr_data);
status_free_jobs(&c->status_new);
status_free_jobs(&c->status_old);
@@ -647,7 +647,7 @@ server_client_reset_state(struct client *c)
if (!window_pane_visible(wp) || wp->yoff + s->cy >= c->tty.sy - status)
tty_cursor(&c->tty, 0, 0);
else {
o = status && options_get_number (oo, "status-position") == 0;
o = status && options_get_number(oo, "status-position") == 0;
tty_cursor(&c->tty, wp->xoff + s->cx, o + wp->yoff + s->cy);
}