diff options
| author | Thomas Adam <thomas@xteddy.org> | 2013-04-13 17:05:49 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2013-04-13 17:05:49 +0100 |
| commit | b58bca9a72009101da373a3b7463fd866ecac58c (patch) | |
| tree | e8f9b4b720b4c05f67fd47505b5170c4fd33dcb0 /server-client.c | |
| parent | e312db140868754358d40ec17595327a8fbbf180 (diff) | |
| parent | 27dcf470dc4aa5901ac7f01b3a9f971e02f2229e (diff) | |
| download | rtmux-b58bca9a72009101da373a3b7463fd866ecac58c.tar.gz rtmux-b58bca9a72009101da373a3b7463fd866ecac58c.tar.bz2 rtmux-b58bca9a72009101da373a3b7463fd866ecac58c.zip | |
Merge branch 'obsd-master'
Conflicts:
tmux.c
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/server-client.c b/server-client.c index 0ab50b5d..84633296 100644 --- a/server-client.c +++ b/server-client.c @@ -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); |