patch 7.4.1563

Problem:    Partial test fails on windows.
Solution:   Return 1 or -1 from compare function.

diff --git a/src/testdir/test_partial.vim b/src/testdir/test_partial.vim
index 061f839668e0326b3a211856a3ffaa30a9e537f8..998b232206b1c037e1be71e0a5429f0524a1c2ca 100644 (file)
--- 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 a323d2c0f8a232b8a6234ff294433756df795cd1..50d20f10034639839c5332c2fc6f33a240ce76d2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1563,
 /**/
     1562,
 /**/