circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 14:27:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2018-02-22 12:02:31 +00:00
parent 5a44e18490 e97daead43
commit c2aa40449c
4 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server-client.c
View File

@ -905,6 +905,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")) &&
@ -915,7 +916,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);