diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2015-12-18 14:27:23 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2015-12-18 14:27:23 +0000 |
| commit | ae6d69199927c9970a6e99fd41c204d1fb9d4601 (patch) | |
| tree | 13568f8d760f7fef2ec9426cd283291204a9ae37 | |
| parent | 018d5f7d731379133c3a940a69c1bc2cb87805be (diff) | |
| download | ports-ae6d69199927c9970a6e99fd41c204d1fb9d4601.tar.gz ports-ae6d69199927c9970a6e99fd41c204d1fb9d4601.zip | |
MFH: -r403912
backout commit r403914, the quarterly branch has 2.0, not 2.1.
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
Notes
Notes:
svn path=/branches/2015Q4/; revision=403965
| -rw-r--r-- | sysutils/tmux/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/tmux/files/patch-server-client.c | 34 |
2 files changed, 0 insertions, 35 deletions
diff --git a/sysutils/tmux/Makefile b/sysutils/tmux/Makefile index e2677910d1bb..0f2f957e4c01 100644 --- a/sysutils/tmux/Makefile +++ b/sysutils/tmux/Makefile @@ -4,7 +4,6 @@ PORTNAME= tmux PORTVERSION= 2.0 PORTREVISION= 1 -PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:S/a$//} diff --git a/sysutils/tmux/files/patch-server-client.c b/sysutils/tmux/files/patch-server-client.c deleted file mode 100644 index df30e710d0c6..000000000000 --- a/sysutils/tmux/files/patch-server-client.c +++ /dev/null @@ -1,34 +0,0 @@ -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++; - - /* |