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

Merge pull request #10738 from bfredl/cmdwinclose

Browse Source 
api/window: disallow closing non-current window in cmdwin state
This commit is contained in:
Björn Linse
2019-08-10 21:21:13 +02:00
committed by GitHub
parent d8d3719941 67664c74f8
commit c190415dc2
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/nvim/api/window.c
View File

@@ -541,14 +541,19 @@ void nvim_win_close(Window window, Boolean force, Error *err)
if (!win) {
return;
}
tabpage_T *tabpage = win_find_tabpage(win);
if (cmdwin_type != 0) {
if (win == curwin) {
cmdwin_result = Ctrl_C;
} else {
api_set_error(err, kErrorTypeException, "%s", _(e_cmdwin));
}
return;
}
tabpage_T *tabpage = win_find_tabpage(win);
TryState tstate;
try_enter(&tstate);
if (cmdwin_type != 0 && win == curwin) {
cmdwin_result = Ctrl_C;
} else {
ex_win_close(force, win, tabpage == curtab ? NULL : tabpage);
}
ex_win_close(force, win, tabpage == curtab ? NULL : tabpage);
vim_ignored = try_leave(&tstate, err);
}