Merge branch 'main' into fix-open-in-small-window

Co-authored-by: sand4rt <17591696+sand4rt@users.noreply.github.com>

Author: Copilot

lua/zen/init.lua

@@ -281,6 +281,12 @@ local function reposition_stack(position)
 		heights[win] = vim.api.nvim_win_get_height(win)
 	end
 
+	-- Some Neovim versions raise `E242: Can't split a window while closing
+	-- another` when this runs from a handler that fires midway through a window
+	-- close (e.g. `WinClosed` recreating a side buffer, whose `BufWinEnter`
+	-- reaches here before the original close has unwound). Guard the splits so
+	-- that refusal cannot abort the surrounding close handler; the reposition is
+	-- re-run by that handler once the offending close has settled.
 	pcall(function()
 		if position == "top" then
 			vim.api.nvim_win_set_config(windows[1], { split = "above", win = -1 })

tests/test_integrations.lua

@@ -215,6 +215,11 @@ for _, case in ipairs({ { name = "above" }, { name = "below" } }) do
 end
 
 T["top integration"]["closing a git commit keeps the top and bottom stacks intact"] = function()
+	-- Regression: creating a commit in fugitive and then closing the gitcommit
+	-- window used to abort the reposition handlers with `E242: Can't split a
+	-- window while closing another`, because recreating a side buffer on
+	-- `WinClosed` re-enters `reposition_stack` mid-close. The close must leave
+	-- the fugitive (top) and trouble (bottom) stacks intact instead.
 	child.lua([[
 		local tmpdir = vim.fn.tempname()
 		vim.fn.mkdir(tmpdir, "p")