Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-10-14 02:01:14 +01:00
13 changed files with 58 additions and 114 deletions

View File

@ -65,6 +65,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
struct layout_cell *lc;
struct format_tree *ft;
struct environ_entry *envent;
struct cmd_find_state fs;
server_unzoom_window(w);
@ -177,15 +178,17 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
}
notify_window_layout_changed(w);
cmd_find_clear_state(&cmdq->current, NULL, 0);
cmdq->current.s = s;
cmdq->current.wl = wl;
cmdq->current.w = wl->window;
cmdq->current.wp = new_wp;
cmd_find_log_state(__func__, &cmdq->current);
if (to_free != NULL)
free((void *)to_free);
cmd_find_clear_state(&fs, NULL, 0);
fs.s = s;
fs.wl = wl;
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);
return (CMD_RETURN_NORMAL);
error: