summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-03-15 11:05:45 +0100
committerBram Moolenaar <Bram@vim.org>2016-03-15 11:05:45 +0100
commit790500a8e65bee295ef51a59dfa67ecbaab8ea17 (patch)
treedb912adce069e1b31d818926d6da561a5fd30a3a
parent9eb3bb2930f804c1d428ea4527e136ac9cd9da43 (diff)
patch 7.4.1563v7.4.1563
Problem: Partial test fails on windows. Solution: Return 1 or -1 from compare function.
-rw-r--r--src/testdir/test_partial.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_partial.vim b/src/testdir/test_partial.vim
index 061f839668..998b232206 100644
--- a/src/testdir/test_partial.vim
+++ b/src/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/version.c b/src/version.c
index a323d2c0f8..50d20f1003 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1563,
+/**/
1562,
/**/
1561,