Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-10-16 20:01:10 +01:00
29 changed files with 817 additions and 702 deletions

View File

@ -187,8 +187,8 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
fs.w = w;
fs.wp = new_wp;
cmd_find_log_state(__func__, &fs);
if (hooks_wait(s->hooks, cmdq, &fs, "after-split-window") == 0)
return (CMD_RETURN_WAIT);
hooks_insert(s->hooks, cmdq, &fs, "after-split-window");
return (CMD_RETURN_NORMAL);
error: