Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2015-12-18 00:01:08 +00:00
commit 2ad9caad3f

View File

@ -930,10 +930,11 @@ cmd_find_target(struct cmd_find_state *fs, struct cmd_q *cmdq,
cmd_find_clear_state(fs, cmdq, flags);
/* Find current state. */
fs->current = NULL;
if (server_check_marked() && (flags & CMD_FIND_DEFAULT_MARKED))
fs->current = &marked_pane;
if (fs->current == NULL) {
else if (cmd_find_valid_state(&cmdq->current))
fs->current = &cmdq->current;
else {
cmd_find_clear_state(&current, cmdq, flags);
if (cmd_find_current_session(&current) != 0) {
if (~flags & CMD_FIND_QUIET)