aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/version.c2
-rw-r--r--test/functional/legacy/function_sort_spec.lua7
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)