circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 17:46:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2018-07-16 11:02:25 +01:00
parent 6de991d855 0d88f8a78b
commit 4f04b2094c
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server-client.c
View File

@@ -905,8 +905,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) {
@@ -978,6 +978,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);