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

Merge branch 'master' of github.com:tmux/tmux

Browse Source
This commit is contained in:
Nicholas Marriott
2017-04-20 19:09:36 +01:00
parent 9420758127 69e0f28333
commit 4a2e75fc8c
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server-client.c
View File

@@ -938,8 +938,8 @@ retry:
server_status_client(c); server_status_client(c);
/* Find default state if the pane is known. */ /* Find default state if the pane is known. */
cmd_find_clear_state(&fs, NULL, 0); if (KEYC_IS_MOUSE(key) && m->valid && wp != NULL) {
if (wp != NULL) { cmd_find_clear_state(&fs, NULL, 0);
fs.s = s; fs.s = s;
fs.wl = fs.s->curw; fs.wl = fs.s->curw;
fs.w = fs.wl->window; fs.w = fs.wl->window;
@@ -948,10 +948,9 @@ retry:
if (!cmd_find_valid_state(&fs)) if (!cmd_find_valid_state(&fs))
fatalx("invalid key state"); fatalx("invalid key state");
} key_bindings_dispatch(bd, c, m, &fs);
} else
/* Dispatch the key binding. */ key_bindings_dispatch(bd, c, m, NULL);
key_bindings_dispatch(bd, c, m, &fs);
key_bindings_unref_table(table); key_bindings_unref_table(table);
return; return;
} }