summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/server-client.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2018-02-22 10:58:12 +0000
committernicm <nicm@openbsd.org>2018-02-22 10:58:12 +0000
commit790270d984ebbfa6c95b7bb28ef14ae0352c234a (patch)
tree8d8946c66472f11cffc1059748684dcb8768faa8 /usr.bin/tmux/server-client.c
parentAdd exit-empty option to exit server if no sessions (defaults to on). (diff)
downloadwireguard-openbsd-790270d984ebbfa6c95b7bb28ef14ae0352c234a.tar.xz
wireguard-openbsd-790270d984ebbfa6c95b7bb28ef14ae0352c234a.zip
Check prefix when retrying so it is checked while repeat flag is
set. GitHub issue 1239.
Diffstat (limited to 'usr.bin/tmux/server-client.c')
-rw-r--r--usr.bin/tmux/server-client.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c
index a9222f156ed..d509d7e9221 100644
--- a/usr.bin/tmux/server-client.c
+++ b/usr.bin/tmux/server-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.247 2018/02/05 08:21:54 nicm Exp $ */
+/* $OpenBSD: server-client.c,v 1.248 2018/02/22 10:58:12 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -907,6 +907,7 @@ server_client_handle_key(struct client *c, key_code key)
* The prefix always takes precedence and forces a switch to the prefix
* table, unless we are already there.
*/
+retry:
key0 = (key & ~KEYC_XTERM);
if ((key0 == (key_code)options_get_number(s->options, "prefix") ||
key0 == (key_code)options_get_number(s->options, "prefix2")) &&
@@ -917,7 +918,6 @@ server_client_handle_key(struct client *c, key_code key)
}
flags = c->flags;
-retry:
/* Log key table. */
if (wp == NULL)
log_debug("key table %s (no pane)", table->name);