Merge branch 'master' into floating_panes

This commit is contained in:
Dane Jensen
2026-06-22 11:32:30 -07:00
116 changed files with 2745 additions and 3 deletions

View File

@@ -1431,10 +1431,10 @@ layout_floating_pane(struct window *w, struct window_pane *wp, u_int sx,
{
struct layout_cell *lc, *lcnew, *lcparent;
if (wp != NULL)
lc = wp->layout_cell;
else
if (wp == NULL)
lc = w->layout_root;
else
lc = wp->layout_cell;
lcparent = lc->parent;
if (lcparent == NULL) {