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

API: nvim_win_close: Fix closing cmdline-window #10087

Browse Source
This commit is contained in:
R. Simon
2019-08-10 06:41:35 -05:00
committed by Justin M. Keyes
parent 278c5d452c
commit 5f243fc68a
2 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,8 @@
#include <stdlib.h>
#include <limits.h>
#include "nvim/ascii.h"
#include "nvim/globals.h"
#include "nvim/api/window.h"
#include "nvim/api/private/defs.h"
#include "nvim/api/private/helpers.h"
@@ -18,7 +20,6 @@
#include "nvim/screen.h"
#include "nvim/move.h"
/// Gets the current buffer in a window
///
/// @param window Window handle
@@ -526,9 +527,7 @@ Dictionary nvim_win_get_config(Window window, Error *err)
return rv;
}
/// Close a window.
///
/// This is equivalent to |:close| with count except that it takes a window id.
/// Closes the window (like |:close| with a |window-ID|).
///
/// @param window Window handle
/// @param force Behave like `:close!` The last window of a buffer with
@@ -546,6 +545,10 @@ void nvim_win_close(Window window, Boolean force, Error *err)
TryState tstate;
try_enter(&tstate);
ex_win_close(force, win, tabpage == curtab ? NULL : tabpage);
if (cmdwin_type != 0 && win == curwin) {
cmdwin_result = Ctrl_C;
} else {
ex_win_close(force, win, tabpage == curtab ? NULL : tabpage);
}
vim_ignored = try_leave(&tstate, err);
}