diff options
Diffstat (limited to 'usr.bin/tmux/server-client.c')
| -rw-r--r-- | usr.bin/tmux/server-client.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c index f8965946e70..95eb17e0701 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.251 2018/07/04 12:25:26 nicm Exp $ */ +/* $OpenBSD: server-client.c,v 1.252 2018/07/16 08:48:22 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -907,8 +907,8 @@ 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); +retry: if ((key0 == (key_code)options_get_number(s->options, "prefix") || key0 == (key_code)options_get_number(s->options, "prefix2")) && strcmp(table->name, "prefix") != 0) { @@ -980,6 +980,10 @@ retry: * switch the client back to the root table and try again. */ log_debug("not found in key table %s", table->name); + if (key0 != KEYC_ANY) { + key0 = KEYC_ANY; + goto retry; + } if (!server_client_is_default_key_table(c, table) || (c->flags & CLIENT_REPEAT)) { server_client_set_key_table(c, NULL); |