vim-patch:8.0.0253

Problem:    When creating a session when winminheight is 2 or larger and
            loading that session gives an error.
Solution:   Also set winminheight before setting winheight to 1. (Rafael
            Bodill, neovim vim/vim#5717)

36ae89c550
This commit is contained in:
James McCoy
2017-09-26 15:39:41 -04:00
parent 1c7f396f0c
commit 5bb2a19417
3 changed files with 12 additions and 1 deletions

View File

@@ -8933,6 +8933,8 @@ makeopens (
// resized when moving between windows. // resized when moving between windows.
// Do this before restoring the view, so that the topline and the // Do this before restoring the view, so that the topline and the
// cursor can be set. This is done again below. // 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") if (put_line(fd, "set winminheight=1 winminwidth=1 winheight=1 winwidth=1")
== FAIL) { == FAIL) {
return FAIL; return FAIL;

View File

@@ -100,6 +100,15 @@ func Test_mksession()
let &wrap = wrap_save let &wrap = wrap_save
endfunc 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. " Verify that arglist is stored correctly to the session file.
func Test_mksession_arglist() func Test_mksession_arglist()
argdel * argdel *

View File

@@ -699,7 +699,7 @@ static const int included_patches[] = {
// 256, // 256,
// 255, // 255,
// 254, // 254,
// 253, 253,
// 252, // 252,
// 251, // 251,
250, 250,