circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

pull/162/head
Thomas Adam 2015-10-20 16:01:11 +01:00
parent bbdc08780c 8c8cddbe02
commit af2d48f4d2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server-client.c
View File

@ -540,7 +540,7 @@ server_client_handle_key(struct client *c, int key)
struct window *w; struct window *w;
struct window_pane *wp; struct window_pane *wp;
struct timeval tv; struct timeval tv;
struct key_table *table = c->keytable; struct key_table *table;
struct key_binding bd_find, *bd; struct key_binding bd_find, *bd;
int xtimeout; int xtimeout;
@ -606,7 +606,7 @@ server_client_handle_key(struct client *c, int key)
retry: retry:
/* Try to see if there is a key binding in the current table. */ /* Try to see if there is a key binding in the current table. */
bd_find.key = key; bd_find.key = key;
bd = RB_FIND(key_bindings, &table->key_bindings, &bd_find); bd = RB_FIND(key_bindings, &c->keytable->key_bindings, &bd_find);
if (bd != NULL) { if (bd != NULL) {
/* /*
* Key was matched in this table. If currently repeating but a * Key was matched in this table. If currently repeating but a
@ -624,6 +624,7 @@ retry:
* Take a reference to this table to make sure the key binding * Take a reference to this table to make sure the key binding
* doesn't disappear. * doesn't disappear.
*/ */
table = c->keytable;
table->references++; table->references++;
/* /*