patch 8.2.3313: unused code in win_exchange() and frame_remove()

Problem:    Unused code in win_exchange() and frame_remove().
Solution:   Remove the code. (closes #8728)

diff --git a/src/version.c b/src/version.c
index a6e2f1ef0a7415fd5309828f3986f82c37e19347..db75af720bd14f2aebd40adc1a0993ef31edbf20 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3313,
 /**/
     3312,
 /**/

diff --git a/src/window.c b/src/window.c
index 7dcb8ed5bd2176ae9264c40df3d37bc540bbf304..1cc85497d8292c777f14cbac3d8b00aad56a67a8 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -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
 
@@ -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;
 }