Mercurial > vim
changeset 5877:24c90f1fec85 v7.4.281
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.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 07 May 2014 21:14:47 +0200 |
| parents | 4f70dc360704 |
| children | 24d8ac7d92fc |
| files | src/ex_docmd.c src/version.c |
| diffstat | 2 files changed, 18 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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; @@ -10399,6 +10400,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'. * Don't use goto_tabpage(), it may change directory and trigger @@ -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.