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

@ -155,12 +155,5 @@ cmd_join_pane_exec(struct cmd *self, struct cmd_q *cmdq)
notify_window_layout_changed(src_w);
notify_window_layout_changed(dst_w);
cmd_find_clear_state(&cmdq->current, NULL, 0);
cmdq->current.s = dst_s;
cmdq->current.wl = dst_wl;
cmdq->current.w = dst_w;
cmdq->current.wp = dst_wp;
cmd_find_log_state(__func__, &cmdq->current);
return (CMD_RETURN_NORMAL);
}