Patch 8.2.3313

[Bram Moolenaar]

Patch 8.2.3313
Problem: Unused code in win_exchange() and frame_remove().
Solution: Remove the code. (closes #8728)
Files: src/window.c


*** ../vim-8.2.3312/src/window.c 2021-08-04 21:16:46.686468445 +0200
--- src/window.c 2021-08-07 22:18:17.752727108 +0200
***************
*** 1684,1707 ****
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);
! }

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

--- 1684,1693 ----
curwin->w_vsep_width = wp->w_vsep_width;
wp->w_vsep_width = temp;

! frame_fix_height(curwin);
! frame_fix_height(wp);
! frame_fix_width(curwin);
! frame_fix_width(wp);

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

***************
*** 5275,5286 ****
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;
}
--- 5261,5267 ----
*** ../vim-8.2.3312/src/version.c 2021-08-07 18:12:35.495528716 +0200
--- src/version.c 2021-08-07 22:16:17.641007189 +0200
***************
*** 757,758 ****
--- 757,760 ----
{ /* Add new patch number below this line */
+ /**/
+ 3313,
/**/

--
ARTHUR: I am your king!
WOMAN: Well, I didn't vote for you.
ARTHUR: You don't vote for kings.
WOMAN: Well, 'ow did you become king then?
The Quest for the Holy Grail (Monty Python)

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///