mirror of
https://github.com/tmux/tmux.git
synced 2024-11-16 17:39:09 +00:00
Merge branch 'obsd-master'
This commit is contained in:
commit
69e0f28333
@ -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. */
|
||||||
|
if (KEYC_IS_MOUSE(key) && m->valid && wp != NULL) {
|
||||||
cmd_find_clear_state(&fs, NULL, 0);
|
cmd_find_clear_state(&fs, NULL, 0);
|
||||||
if (wp != NULL) {
|
|
||||||
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");
|
||||||
}
|
|
||||||
|
|
||||||
/* Dispatch the key binding. */
|
|
||||||
key_bindings_dispatch(bd, c, m, &fs);
|
key_bindings_dispatch(bd, c, m, &fs);
|
||||||
|
} else
|
||||||
|
key_bindings_dispatch(bd, c, m, NULL);
|
||||||
key_bindings_unref_table(table);
|
key_bindings_unref_table(table);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user