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

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2015-12-18 00:01:08 +00:00
parent e0cae08c04 a337403868
commit 2ad9caad3f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd-find.c
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); cmd_find_clear_state(fs, cmdq, flags);
/* Find current state. */ /* Find current state. */
fs->current = NULL;
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;
if (fs->current == NULL) { else if (cmd_find_valid_state(&cmdq->current))
fs->current = &cmdq->current;
else {
cmd_find_clear_state(&current, cmdq, flags); cmd_find_clear_state(&current, cmdq, flags);
if (cmd_find_current_session(&current) != 0) { if (cmd_find_current_session(&current) != 0) {
if (~flags & CMD_FIND_QUIET) if (~flags & CMD_FIND_QUIET)