mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-16 00:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(float): do not switch window before deleting last listed buffer (#17840)

Browse Source 
Just allow close_windows() to close the current window instead.
This fixes wrong working directory or autocommands not being triggered.
This commit is contained in:
zeertzjq
2022-03-24 14:53:20 +08:00
committed by GitHub
parent ff82b2785f
commit a72f338d76
2 changed files with 74 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/nvim/buffer.c
View File

@@ -1042,24 +1042,24 @@ static int empty_curbuf(int close_others, int forceit, int action)
set_bufref(&bufref, buf);
if (close_others) {
bool can_close_all_others = true;
if (curwin->w_floating) {
bool can_close_all_others = false;
// Closing all other windows with this buffer may leave only floating windows.
can_close_all_others = false;
for (win_T *wp = firstwin; !wp->w_floating; wp = wp->w_next) {
if (wp->w_buffer != curbuf) {
// Found another non-floating window with a different (probably unlisted) buffer.
// Closing all other windows with the this buffer is fine in this case.
// Closing all other windows with this buffer is fine in this case.
can_close_all_others = true;
break;
}
}
if (!can_close_all_others) {
// Closing all other windows with this buffer will close all non-floating windows.
// Move to a non-floating window then.
curwin = firstwin;
}
}
// Close any other windows on this buffer, then make it empty.
close_windows(buf, true);
// If it is fine to close all other windows with this buffer, keep the current window and
// close any other windows with this buffer, then make it empty.
// Otherwise close_windows() will refuse to close the last non-floating window, so allow it
// to close the current window instead.
close_windows(buf, can_close_all_others);
}
setpcmark();