Use strcoll for the file browser. From David Champion.

diff --git a/browser.c b/browser.c
index ece5d6159d5fad65c0b949382191f721a375dba6..ee55bd33a5900a03eaa0b3c8a9c5caec2257e487 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -75,7 +75,7 @@ static int browser_compare_subject (const void *a, const void *b)
   struct folder_file *pa = (struct folder_file *) a;
   struct folder_file *pb = (struct folder_file *) b;
 
-  int r = mutt_strcmp (pa->name, pb->name);
+  int r = mutt_strcoll (pa->name, pb->name);
 
   return ((BrowserSort & SORT_REVERSE) ? -r : r);
 }

diff --git a/lib.c b/lib.c
index 84974a26ea9e948dd0451c0cb2635fa97e17261d..9aa94831a0a4fdbbce5ee6820ec7c9bd87f206e6 100644 (file)
--- a/lib.c
+++ b/lib.c
@@ -584,6 +584,11 @@ size_t mutt_strlen(const char *a)
   return a ? strlen (a) : 0;
 }
 
+int mutt_strcoll(const char *a, const char *b)
+{
+  return strcoll(NONULL(a), NONULL(b));
+}
+
 const char *mutt_stristr (const char *haystack, const char *needle)
 {
   const char *p, *q;

diff --git a/lib.h b/lib.h
index 822128d8179f612eb70cc1df62645cff512ab214..c6d5c2718f65e749fa5d33cf91d5d65ab0500735 100644 (file)
--- a/lib.h
+++ b/lib.h
@@ -107,6 +107,7 @@ int mutt_strcasecmp (const char *, const char *);
 int mutt_strcmp (const char *, const char *);
 int mutt_strncasecmp (const char *, const char *, size_t);
 int mutt_strncmp (const char *, const char *, size_t);
+int mutt_strcoll (const char *, const char *);
 int safe_open (const char *, int);
 int safe_symlink (const char *, const char *);
 int safe_rename (const char *, const char *);