circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-14 10:58:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2016-10-18 16:01:11 +01:00
commit 0041e40ca8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd-find.c
View File

@ -989,13 +989,13 @@ cmd_find_target(struct cmd_find_state *fs, struct cmd_find_state *current,
/* Find current state. */ /* Find current state. */
if (server_check_marked() && (flags & CMD_FIND_DEFAULT_MARKED)) { if (server_check_marked() && (flags & CMD_FIND_DEFAULT_MARKED)) {
fs->current = &marked_pane; fs->current = &marked_pane;
log_debug(" current is marked pane"); log_debug("%s: current is marked pane", __func__);
} else if (cmd_find_valid_state(&item->current)) { } else if (cmd_find_valid_state(&item->current)) {
fs->current = &item->current; fs->current = &item->current;
log_debug(" current is from queue"); log_debug("%s: current is from queue", __func__);
} else { } else {
fs->current = current; fs->current = current;
log_debug(" current is from argument"); log_debug("%s: current is from argument", __func__);
} }
if (!cmd_find_empty_state(fs->current) && if (!cmd_find_empty_state(fs->current) &&
!cmd_find_valid_state(fs->current)) !cmd_find_valid_state(fs->current))
@ -1206,7 +1206,7 @@ current:
error: error:
fs->current = NULL; fs->current = NULL;
log_debug(" error"); log_debug("%s: error", __func__);
free(copy); free(copy);
return (-1); return (-1);