From 6513808720a9c51b3cd49a59f5d3e99c1218959c Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Mon, 25 May 2026 15:50:25 +0100
Subject: [PATCH] And a bad merge.

---
 cmd-swap-pane.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c
index 217d3517..a8e252e7 100644
--- a/cmd-swap-pane.c
+++ b/cmd-swap-pane.c
@@ -109,13 +109,6 @@ cmd_swap_pane_exec(struct cmd *self, struct cmdq_item *item)
 		dst_wp->flags ^= PANE_FLOATING;
 	}
 
-	/* Swap PANE_FLOATING flag to keep each pane consistent with its new
-	 * layout cell (floating cells have parent == NULL). */
-	if ((src_wp->flags ^ dst_wp->flags) & PANE_FLOATING) {
-		src_wp->flags ^= PANE_FLOATING;
-		dst_wp->flags ^= PANE_FLOATING;
-	}
-
 	src_wp->window = dst_w;
 	options_set_parent(src_wp->options, dst_w->options);
 	src_wp->flags |= (PANE_STYLECHANGED|PANE_THEMECHANGED);