patch 7.4.693

Problem:    Session file is not correct when there are multiple tab pages.
Solution:   Reset the current window number for each tab page. (Jacob Niehus)

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 453d83e8d63763399ff85c608d9ab47d01d1ab54..e46ea05c1d4781adb18be7e588b74e60737ac179 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -10845,7 +10845,6 @@ makeopens(fd, dirnow)
     buf_T      *buf;
     int                only_save_windows = TRUE;
     int                nr;
-    int                cnr = 1;
     int                restore_size = TRUE;
     win_T      *wp;
     char_u     *sname;
@@ -10983,7 +10982,8 @@ makeopens(fd, dirnow)
     tab_topframe = topframe;
     for (tabnr = 1; ; ++tabnr)
     {
-       int  need_tabnew = FALSE;
+       int     need_tabnew = FALSE;
+       int     cnr = 1;
 
        if ((ssop_flags & SSOP_TABPAGES))
        {

diff --git a/src/version.c b/src/version.c
index 95dc69d90043baf1c859b190ec2eabeec67585b0..9431180b11bc680efff1c58f1b5b4e5771af90eb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    693,
 /**/
     692,
 /**/