summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-11-28 20:40:00 +0000
committerBram Moolenaar <Bram@vim.org>2006-11-28 20:40:00 +0000
commit3b1b6c62596a8ad13e31675976d055c2e387c489 (patch)
tree5a1a570dd535a9c0117a464153aadd0b0b997f01 /src
parentf278987c97dc8e90c519d6664f26590adeaeb99d (diff)
downloadvim-3b1b6c62596a8ad13e31675976d055c2e387c489.zip
updated for version 7.0-174
Diffstat (limited to 'src')
-rw-r--r--src/ex_docmd.c10
-rw-r--r--src/version.c2
2 files changed, 11 insertions, 1 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 8abba5fb9..7f136f19a 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -9675,6 +9675,7 @@ makeopens(fd, dirnow)
win_T *edited_win = NULL;
int tabnr;
win_T *tab_firstwin;
+ frame_T *tab_topframe;
if (ssop_flags & SSOP_BUFFERS)
only_save_windows = FALSE; /* Save ALL buffers */
@@ -9786,6 +9787,7 @@ makeopens(fd, dirnow)
* autocommands.
*/
tab_firstwin = firstwin; /* first window in tab page "tabnr" */
+ tab_topframe = topframe;
for (tabnr = 1; ; ++tabnr)
{
int need_tabnew = FALSE;
@@ -9797,9 +9799,15 @@ makeopens(fd, dirnow)
if (tp == NULL)
break; /* done all tab pages */
if (tp == curtab)
+ {
tab_firstwin = firstwin;
+ tab_topframe = topframe;
+ }
else
+ {
tab_firstwin = tp->tp_firstwin;
+ tab_topframe = tp->tp_topframe;
+ }
if (tabnr > 1)
need_tabnew = TRUE;
}
@@ -9838,7 +9846,7 @@ makeopens(fd, dirnow)
*/
if (put_line(fd, "set splitbelow splitright") == FAIL)
return FAIL;
- if (ses_win_rec(fd, topframe) == FAIL)
+ if (ses_win_rec(fd, tab_topframe) == FAIL)
return FAIL;
if (!p_sb && put_line(fd, "set nosplitbelow") == FAIL)
return FAIL;
diff --git a/src/version.c b/src/version.c
index 3310ef21e..b77a93edc 100644
--- 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 */
/**/
+ 174,
+/**/
173,
/**/
172,