From 82da7eed343151e11bb281ea37136812a0a93712 Mon Sep 17 00:00:00 2001 From: Jurica Bradaric Date: Sat, 14 May 2016 22:35:51 +0200 Subject: [PATCH] vim-patch:7.4.1397 Problem: Sort test fails on MS-Windows. Solution: Correct the compare function. https://github.com/vim/vim/commit/0bb6108eb4e1ecaed437bc507f514f5da7816d9e --- src/nvim/version.c | 2 +- test/functional/legacy/function_sort_spec.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nvim/version.c b/src/nvim/version.c index 1e2a6abbb0..6479690a53 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -296,7 +296,7 @@ static int included_patches[] = { // 1400 NA // 1399 NA // 1398 NA - // 1397, + 1397, // 1396, // 1395 NA 1394, diff --git a/test/functional/legacy/function_sort_spec.lua b/test/functional/legacy/function_sort_spec.lua index 389fbf8e80..3347dd9699 100644 --- a/test/functional/legacy/function_sort_spec.lua +++ b/test/functional/legacy/function_sort_spec.lua @@ -31,11 +31,11 @@ describe('sort', function() it('ability to call sort() from a compare function', function() execute('func Compare1(a, b) abort') execute([[call sort(range(3), 'Compare2')]]) - execute('return a:a ># a:b') + execute('return a:a - a:b') execute('endfunc') execute('func Compare2(a, b) abort') - execute('return a:a <# a:b') + execute('return a:a - a:b') execute('endfunc') eq({1, 3, 5}, eval("sort([3, 1, 5], 'Compare1')")) end)