Skip to content

Commit

Permalink
patch 8.2.3313: unused code in win_exchange() and frame_remove()
Browse files Browse the repository at this point in the history
Problem:    Unused code in win_exchange() and frame_remove().
Solution:   Remove the code. (closes #8728)
  • Loading branch information
gmntroll authored and brammool committed Aug 7, 2021
1 parent e525bdd commit 9e2fa4b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 23 deletions.
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
3313,
/**/
3312,
/**/
Expand Down
27 changes: 4 additions & 23 deletions src/window.c
Original file line number Diff line number Diff line change
Expand Up @@ -1684,24 +1684,10 @@ win_exchange(long Prenum)
curwin->w_vsep_width = wp->w_vsep_width;
wp->w_vsep_width = temp;

// If the windows are not in the same frame, exchange the sizes to avoid
// messing up the window layout. Otherwise fix the frame sizes.
if (curwin->w_frame->fr_parent != wp->w_frame->fr_parent)
{
temp = curwin->w_height;
curwin->w_height = wp->w_height;
wp->w_height = temp;
temp = curwin->w_width;
curwin->w_width = wp->w_width;
wp->w_width = temp;
}
else
{
frame_fix_height(curwin);
frame_fix_height(wp);
frame_fix_width(curwin);
frame_fix_width(wp);
}
frame_fix_height(curwin);
frame_fix_height(wp);
frame_fix_width(curwin);
frame_fix_width(wp);

(void)win_comp_pos(); // recompute window positions

Expand Down Expand Up @@ -5275,12 +5261,7 @@ frame_remove(frame_T *frp)
if (frp->fr_prev != NULL)
frp->fr_prev->fr_next = frp->fr_next;
else
{
frp->fr_parent->fr_child = frp->fr_next;
// special case: topframe->fr_child == frp
if (topframe->fr_child == frp)
topframe->fr_child = frp->fr_next;
}
if (frp->fr_next != NULL)
frp->fr_next->fr_prev = frp->fr_prev;
}
Expand Down

0 comments on commit 9e2fa4b

Please sign in to comment.