circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

pull/658/head
Thomas Adam 2016-11-02 14:01:10 +00:00
parent 5da94182ae 382e09bed1
commit 15b6774f9b
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cmd.c
View File

@ -450,8 +450,11 @@ cmd_prepare_state_flag(char c, const char *target, enum cmd_entry_flag flag,
log_debug("%s: flag %c %d %#x", __func__, c, flag, targetflags); log_debug("%s: flag %c %d %#x", __func__, c, flag, targetflags);
error = cmd_find_current(&current, item, targetflags); error = cmd_find_current(&current, item, targetflags);
if (error != 0 && ~targetflags & CMD_FIND_QUIET) if (error != 0) {
return (-1); if (~targetflags & CMD_FIND_QUIET)
return (-1);
cmd_find_clear_state(&current, NULL, 0);
}
if (!cmd_find_empty_state(&current) && !cmd_find_valid_state(&current)) if (!cmd_find_empty_state(&current) && !cmd_find_valid_state(&current))
fatalx("invalid current state"); fatalx("invalid current state");
@ -466,8 +469,8 @@ cmd_prepare_state_flag(char c, const char *target, enum cmd_entry_flag flag,
case CMD_SESSION_WITHPANE: case CMD_SESSION_WITHPANE:
error = cmd_find_target(fs, &current, item, target, error = cmd_find_target(fs, &current, item, target,
CMD_FIND_SESSION, targetflags); CMD_FIND_SESSION, targetflags);
if (error != 0 && ~targetflags & CMD_FIND_QUIET) if (error != 0)
return (-1); goto error;
break; break;
case CMD_MOVEW_R: case CMD_MOVEW_R:
error = cmd_find_target(fs, &current, item, target, error = cmd_find_target(fs, &current, item, target,
@ -481,21 +484,27 @@ cmd_prepare_state_flag(char c, const char *target, enum cmd_entry_flag flag,
case CMD_WINDOW_INDEX: case CMD_WINDOW_INDEX:
error = cmd_find_target(fs, &current, item, target, error = cmd_find_target(fs, &current, item, target,
CMD_FIND_WINDOW, targetflags); CMD_FIND_WINDOW, targetflags);
if (error != 0 && ~targetflags & CMD_FIND_QUIET) if (error != 0)
return (-1); goto error;
break; break;
case CMD_PANE: case CMD_PANE:
case CMD_PANE_CANFAIL: case CMD_PANE_CANFAIL:
case CMD_PANE_MARKED: case CMD_PANE_MARKED:
error = cmd_find_target(fs, &current, item, target, error = cmd_find_target(fs, &current, item, target,
CMD_FIND_PANE, targetflags); CMD_FIND_PANE, targetflags);
if (error != 0 && ~targetflags & CMD_FIND_QUIET) if (error != 0)
return (-1); goto error;
break; break;
default: default:
fatalx("unknown %cflag %d", c, flag); fatalx("unknown %cflag %d", c, flag);
} }
return (0); return (0);
error:
if (~targetflags & CMD_FIND_QUIET)
return (-1);
cmd_find_clear_state(fs, NULL, 0);
return (0);
} }
int int