From owner-svn-ports-head@freebsd.org Thu Dec 17 17:19:30 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 74F37A492D2; Thu, 17 Dec 2015 17:19:30 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2A45C117B; Thu, 17 Dec 2015 17:19:30 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBHHJTP4027572; Thu, 17 Dec 2015 17:19:29 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBHHJTSR027570; Thu, 17 Dec 2015 17:19:29 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201512171719.tBHHJTSR027570@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Thu, 17 Dec 2015 17:19:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403912 - in head/sysutils/tmux: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2015 17:19:30 -0000 Author: mat Date: Thu Dec 17 17:19:28 2015 New Revision: 403912 URL: https://svnweb.freebsd.org/changeset/ports/403912 Log: 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 MFH: 2015Q4 Sponsored by: Absolight Added: head/sysutils/tmux/files/patch-server-client.c (contents, props changed) Modified: head/sysutils/tmux/Makefile Modified: head/sysutils/tmux/Makefile ============================================================================== --- head/sysutils/tmux/Makefile Thu Dec 17 17:13:03 2015 (r403911) +++ head/sysutils/tmux/Makefile Thu Dec 17 17:19:28 2015 (r403912) @@ -3,6 +3,7 @@ PORTNAME= tmux PORTVERSION= 2.1 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://github.com/tmux/tmux/releases/download/${PORTVERSION}/ \ SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:S/a$//} Added: head/sysutils/tmux/files/patch-server-client.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/tmux/files/patch-server-client.c Thu Dec 17 17:19:28 2015 (r403912) @@ -0,0 +1,34 @@ +From 8c8cddbe022af5ece9949804cacffbee6b8972fa Mon Sep 17 00:00:00 2001 +From: 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++; + + /*