updated for version 7.0-196

diff --git a/src/version.c b/src/version.c
index d60f52d02d70d8efeb5d0b4008f3738e97dc9314..5846a406f7618f8985987ade2e9e22413af6bf63 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    196,
 /**/
     195,
 /**/

diff --git a/src/window.c b/src/window.c
index ee9ef9c0c52477b9e170f0c026eb37c1b720d7f5..aa4d26a0bb7cd988f357200ae9d23718b8da7259 100644 (file)
--- 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);