aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/api/window.c
diff options
context:
space:
mode:
authorSean Dewar <seandewar@users.noreply.github.com>2023-07-23 23:10:28 +0100
committerSean Dewar <seandewar@users.noreply.github.com>2023-07-26 20:44:46 +0100
commit5d921e28c1cc33eced22bbfa823460ca241e3dc1 (patch)
treead06c2e4edc74e687f213f133557a8e085100aac /src/nvim/api/window.c
parent6b4970f6e0ac36021b2a8bd0533f5078040d31f7 (diff)
downloadrneovim-5d921e28c1cc33eced22bbfa823460ca241e3dc1.tar.gz
rneovim-5d921e28c1cc33eced22bbfa823460ca241e3dc1.tar.bz2
rneovim-5d921e28c1cc33eced22bbfa823460ca241e3dc1.zip
feat(api): allow win_close in cmdwin to close wins except previous
Disallow closing the previous window from `nvim_win_close`, as this will cause issues. Again, no telling how safe this is. It also requires exposing old_curwin. :/ Also note that it's possible for the `&cmdheight` to change if, for example, there are 2 tabpages and `nvim_win_close` is used to close the last window in the other tabpage while `&stal` is 1. This is addressed in a later commit.
Diffstat (limited to 'src/nvim/api/window.c')
-rw-r--r--src/nvim/api/window.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index 666f09e890..350d934825 100644
--- a/src/nvim/api/window.c
+++ b/src/nvim/api/window.c
@@ -404,10 +404,11 @@ void nvim_win_close(Window window, Boolean force, Error *err)
if (cmdwin_type != 0) {
if (win == curwin) {
cmdwin_result = Ctrl_C;
- } else {
+ return;
+ } else if (win == cmdwin_old_curwin) {
api_set_error(err, kErrorTypeException, "%s", e_cmdwin);
+ return;
}
- return;
}
tabpage_T *tabpage = win_find_tabpage(win);