Mercurial > vim

changeset 25553:8b5dc14345ce v8.2.3313

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3313: unused code in win_exchange() and frame_remove() Commit: https://github.com/vim/vim/commit/9e2fa4bb9eb40a78a1ae1f67a4064651b5ce0aac Author: gmntroll <gmantrolllol@gmail.com> Date: Sat Aug 7 22:35:52 2021 +0200 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 https://github.com/vim/vim/issues/8728)
author Bram Moolenaar <Bram@vim.org>
date Sat, 07 Aug 2021 22:45:02 +0200
parents 4ecef4a5ea54
children a1127668cdfa
files src/version.c src/window.c
diffstat 2 files changed, 6 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3313,
+/**/
     3312,
 /**/
     3311,
--- 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;
 }