# HG changeset patch # User Christian Brabandt # Date 1451755804 -3600 # Node ID b3eb1dfbc1fa85d153d55050da0f9b472df4b36f # Parent 9fb6c92a5a1831b20d608db0537c1e7d6d02f9fb commit https://github.com/vim/vim/commit/d3343960d7745bd586197a28b9a96d634a292422 Author: Bram Moolenaar Date: Sat Jan 2 18:17:16 2016 +0100 patch 7.4.1029 Problem: test_increment fails on systems with 32 bit long. Solution: Only test with 32 bits. diff --git a/src/testdir/test_increment.in b/src/testdir/test_increment.in --- 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 --- a/src/testdir/test_increment.ok +++ b/src/testdir/test_increment.ok @@ -330,10 +330,10 @@ 0b1010a # Test 26 S26==== -0b1111111111111111111111111111111111111111111111111111111111111110 +0b11111111111111111111111111111110 E26==== -0b1111111111111111111111111111111111111111111111111111111111111111 +0b11111111111111111111111111111111 ENDTEST diff --git a/src/version.c b/src/version.c --- 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,