diff options
| author | watiko <service@mail.watiko.net> | 2016-01-15 17:11:28 +0900 |
|---|---|---|
| committer | watiko <service@mail.watiko.net> | 2016-02-01 03:47:08 +0900 |
| commit | a6e4271c15f9cad09ce69bc2b629c10556ac762d (patch) | |
| tree | 0076181161dabb69304a6cbac84b7c82d75b6331 /src | |
| parent | a5f361e470c816ec9258fb815befafdef52b000b (diff) | |
| download | rneovim-a6e4271c15f9cad09ce69bc2b629c10556ac762d.tar.gz rneovim-a6e4271c15f9cad09ce69bc2b629c10556ac762d.tar.bz2 rneovim-a6e4271c15f9cad09ce69bc2b629c10556ac762d.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/test_increment.in | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_increment.ok | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
3 files changed, 4 insertions, 4 deletions
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, |