Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-06-06 18:01:13 +01:00
3 changed files with 7 additions and 4 deletions

View File

@ -814,7 +814,7 @@ server_client_handle_key(struct client *c, key_code key)
struct timeval tv;
struct key_table *table, *first;
struct key_binding bd_find, *bd;
int xtimeout;
int xtimeout, flags;
struct cmd_find_state fs;
/* Check the client is good to accept input. */
@ -911,6 +911,7 @@ server_client_handle_key(struct client *c, key_code key)
server_status_client(c);
return;
}
flags = c->flags;
retry:
/* Log key table. */
@ -988,7 +989,7 @@ retry:
* No match in the root table either. If this wasn't the first table
* tried, don't pass the key to the pane.
*/
if (first != table) {
if (first != table && (~flags & CLIENT_REPEAT)) {
server_client_set_key_table(c, NULL);
server_status_client(c);
return;