thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.1933: cannot sort using locale ordering

Browse Source 
Problem:    Cannot sort using locale ordering.
Solution:   Add a flag for :sort and sort() to use the locale. (Dominique
            Pellé, closes #7237)
This commit is contained in:
Bram Moolenaar
2020-11-01 13:57:44 +01:00
parent 963734e316
commit 55e29611d2
6 changed files with 112 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/list.c
View File

@@ -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 *s2)
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 *rettv, int sort)
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 *rettv, int sort)
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;
}
}
}