From: Bram Moolenaar Date: Mon, 22 Feb 2016 22:50:28 +0000 (+0100) Subject: patch 7.4.1397 X-Git-Tag: v7.4.1397 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=0bb6108eb4e1ecaed437bc507f514f5da7816d9e;p=thirdparty%2Fvim.git 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 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 @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1397, /**/ 1396, /**/