summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-02 18:17:16 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-02 18:17:16 +0100
commitd3343960d7745bd586197a28b9a96d634a292422 (patch)
tree109650ee23ca17109c2ef1a601a386af17fced37
parent92c23d8ab82e723e5fa2e0c5ee06348d72b8e444 (diff)
downloadvim-git-d3343960d7745bd586197a28b9a96d634a292422.tar.gz
patch 7.4.1029v7.4.1029
Problem: test_increment fails on systems with 32 bit long. Solution: Only test with 32 bits.
-rw-r--r--src/testdir/test_increment.in2
-rw-r--r--src/testdir/test_increment.ok4
-rw-r--r--src/version.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/test_increment.in b/src/testdir/test_increment.in
index 753951d40..f5d8ff9c3 100644
--- a/src/testdir/test_increment.in
+++ b/src/testdir/test_increment.in
@@ -725,7 +725,7 @@ E25====
# Test 26
S26====
-0b1111111111111111111111111111111111111111111111111111111111111110
+0b11111111111111111111111111111110
E26====
diff --git a/src/testdir/test_increment.ok b/src/testdir/test_increment.ok
index 4d8fbb0ae..77ce9d415 100644
--- a/src/testdir/test_increment.ok
+++ b/src/testdir/test_increment.ok
@@ -330,10 +330,10 @@ E25====
# Test 26
S26====
-0b1111111111111111111111111111111111111111111111111111111111111110
+0b11111111111111111111111111111110
E26====
-0b1111111111111111111111111111111111111111111111111111111111111111
+0b11111111111111111111111111111111
ENDTEST
diff --git a/src/version.c b/src/version.c
index f0128d2d9..3867e0897 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1029,
+/**/
1028,
/**/
1027,