patch 7.4.1468

Problem:    Sort test doesn't test with "1" argument.
Solution:   Also test ignore-case sorting. (Yasuhiro Matsumoto)

diff --git a/src/testdir/test_sort.vim b/src/testdir/test_sort.vim
index 819514a97107e4d9ddc666ba66e5b5bcce1a00d6..25a6cea1bd428cb3e290ac47b794eab7db6e000f 100644 (file)
--- 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 0a56a3062b70b3ffc0e403678317daa77ae164f7..0d32734e1217abac6eb48642e935ea8351783890 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1468,
 /**/
     1467,
 /**/