Move space from closed win into most recent win

If the focused win is in the same color then still use that one,
otherwise use the most recently opened win.

We now use the WinClosed autocmd for this which means that it also
happens when using builtin vim functionality to close the window.

Author: xyb3rt

plugin/acme.vim

@@ -685,23 +685,6 @@ function s:WinCol(w)
 	return col
 endfunc
 
-function s:CloseWin(w)
-	let h = winheight(a:w) + 1
-	let col = s:WinCol(a:w)
-	let [i, j] = [index(col, a:w), index(col, win_getid())]
-	let sb = &splitbelow
-	let &splitbelow = 0
-	exe win_id2win(a:w).'close!'
-	let &splitbelow = sb
-	if j == -1
-		return
-	endif
-	let d = i - j
-	for i in d < 0 ? range(d + 1, -1) : reverse(range(d))
-		call win_move_statusline(winnr() + i, d < 0 ? -h : h)
-	endfor
-endfunc
-
 function s:RestWinVars(w, vars)
 	let vars = getwinvar(a:w, '&')
 	for v in keys(a:vars)
@@ -738,7 +721,7 @@ function s:MoveWin(w, other, below)
 		let nw = win_getid()
 		noa exe win_id2win(p != a:w ? p : nw).'wincmd w'
 		noa exe win_id2win(w != a:w ? w : nw).'wincmd w'
-		noa call s:CloseWin(a:w)
+		noa exe win_id2win(a:w).'close!'
 		call s:RestWinVars(nw, vars)
 	endif
 endfunc
@@ -753,7 +736,7 @@ function s:NewCol(w)
 	endif
 	noa exe win_id2win(p).'wincmd w'
 	noa exe win_id2win(w).'wincmd w'
-	call s:CloseWin(a:w)
+	noa exe win_id2win(a:w).'close!'
 endfunc
 
 function s:Scroll(topline)
@@ -856,7 +839,7 @@ function s:MiddleRelease(click)
 			\ p.winrow <= winheight(p.winid)
 			" off the statusline
 		elseif p.wincol < 3
-			call s:CloseWin(p.winid)
+			exe win_id2win(p.winid).'close!'
 		endif
 		return
 	endif
@@ -1171,6 +1154,36 @@ function s:BufWinLeave()
 	endif
 endfunc
 
+function s:WinClosedPre()
+	" Only works with 'nosplitbelow'
+	let w = str2nr(expand("<amatch>"))
+	let i = index(s:wins, w)
+	if i != -1
+		call remove(s:wins, i)
+	endif
+	let h = winheight(w) + 1
+	let col = s:WinCol(w)
+	let [i, j] = [index(col, w), index(col, win_getid())]
+	if j == -1 || j == i
+		let stack = filter(copy(s:wins), {_, w -> index(col, w) != -1})
+		if stack == []
+			return
+		endif
+		if j == i
+			exe win_id2win(stack[-1]).'wincmd w'
+		endif
+		let j = index(col, stack[-1])
+	endif
+	call timer_start(0, {_ -> s:WinClosedPost(col[j], i - j, h)})
+endfunc
+
+function s:WinClosedPost(w, n, h)
+	let w = win_id2win(a:w)
+	for i in a:n < 0 ? range(a:n + 1, -1) : reverse(range(a:n))
+		call win_move_statusline(w + i, a:n < 0 ? -a:h : a:h)
+	endfor
+endfunc
+
 augroup acme_vim
 au!
 au BufEnter * call s:ListDir()
@@ -1180,6 +1193,8 @@ au TextChanged,TextChangedI guide setl nomodified
 au VimEnter * call s:ReloadDirs(winnr())
 au VimResized * call s:ReloadDirs(0)
 au WinResized * call s:ReloadDirs(0)
+au WinClosed * call s:WinClosedPre()
+au WinNew * call add(s:wins, win_getid())
 augroup END
 
 if exists("s:ctrlexe")
@@ -1200,6 +1215,7 @@ let s:editcids = {}
 let s:editcmds = {}
 let s:jobs = []
 let s:scratch = {}
+let s:wins = []
 
 if s:ctrlexe != ''
 	let s:ctrl = job_start([s:ctrlexe], {