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/705/head
Thomas Adam 2016-12-28 12:01:14 +00:00
parent af56e50f74 70ba3c147f
commit d3328a3b1e
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd.c
View File

@ -409,7 +409,7 @@ cmd_prepare_state_flag(char c, const char *target, enum cmd_entry_flag flag,
if (target != NULL && target[strcspn(target, ":.")] != '\0') if (target != NULL && target[strcspn(target, ":.")] != '\0')
flag = CMD_PANE; flag = CMD_PANE;
else else
flag = CMD_SESSION; flag = CMD_SESSION_PREFERUNATTACHED;
} }
targetflags = 0; targetflags = 0;
@ -417,6 +417,7 @@ cmd_prepare_state_flag(char c, const char *target, enum cmd_entry_flag flag,
case CMD_SESSION: case CMD_SESSION:
case CMD_SESSION_CANFAIL: case CMD_SESSION_CANFAIL:
case CMD_SESSION_PREFERUNATTACHED: case CMD_SESSION_PREFERUNATTACHED:
case CMD_SESSION_WITHPANE:
if (flag == CMD_SESSION_CANFAIL) if (flag == CMD_SESSION_CANFAIL)
targetflags |= CMD_FIND_QUIET; targetflags |= CMD_FIND_QUIET;
if (flag == CMD_SESSION_PREFERUNATTACHED) if (flag == CMD_SESSION_PREFERUNATTACHED)

2
tmux.h
View File

@ -1307,7 +1307,7 @@ enum cmd_entry_flag {
CMD_SESSION, CMD_SESSION,
CMD_SESSION_CANFAIL, CMD_SESSION_CANFAIL,
CMD_SESSION_PREFERUNATTACHED, CMD_SESSION_PREFERUNATTACHED,
CMD_SESSION_WITHPANE, CMD_SESSION_WITHPANE, /* implies PREFERUNATTACHED */
CMD_WINDOW, CMD_WINDOW,
CMD_WINDOW_CANFAIL, CMD_WINDOW_CANFAIL,