Mercurial > vim

changeset 1070:32c1b275ba64 v7.0.196

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.0-196
author vimboss
date Mon, 19 Feb 2007 23:14:18 +0000
parents f628d19361d9
children cc03a79fdbb9
files src/version.c src/window.c
diffstat 2 files changed, 20 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    196,
+/**/
     195,
 /**/
     194,
--- a/src/window.c
+++ b/src/window.c
@@ -1541,8 +1541,15 @@ win_move_after(win1, win2)
 	    win1->w_prev->w_status_height = win1->w_status_height;
 	    win1->w_status_height = height;
 #ifdef FEAT_VERTSPLIT
-	    win1->w_prev->w_vsep_width = 0;
-	    win1->w_vsep_width = 1;
+	    if (win1->w_prev->w_vsep_width == 1)
+	    {
+		/* Remove the vertical separator from the last-but-one window,
+		 * add it to the last window.  Adjust the frame widths. */
+		win1->w_prev->w_vsep_width = 0;
+		win1->w_prev->w_frame->fr_width -= 1;
+		win1->w_vsep_width = 1;
+		win1->w_frame->fr_width += 1;
+	    }
 #endif
 	}
 	else if (win2 == lastwin)
@@ -1551,8 +1558,15 @@ win_move_after(win1, win2)
 	    win1->w_status_height = win2->w_status_height;
 	    win2->w_status_height = height;
 #ifdef FEAT_VERTSPLIT
-	    win2->w_vsep_width = 1;
-	    win1->w_vsep_width = 0;
+	    if (win1->w_vsep_width == 1)
+	    {
+		/* Remove the vertical separator from win1, add it to the last
+		 * window, win2.  Adjust the frame widths. */
+		win2->w_vsep_width = 1;
+		win2->w_frame->fr_width += 1;
+		win1->w_vsep_width = 0;
+		win1->w_frame->fr_width -= 1;
+	    }
 #endif
 	}
 	win_remove(win1, NULL);