Signed-off-by: redbrain <redbr...@gcc.gnu.org> --- trunk/server-client.c | 2 -- trunk/tty-keys.c | 6 ++---- trunk/tty.c | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/trunk/server-client.c b/trunk/server-client.c index a678a12..a85561c 100644 --- a/trunk/server-client.c +++ b/trunk/server-client.c @@ -344,7 +344,6 @@ server_client_handle_key(struct client *c, int key) struct session *s; struct window *w; struct window_pane *wp; - struct options *oo; struct timeval tv; struct key_binding *bd; int xtimeout, isprefix; @@ -363,7 +362,6 @@ server_client_handle_key(struct client *c, int key) w = c->session->curw->window; wp = w->active; - oo = &c->session->options; /* Special case: number keys jump to pane in identify mode. */ if (c->flags & CLIENT_IDENTIFY && key >= '0' && key <= '9') { diff --git a/trunk/tty-keys.c b/trunk/tty-keys.c index 3469f84..8a1a5ca 100644 --- a/trunk/tty-keys.c +++ b/trunk/tty-keys.c @@ -684,7 +684,7 @@ tty_keys_mouse(struct tty *tty, const char *buf, size_t len, size_t *size) int tty_keys_device(struct tty *tty, const char *buf, size_t len, size_t *size) { - u_int i, a, b; + u_int i, b; char tmp[64], *endptr; /* @@ -724,14 +724,12 @@ tty_keys_device(struct tty *tty, const char *buf, size_t len, size_t *size) if (buf[2] != '>') return (0); - /* Convert version numbers. */ - a = strtoul(tmp, &endptr, 10); if (*endptr == ';') { b = strtoul(endptr + 1, &endptr, 10); if (*endptr != '\0' && *endptr != ';') b = 0; } else - a = b = 0; + b = 0; log_debug("received xterm version %u", b); tty_set_version(tty, b); diff --git a/trunk/tty.c b/trunk/tty.c index 1c0c7a6..ebaf08c 100644 --- a/trunk/tty.c +++ b/trunk/tty.c @@ -668,7 +668,6 @@ tty_write( struct window_pane *wp = ctx->wp; struct client *c; struct session *s; - struct options *oo; u_int i; /* wp can be NULL if updating the screen but not the terminal. */ @@ -693,8 +692,7 @@ tty_write( continue; if (c->tty.flags & TTY_FREEZE) continue; - oo = &s->options; - + ctx->xoff = wp->xoff; ctx->yoff = wp->yoff; if (status_at_line(c) == 0) -- 1.7.5.4 ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ tmux-users mailing list tmux-users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tmux-users