From 6c550a4f13b7bb90221dbae655b7899a3b72fa72 Mon Sep 17 00:00:00 2001 From: Jurica Bradaric Date: Sat, 14 May 2016 22:51:05 +0200 Subject: vim-patch:7.4.1468 Problem: Sort test doesn't test with "1" argument. Solution: Also test ignore-case sorting. (Yasuhiro Matsumoto) https://github.com/vim/vim/commit/51d1d536802b5d8232d47e56f165ba8a009529b5 --- src/nvim/version.c | 2 +- test/functional/legacy/function_sort_spec.lua | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/nvim/version.c b/src/nvim/version.c index 5352a5bc5f..ea683f0834 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -225,7 +225,7 @@ static int included_patches[] = { // 1471 NA // 1470 NA // 1469 NA - // 1468, + 1468, // 1467 NA // 1466 NA // 1465 NA diff --git a/test/functional/legacy/function_sort_spec.lua b/test/functional/legacy/function_sort_spec.lua index fb4a5b7713..b274aee94b 100644 --- a/test/functional/legacy/function_sort_spec.lua +++ b/test/functional/legacy/function_sort_spec.lua @@ -44,9 +44,10 @@ describe('sort', function() it('default sort', function() -- docs say omitted, empty or zero argument sorts on string representation - eq({'2', 1, 3.3}, eval('sort([3.3, 1, "2"])')) - eq({'2', 1, 3.3}, eval([[sort([3.3, 1, "2"], '')]])) - eq({'2', 1, 3.3}, eval('sort([3.3, 1, "2"], 0)')) + eq({'2', 'A', 'AA', 'a', 1, 3.3}, eval('sort([3.3, 1, "2", "A", "a", "AA"])')) + eq({'2', 'A', 'AA', 'a', 1, 3.3}, eval([[sort([3.3, 1, "2", "A", "a", "AA"], '')]])) + eq({'2', 'A', 'AA', 'a', 1, 3.3}, eval('sort([3.3, 1, "2", "A", "a", "AA"], 0)')) + eq({'2', 'A', 'a', 'AA', 1, 3.3}, eval('sort([3.3, 1, "2", "A", "a", "AA"], 1)')) neq(exc_exec('call sort([3.3, 1, "2"], 3)'):find('E474:'), nil) end) end) -- cgit