diff options
| -rw-r--r-- | src/nvim/ex_docmd.c | 14 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 9102ba63bb..e8930bd0f6 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -7974,6 +7974,17 @@ makeopens ( return FAIL; } + int restore_stal = FALSE; + // 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 @@ -8113,6 +8124,9 @@ makeopens ( || 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/nvim/version.c b/src/nvim/version.c index 0d872b7291..f1c7cfec91 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -206,7 +206,7 @@ static int included_patches[] = { //284, //283, //282, - //281, + 281, 280, //279, //278, |