From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 7 May 2014 19:14:47 +0000 (+0200)
Subject: updated for version 7.4.281
X-Git-Tag: v7.4.281
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04ad7fe05c1c15c31949022d48e3008158f0657a;p=vim

updated for version 7.4.281
Problem:    When a session file has more than one tabpage and 'showtabline' is
            one the positions may be slightly off.
Solution:   Set 'showtabline' to two while positioning windows.
---

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index a88cdd564..a7df2c31a 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -10290,6 +10290,7 @@ makeopens(fd, dirnow)
     char_u	*sname;
     win_T	*edited_win = NULL;
     int		tabnr;
+    int		restore_stal = FALSE;
     win_T	*tab_firstwin;
     frame_T	*tab_topframe;
     int		cur_arg_idx = 0;
@@ -10398,6 +10399,19 @@ makeopens(fd, dirnow)
     }
 #endif
 
+    /*
+     * When there are two or more tabpages and 'showtabline' is 1 the tabline
+     * will be displayed when creating the next tab.  That resizes the windows
+     * in the first tab, which may cause problems.  Set 'showtabline' to 2
+     * temporarily to avoid that.
+     */
+    if (p_stal == 1 && first_tabpage->tp_next != NULL)
+    {
+	if (put_line(fd, "set stal=2") == FAIL)
+	    return FAIL;
+	restore_stal = TRUE;
+    }
+
     /*
      * May repeat putting Windows for each tab, when "tabpages" is in
      * 'sessionoptions'.
@@ -10548,6 +10562,8 @@ makeopens(fd, dirnow)
 		|| put_eol(fd) == FAIL)
 	    return FAIL;
     }
+    if (restore_stal && put_line(fd, "set stal=1") == FAIL)
+	return FAIL;
 
     /*
      * Wipe out an empty unnamed buffer we started in.
diff --git a/src/version.c b/src/version.c
index 818a8b5c1..6da67a187 100644
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    281,
 /**/
     280,
 /**/