From bb1f06fa82d9dd3c30b983068e51923cf50dc499 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Tue, 14 Jul 2020 19:43:09 -0400 Subject: [PATCH] vim-patch:8.2.1211: removed more than dead code Problem: Removed more than dead code. Solution: Put back the decrement. https://github.com/vim/vim/commit/8455c5ed31c9cb2919f5e62693bab6b09bf60df2 N/A patch for version.c: vim-patch:8.2.1118: condition can never be true, dead code Problem: Condition can never be true, dead code. Solution: Remove the dead code. https://github.com/vim/vim/commit/810af5ea460eab820cc5899892067d8c242be688 vim-patch:8.2.1214: MS-Windows: default _vimrc not correct in silent install mode Problem: MS-Windows: default _vimrc not correct in silent install mode. Solution: Add the LoadDefaultVimrc macro. (Ken Takata, closes vim/vim#6451) https://github.com/vim/vim/commit/ceb56ddbafbca01e52ff4291d9480bf83d739793 vim-patch:8.2.1215: Atari MiNT support is outdated Problem: Atari MiNT support is outdated. Solution: Nobody responded this code is still useful, so let's delete it. https://github.com/vim/vim/commit/e3f915d12c8fe0466918a29ab4eaef153f71a2cd --- src/nvim/testdir/test_diffmode.vim | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/nvim/testdir/test_diffmode.vim b/src/nvim/testdir/test_diffmode.vim index 42e18ed027..49bbe84869 100644 --- a/src/nvim/testdir/test_diffmode.vim +++ b/src/nvim/testdir/test_diffmode.vim @@ -800,3 +800,25 @@ func Test_diff_closeoff() diffoff! enew! endfunc + +func Test_diff_and_scroll() + " this was causing an ml_get error + set ls=2 + for i in range(winheight(0) * 2) + call setline(i, i < winheight(0) - 10 ? i : i + 10) + endfor + vnew + for i in range(winheight(0)*2 + 10) + call setline(i, i < winheight(0) - 10 ? 0 : i) + endfor + diffthis + wincmd p + diffthis + execute 'normal ' . winheight(0) . "\" + + bwipe! + bwipe! + set ls& +endfunc + +" vim: shiftwidth=2 sts=2 expandtab