mirror of
https://github.com/tmux/tmux.git
synced 2026-06-04 00:56:17 +00:00
Merge branch 'master' into floating_panes
This commit is contained in:
4
spawn.c
4
spawn.c
@@ -269,7 +269,8 @@ spawn_pane(struct spawn_context *sc, char **cause)
|
|||||||
sc->wp0->ictx = NULL;
|
sc->wp0->ictx = NULL;
|
||||||
new_wp = sc->wp0;
|
new_wp = sc->wp0;
|
||||||
new_wp->flags &= ~(PANE_STATUSREADY|PANE_STATUSDRAWN);
|
new_wp->flags &= ~(PANE_STATUSREADY|PANE_STATUSDRAWN);
|
||||||
} else if (sc->lc == NULL) {
|
} else {
|
||||||
|
if (sc->lc == NULL) {
|
||||||
new_wp = window_add_pane(w, NULL, hlimit, sc->flags);
|
new_wp = window_add_pane(w, NULL, hlimit, sc->flags);
|
||||||
layout_init(w, new_wp);
|
layout_init(w, new_wp);
|
||||||
} else {
|
} else {
|
||||||
@@ -286,6 +287,7 @@ spawn_pane(struct spawn_context *sc, char **cause)
|
|||||||
*/
|
*/
|
||||||
if (w->flags & WINDOW_ZOOMED)
|
if (w->flags & WINDOW_ZOOMED)
|
||||||
new_wp->saved_layout_cell = new_wp->layout_cell;
|
new_wp->saved_layout_cell = new_wp->layout_cell;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Now we have a pane with nothing running in it ready for the new
|
* Now we have a pane with nothing running in it ready for the new
|
||||||
|
|||||||
Reference in New Issue
Block a user