diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-03-01 22:51:46 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-03-01 22:51:46 +0100 |
commit | 51d1d536802b5d8232d47e56f165ba8a009529b5 (patch) | |
tree | f2788d5b5bb5d802e24f88883fe1fc25b2fb087c | |
parent | 10b369f67064cee91a5eb41383a694162c5c5e73 (diff) | |
download | vim-git-51d1d536802b5d8232d47e56f165ba8a009529b5.tar.gz |
patch 7.4.1468v7.4.1468
Problem: Sort test doesn't test with "1" argument.
Solution: Also test ignore-case sorting. (Yasuhiro Matsumoto)
-rw-r--r-- | src/testdir/test_sort.vim | 7 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/testdir/test_sort.vim b/src/testdir/test_sort.vim index 819514a97..25a6cea1b 100644 --- a/src/testdir/test_sort.vim +++ b/src/testdir/test_sort.vim @@ -38,8 +38,9 @@ endfunc func Test_sort_default() " docs say omitted, empty or zero argument sorts on string representation. - call assert_equal(["2", 1, 3.3], sort([3.3, 1, "2"])) - call assert_equal(["2", 1, 3.3], sort([3.3, 1, "2"], '')) - call assert_equal(["2", 1, 3.3], sort([3.3, 1, "2"], 0)) + call assert_equal(['2', 'A', 'AA', 'a', 1, 3.3], sort([3.3, 1, "2", "A", "a", "AA"])) + call assert_equal(['2', 'A', 'AA', 'a', 1, 3.3], sort([3.3, 1, "2", "A", "a", "AA"], '')) + call assert_equal(['2', 'A', 'AA', 'a', 1, 3.3], sort([3.3, 1, "2", "A", "a", "AA"], 0)) + call assert_equal(['2', 'A', 'a', 'AA', 1, 3.3], sort([3.3, 1, "2", "A", "a", "AA"], 1)) call assert_fails('call sort([3.3, 1, "2"], 3)', "E474") endfunc diff --git a/src/version.c b/src/version.c index 0a56a3062..0d32734e1 100644 --- a/src/version.c +++ b/src/version.c @@ -744,6 +744,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1468, +/**/ 1467, /**/ 1466, |