aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/ex_docmd.c2
-rw-r--r--src/nvim/testdir/test_mksession.vim9
-rw-r--r--src/nvim/version.c2
3 files changed, 12 insertions, 1 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 47e23b6e80..5145c65bc7 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -8933,6 +8933,8 @@ makeopens (
// resized when moving between windows.
// Do this before restoring the view, so that the topline and the
// cursor can be set. This is done again below.
+ // winminheight and winminwidth need to be set to avoid an error if the
+ // user has set winheight or winwidth.
if (put_line(fd, "set winminheight=1 winminwidth=1 winheight=1 winwidth=1")
== FAIL) {
return FAIL;
diff --git a/src/nvim/testdir/test_mksession.vim b/src/nvim/testdir/test_mksession.vim
index 928f065efb..284bafab75 100644
--- a/src/nvim/testdir/test_mksession.vim
+++ b/src/nvim/testdir/test_mksession.vim
@@ -100,6 +100,15 @@ func Test_mksession()
let &wrap = wrap_save
endfunc
+func Test_mksession_winheight()
+ new
+ set winheight=10 winminheight=2
+ mksession! test_mks.out
+ source test_mks.out
+
+ " call delete('test_mks.out')
+endfunc
+
" Verify that arglist is stored correctly to the session file.
func Test_mksession_arglist()
argdel *
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 80018f6eab..f2686eacec 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -699,7 +699,7 @@ static const int included_patches[] = {
// 256,
// 255,
// 254,
- // 253,
+ 253,
// 252,
// 251,
250,