diff options
| author | Michael Ennen <mike.ennen@gmail.com> | 2016-10-25 22:48:08 -0700 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2016-12-12 10:17:34 -0500 |
| commit | 66922d89cce6ee381244d37f7c0c324cae815b45 (patch) | |
| tree | aa1c45f67bf8d721b5331071f1272078dd77a810 /src | |
| parent | 521e45f2a8c0619335288accdda0f0aaa1fc6513 (diff) | |
| download | rneovim-66922d89cce6ee381244d37f7c0c324cae815b45.tar.gz rneovim-66922d89cce6ee381244d37f7c0c324cae815b45.tar.bz2 rneovim-66922d89cce6ee381244d37f7c0c324cae815b45.zip | |
vim-patch:7.4.1563
Problem: Partial test fails on windows.
Solution: Return 1 or -1 from compare function.
https://github.com/vim/vim/commit/790500a8e65bee295ef51a59dfa67ecbaab8ea17
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/test_partial.vim | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/testdir/test_partial.vim b/src/nvim/testdir/test_partial.vim index 061f839668..998b232206 100644 --- a/src/nvim/testdir/test_partial.vim +++ b/src/nvim/testdir/test_partial.vim @@ -9,9 +9,9 @@ func MySort(up, one, two) return 0 endif if a:up - return a:one > a:two + return a:one > a:two ? 1 : -1 endif - return a:one < a:two + return a:one < a:two ? 1 : -1 endfunc func Test_partial_args() diff --git a/src/nvim/version.c b/src/nvim/version.c index aac3ba44a2..feb83e495a 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -879,7 +879,7 @@ static int included_patches[] = { // 1566 NA 1565, // 1564, - // 1563, + 1563, // 1562 NA // 1561 NA // 1560 NA |