Date: Thu, 17 Dec 2015 17:22:24 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r403914 - in branches/2015Q4/sysutils/tmux: . files Message-ID: <201512171722.tBHHMOn4031370@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Thu Dec 17 17:22:24 2015 New Revision: 403914 URL: https://svnweb.freebsd.org/changeset/ports/403914 Log: MFH: r403912 Fix a regression in 2.1 where tmux was misshandling key strokes if you started typing too fast after a tmux command. PR: 205372 Submitted by: me jahn de Obtained from: https://github.com/tmux/tmux/commit/8c8cddbe022af5ece9949804cacffbee6b8972fa Sponsored by: Absolight Added: branches/2015Q4/sysutils/tmux/files/patch-server-client.c - copied unchanged from r403912, head/sysutils/tmux/files/patch-server-client.c Modified: branches/2015Q4/sysutils/tmux/Makefile Directory Properties: branches/2015Q4/ (props changed) Modified: branches/2015Q4/sysutils/tmux/Makefile ============================================================================== --- branches/2015Q4/sysutils/tmux/Makefile Thu Dec 17 17:19:48 2015 (r403913) +++ branches/2015Q4/sysutils/tmux/Makefile Thu Dec 17 17:22:24 2015 (r403914) @@ -4,6 +4,7 @@ PORTNAME= tmux PORTVERSION= 2.0 PORTREVISION= 1 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:S/a$//} Copied: branches/2015Q4/sysutils/tmux/files/patch-server-client.c (from r403912, head/sysutils/tmux/files/patch-server-client.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q4/sysutils/tmux/files/patch-server-client.c Thu Dec 17 17:22:24 2015 (r403914, copy of r403912, head/sysutils/tmux/files/patch-server-client.c) @@ -0,0 +1,34 @@ +From 8c8cddbe022af5ece9949804cacffbee6b8972fa Mon Sep 17 00:00:00 2001 +From: nicm <nicm> +Date: Tue, 20 Oct 2015 14:19:27 +0000 +Subject: [PATCH] The table could change when retrying so don't save it at + start of server_client_handle_key. + +--- server-client.c.orig 2015-09-27 09:42:08 UTC ++++ server-client.c +@@ -540,7 +540,7 @@ server_client_handle_key(struct client * + struct window *w; + struct window_pane *wp; + struct timeval tv; +- struct key_table *table = c->keytable; ++ struct key_table *table; + struct key_binding bd_find, *bd; + int xtimeout; + +@@ -606,7 +606,7 @@ server_client_handle_key(struct client * + retry: + /* Try to see if there is a key binding in the current table. */ + bd_find.key = key; +- bd = RB_FIND(key_bindings, &table->key_bindings, &bd_find); ++ bd = RB_FIND(key_bindings, &c->keytable->key_bindings, &bd_find); + if (bd != NULL) { + /* + * Key was matched in this table. If currently repeating but a +@@ -624,6 +624,7 @@ retry: + * Take a reference to this table to make sure the key binding + * doesn't disappear. + */ ++ table = c->keytable; + table->references++; + + /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512171722.tBHHMOn4031370>