diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-11-16 14:11:15 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2017-06-04 22:12:14 -0400 |
| commit | 0164a5fea3a240efc631bc10ebf1b547c2149971 (patch) | |
| tree | f4651b5a05e83a35f266154e90cf250f0e2c15ad | |
| parent | 481654a88bd184ed90b87607d6798865bcc375a3 (diff) | |
| download | rneovim-0164a5fea3a240efc631bc10ebf1b547c2149971.tar.gz rneovim-0164a5fea3a240efc631bc10ebf1b547c2149971.tar.bz2 rneovim-0164a5fea3a240efc631bc10ebf1b547c2149971.zip | |
vim-patch:7.4.1978
Problem: Large file test does not delete its output.
Solution: Delete the output. Check size properly when possible. (Ken Takata)
https://github.com/vim/vim/commit/c5af40ae646ceda817eff93b4f9ba274f031bea6
| -rw-r--r-- | src/nvim/testdir/test_largefile.vim | 12 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/nvim/testdir/test_largefile.vim b/src/nvim/testdir/test_largefile.vim index ea2b8ff62d..1b3e02a0c8 100644 --- a/src/nvim/testdir/test_largefile.vim +++ b/src/nvim/testdir/test_largefile.vim @@ -22,9 +22,13 @@ func Test_largefile() normal 50% normal gg w - " Check if the file size is larger than 2^31 - 1 bytes. - " Note that getfsize() returns -2 if a Number is 32 bits. + " Check if the file size is 4,000,000,000 bytes. let fsize=getfsize(fname) - call assert_true(fsize > 2147483647 || fsize == -2) - "call delete(fname) + if has('num64') + call assert_true(fsize == 4000000000) + else + " getfsize() returns -2 if a Number is 32 bits. + call assert_true(fsize == -2) + endif + call delete(fname) endfunc diff --git a/src/nvim/version.c b/src/nvim/version.c index 2e43670edb..6838c476c1 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -466,7 +466,7 @@ static const int included_patches[] = { 1981, 1980, // 1979, - // 1978, + 1978, 1977, 1976, 1975, |