Mercurial > vim
diff src/list.c @ 22770:3e4981de5636 v8.2.1933
patch 8.2.1933: cannot sort using locale ordering
Commit: https://github.com/vim/vim/commit/55e29611d20bca14fa5efc61385bc8a6b7acd9e2
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Nov 1 13:57:44 2020 +0100
patch 8.2.1933: cannot sort using locale ordering
Problem: Cannot sort using locale ordering.
Solution: Add a flag for :sort and sort() to use the locale. (Dominique
Pell?, closes #7237)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 01 Nov 2020 14:00:03 +0100 |
| parents | f140b9036aa5 |
| children | 42bb78d46354 |
line wrap: on
line diff
--- a/src/list.c +++ b/src/list.c @@ -1516,6 +1516,7 @@ typedef struct typedef struct { int item_compare_ic; + int item_compare_lc; int item_compare_numeric; int item_compare_numbers; #ifdef FEAT_FLOAT @@ -1594,10 +1595,10 @@ item_compare(const void *s1, const void p2 = (char_u *)""; if (!sortinfo->item_compare_numeric) { - if (sortinfo->item_compare_ic) - res = STRICMP(p1, p2); + if (sortinfo->item_compare_lc) + res = strcoll((char *)p1, (char *)p2); else - res = STRCMP(p1, p2); + res = sortinfo->item_compare_ic ? STRICMP(p1, p2): STRCMP(p1, p2); } else { @@ -1706,6 +1707,7 @@ do_sort_uniq(typval_T *argvars, typval_T goto theend; // short list sorts pretty quickly info.item_compare_ic = FALSE; + info.item_compare_lc = FALSE; info.item_compare_numeric = FALSE; info.item_compare_numbers = FALSE; #ifdef FEAT_FLOAT @@ -1773,6 +1775,11 @@ do_sort_uniq(typval_T *argvars, typval_T info.item_compare_func = NULL; info.item_compare_ic = TRUE; } + else if (STRCMP(info.item_compare_func, "l") == 0) + { + info.item_compare_func = NULL; + info.item_compare_lc = TRUE; + } } }