summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-22 23:50:28 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-22 23:50:28 +0100
commit0bb6108eb4e1ecaed437bc507f514f5da7816d9e (patch)
treeaceeddab2e80b70d3f1c5df72a601c5846466b67
parent1daae446e58fd90f98c51ff3af8f54bfa5197751 (diff)
patch 7.4.1397v7.4.1397
Problem: Sort test fails on MS-Windows. Solution: Correct the compare function.
-rw-r--r--src/testdir/test_sort.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_sort.vim b/src/testdir/test_sort.vim
index 68021f6de6..2b097ceb96 100644
--- 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 a476aaee5f..b8cd111335 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1397,
+/**/
1396,
/**/
1395,