extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-08-09 13:54:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	tmux.c
This commit is contained in:
Thomas Adam
2013-04-13 17:05:49 +01:00
parent e312db1408 27dcf470dc
commit b58bca9a72
16 changed files with 57 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server-client.c
View File

@ -534,18 +534,8 @@ server_client_check_resize(struct window_pane *wp)
ws.ws_col = wp->sx;
ws.ws_row = wp->sy;
if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1) {
#ifdef __sun
/*
* Some versions of Solaris apparently can return an error when
* resizing; don't know why this happens, can't reproduce on
* other platforms and ignoring it doesn't seem to cause any
* issues.
*/
if (errno != EINVAL)
#endif
if (ioctl(wp->fd, TIOCSWINSZ, &ws) == -1)
fatal("ioctl failed");
}
wp->flags &= ~PANE_RESIZE;
}
@ -981,8 +971,6 @@ server_client_msg_identify(
c->tty.flags |= TTY_UTF8;
if (data->flags & IDENTIFY_256COLOURS)
c->tty.term_flags |= TERM_256COLOURS;
else if (data->flags & IDENTIFY_88COLOURS)
c->tty.term_flags |= TERM_88COLOURS;
tty_resize(&c->tty);