patch 7.4.1397

Problem:    Sort test fails on MS-Windows.
Solution:   Correct the compare function.

diff --git a/src/testdir/test_sort.vim b/src/testdir/test_sort.vim
index 68021f6de6be40b73ab5b0426fd9fda5a52cc952..2b097ceb96374cd0126fa8f03beadc09873f483c 100644 (file)
--- a/src/testdir/test_sort.vim
+++ b/src/testdir/test_sort.vim
@@ -2,11 +2,11 @@
 
 :func Compare1(a, b) abort
     call sort(range(3), 'Compare2')
-    return a:a ># a:b
+    return a:a - a:b
 :endfunc
 
 :func Compare2(a, b) abort
-    return a:a <# a:b
+    return a:a - a:b
 :endfunc
 
 func Test_sort_strings()

diff --git a/src/version.c b/src/version.c
index a476aaee5fcd4accfe4fcc83ca110fb3f03c4fb2..b8cd1113357aed3e6fd93dbe8d50220078a16046 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1397,
 /**/
     1396,
 /**/