Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-04-22 10:05:54 +01:00
21 changed files with 477 additions and 245 deletions

View File

@ -518,6 +518,7 @@ window_unzoom(struct window *w)
w->flags &= ~WINDOW_ZOOMED;
layout_free(w);
w->layout_root = w->saved_layout_root;
w->saved_layout_root = NULL;
TAILQ_FOREACH(wp, &w->panes, entry) {
wp->layout_cell = wp->saved_layout_cell;