From a6e4271c15f9cad09ce69bc2b629c10556ac762d Mon Sep 17 00:00:00 2001
From: watiko <service@mail.watiko.net>
Date: Fri, 15 Jan 2016 17:11:28 +0900
Subject: vim-patch:7.4.1029

Problem:    test_increment fails on systems with 32 bit long.
Solution:   Only test with 32 bits.

https://github.com/vim/vim/commit/d3343960d7745bd586197a28b9a96d634a292422
---
 src/nvim/testdir/test_increment.in | 2 +-
 src/nvim/testdir/test_increment.ok | 4 ++--
 src/nvim/version.c                 | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/nvim/testdir/test_increment.in b/src/nvim/testdir/test_increment.in
index 753951d40c..f5d8ff9c3e 100644
--- a/src/nvim/testdir/test_increment.in
+++ b/src/nvim/testdir/test_increment.in
@@ -725,7 +725,7 @@ E25====
 
 # Test 26
 S26====
-0b1111111111111111111111111111111111111111111111111111111111111110
+0b11111111111111111111111111111110
 E26====
 
 
diff --git a/src/nvim/testdir/test_increment.ok b/src/nvim/testdir/test_increment.ok
index 4d8fbb0ae1..77ce9d4156 100644
--- a/src/nvim/testdir/test_increment.ok
+++ b/src/nvim/testdir/test_increment.ok
@@ -330,10 +330,10 @@ E25====
 
 # Test 26
 S26====
-0b1111111111111111111111111111111111111111111111111111111111111110
+0b11111111111111111111111111111110
 E26====
 
-0b1111111111111111111111111111111111111111111111111111111111111111
+0b11111111111111111111111111111111
 
 
 ENDTEST
diff --git a/src/nvim/version.c b/src/nvim/version.c
index c1a92ac0a8..0268364ac9 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -105,7 +105,7 @@ static int included_patches[] = {
   1032,
   // 1031,
   // 1030,
-  // 1029,
+  1029,
   // 1028,
   1027,
   // 1026,
-- 
cgit