From: Bram Moolenaar Date: Sat, 2 Jan 2016 17:17:16 +0000 (+0100) Subject: patch 7.4.1029 X-Git-Tag: v7.4.1029 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3343960d7745bd586197a28b9a96d634a292422;p=thirdparty%2Fvim.git 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 index 753951d40c..f5d8ff9c3e 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 4d8fbb0ae1..77ce9d4156 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 f0128d2d91..3867e08971 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1029, /**/ 1028, /**/