diff options
| author | André Twupack <atwupack@mailbox.org> | 2014-09-05 22:58:07 +0200 |
|---|---|---|
| committer | André Twupack <atwupack@mailbox.org> | 2014-09-13 19:11:07 +0200 |
| commit | c68468500f5aac86414a54c753af53e8e3f8b841 (patch) | |
| tree | 91eb7fc40dec4ff76c42c26b3b3c5b9c8d080e22 | |
| parent | 9f252554e31bb24a5d75607c47a2a71b770a681c (diff) | |
| download | rneovim-c68468500f5aac86414a54c753af53e8e3f8b841.tar.gz rneovim-c68468500f5aac86414a54c753af53e8e3f8b841.tar.bz2 rneovim-c68468500f5aac86414a54c753af53e8e3f8b841.zip | |
vim-patch:7.4.347
Problem: test55 fails on some systems.
Solution: Remove the elements that all result in zero and can end up in an arbitrary position.
https://code.google.com/p/vim/source/detail?r=v7-4-347
| -rw-r--r-- | src/nvim/testdir/test55.in | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/test55.ok | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/nvim/testdir/test55.in b/src/nvim/testdir/test55.in index f12dc2d22f..ace97bf30e 100644 --- a/src/nvim/testdir/test55.in +++ b/src/nvim/testdir/test55.in @@ -332,8 +332,9 @@ let l = [0, 1, 2, 3] :$put =string(reverse(sort(l))) :$put =string(sort(reverse(sort(l)))) :$put =string(uniq(sort(l))) -:let l=[7, 9, 18, 12, 22, 10.0e-16, -1, 0xff, 0, -0, 0.22, 'foo', 'FOOBAR',{}, []] +:let l=[7, 9, 18, 12, 22, 10.0e-16, -1, 0xff, 0.22, 'foo'] :$put =string(sort(copy(l), 'n')) +:let l=[7, 9, 18, 12, 22, 10.0e-16, -1, 0xff, 0, -0, 0.22, 'foo', 'FOOBAR',{}, []] :$put =string(sort(copy(l), 1)) :$put =string(sort(copy(l), 'i')) :$put =string(sort(copy(l))) diff --git a/src/nvim/testdir/test55.ok b/src/nvim/testdir/test55.ok index 901bc94066..3969995a1e 100644 --- a/src/nvim/testdir/test55.ok +++ b/src/nvim/testdir/test55.ok @@ -101,7 +101,7 @@ caught a:000[3] [[0, 1, 2], [0, 1, 2], 4, 2, 2, 1.5, 'xaaa', 'x8', 'foo6', 'foo', 'foo', 'A11', '-0'] ['-0', 'A11', 'foo', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 2, 4, [0, 1, 2], [0, 1, 2]] ['-0', 'A11', 'foo', 'foo6', 'x8', 'xaaa', 1.5, 2, 4, [0, 1, 2]] -[-1, 0, 0, 'foo', 'FOOBAR', {}, [], 1.0e-15, 0.22, 7, 9, 12, 18, 22, 255] +[-1, 'foo', 1.0e-15, 0.22, 7, 9, 12, 18, 22, 255] ['foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}] ['foo', 'FOOBAR', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}] ['FOOBAR', 'foo', -1, 0, 0, 0.22, 1.0e-15, 12, 18, 22, 255, 7, 9, [], {}] diff --git a/src/nvim/version.c b/src/nvim/version.c index f96e557dd8..f99767cf19 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -248,7 +248,7 @@ static int included_patches[] = { //350, 349, 348, - //347, + 347, 346, 345, 344, |