From 67664c74f8ab016e9c7aa3ede96dc66fcb4c9684 Mon Sep 17 00:00:00 2001
From: Björn Linse <bjorn.linse@gmail.com>
Date: Sat, 10 Aug 2019 17:27:29 +0200
Subject: api/window: disallow closing non-current window in cmdwin state

---
 src/nvim/api/window.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'src/nvim/api/window.c')

diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index 0103e17176..e279edebde 100644
--- a/src/nvim/api/window.c
+++ b/src/nvim/api/window.c
@@ -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);
 }
-- 
cgit