diff options
| -rw-r--r-- | src/nvim/version.c | 2 | ||||
| -rw-r--r-- | src/nvim/window.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c index 80b8b03258..bd90f28629 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -273,7 +273,7 @@ static const int included_patches[] = { // 682, // 681, // 680, - // 679, + 679, 678, // 677, // 676, diff --git a/src/nvim/window.c b/src/nvim/window.c index 6a21844812..081fc98816 100644 --- a/src/nvim/window.c +++ b/src/nvim/window.c @@ -1878,7 +1878,7 @@ int win_close(win_T *win, int free_buf) int dir; int help_window = FALSE; tabpage_T *prev_curtab = curtab; - frame_T *win_frame = win->w_frame; + frame_T *win_frame = win->w_frame->fr_parent; if (last_window()) { EMSG(_("E444: Cannot close last window")); @@ -2030,7 +2030,7 @@ int win_close(win_T *win, int free_buf) if (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->fr_parent, dir); + win_equal(curwin, curwin->w_frame->fr_parent == win_frame, dir); } else { win_comp_pos(); } |