changeset 6739:f012247e8ec8 v7.4.693

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)
author Bram Moolenaar <bram@vim.org>
date Mon, 13 Apr 2015 12:39:22 +0200
parents 39e174e02dec
children 2ed977b23d68
files src/ex_docmd.c src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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))
 	{
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    693,
+/**/
     692,
 /**/
     691,