diff options
| -rw-r--r-- | src/list.c | 6 | ||||
| -rw-r--r-- | src/testdir/test_sort.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/list.c b/src/list.c index 8e67a61db..16e59837e 100644 --- a/src/list.c +++ b/src/list.c @@ -1945,7 +1945,13 @@ item_compare2(const void *s1, const void *s2) if (res == FAIL) res = ITEM_COMPARE_FAIL; else + { res = (int)tv_get_number_chk(&rettv, &sortinfo->item_compare_func_err); + if (res > 0) + res = 1; + else if (res < 0) + res = -1; + } if (sortinfo->item_compare_func_err) res = ITEM_COMPARE_FAIL; // return value has wrong type clear_tv(&rettv); diff --git a/src/testdir/test_sort.vim b/src/testdir/test_sort.vim index 47c58594d..82f70fff1 100644 --- a/src/testdir/test_sort.vim +++ b/src/testdir/test_sort.vim @@ -58,6 +58,7 @@ endfunc func Test_sort_numbers() call assert_equal([3, 13, 28], sort([13, 28, 3], 'N')) call assert_equal(['3', '13', '28'], sort(['13', '28', '3'], 'N')) + call assert_equal([3997, 4996], sort([4996, 3997], 'Compare1')) endfunc func Test_sort_float() diff --git a/src/version.c b/src/version.c index 38f901757..99a94e259 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3449, +/**/ 3448, /**/ 3447, |