Merge branch 'obsd-master'

Conflicts:
	utf8.c
This commit is contained in:
Thomas Adam
2016-03-02 18:10:51 +00:00
18 changed files with 150 additions and 481 deletions

1
cmd.c
View File

@ -481,7 +481,6 @@ cmd_prepare_state_flag(char c, const char *target, enum cmd_entry_flag flag,
CMD_FIND_SESSION, CMD_FIND_QUIET);
if (error == 0)
break;
flag = CMD_WINDOW_INDEX;
/* FALLTHROUGH */
case CMD_WINDOW:
case CMD_WINDOW_CANFAIL: