diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-04-16 10:39:48 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2013-04-16 10:39:48 +0100 |
| commit | 9e537c808b95e01165f1c2831b3737b93c0110c3 (patch) | |
| tree | c4e0394a8c366356187696f03cf6cd21923ca42a /server-client.c | |
| parent | 4ccb2e2c218a10a8039ca801231aaf09b6bf3bce (diff) | |
| parent | 2c4543b9e9bd38bcc45393dad94930bcde872e6c (diff) | |
| download | rtmux-9e537c808b95e01165f1c2831b3737b93c0110c3.tar.gz rtmux-9e537c808b95e01165f1c2831b3737b93c0110c3.tar.bz2 rtmux-9e537c808b95e01165f1c2831b3737b93c0110c3.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
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); |