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

floating-window.c: fix crash when using inccommand

Browse Source
This commit is contained in:
Jit Yao Yap
2019-03-22 00:10:57 +08:00
committed by Björn Linse
parent b3b8910c48
commit 31fa064c68
2 changed files with 193 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/window.c
View File

@@ -2462,7 +2462,7 @@ int win_close(win_T *win, bool free_buf)
}
if (!was_floating) {
if (p_ea && (*p_ead == 'b' || *p_ead == dir)) {
if (!curwin->w_floating && p_ea && (*p_ead == 'b' || *p_ead == dir)) {
// If the frame of the closed window contains the new current window,
// only resize that frame. Otherwise resize all windows.
win_equal(curwin, curwin->w_frame->fr_parent == win_frame, dir);
@@ -4656,7 +4656,11 @@ void win_size_restore(garray_T *gap)
{
int i = 0;
FOR_ALL_WINDOWS_IN_TAB(wp, curtab) {
frame_setwidth(wp->w_frame, ((int *)gap->ga_data)[i++]);
if (wp->w_floating) {
win_setwidth_win(((int *)gap->ga_data)[i++], wp);
} else {
frame_setwidth(wp->w_frame, ((int *)gap->ga_data)[i++]);
}
win_setheight_win(((int *)gap->ga_data)[i++], wp);
}
}