summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-06-26 22:33:51 +0200
committerBram Moolenaar <Bram@vim.org>2014-06-26 22:33:51 +0200
commitb7d929a86f4c3c4d127b37728b26f3a4632b8474 (patch)
tree0e991d424c0f13f542ad1c462629ef0de3d7e4ef
parent9d7a592c8007d67627eac34edac14996926a99f8 (diff)
downloadvim-git-b7d929a86f4c3c4d127b37728b26f3a4632b8474.tar.gz
updated for version 7.4.347v7.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.
-rw-r--r--src/testdir/test55.in3
-rw-r--r--src/testdir/test55.ok2
-rw-r--r--src/version.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/src/testdir/test55.in b/src/testdir/test55.in
index f12dc2d22..ace97bf30 100644
--- a/src/testdir/test55.in
+++ b/src/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/testdir/test55.ok b/src/testdir/test55.ok
index 901bc9406..3969995a1 100644
--- a/src/testdir/test55.ok
+++ b/src/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/version.c b/src/version.c
index 4adf3e55d..a6b030d2f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 347,
+/**/
346,
/**/
345,