From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 1 Sep 2014 15:07:17 +0000 (+0300)
Subject: src/w32proc.c (w32_compare_strings): Support "C" and "POSIX" locales.
X-Git-Tag: emacs-25.0.90~2635^2~679^2~372
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/4ef0411746dde0e18a7a4d11e4fd1c2abdba2b9f

src/w32proc.c (w32_compare_strings): Support "C" and "POSIX" locales.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index ed0edc5f0a..02435801d6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-09-01  Eli Zaretskii  <eliz@gnu.org>
+
+	* w32proc.c (w32_compare_strings): Support "C" and "POSIX"
+	locales.
+
 2014-09-01  Paul Eggert  <eggert@cs.ucla.edu>
 
 	--enable-silent-rules now suppresses more chatter.
diff --git a/src/w32proc.c b/src/w32proc.c
index 399ed009ce..96f94a116a 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -3236,6 +3236,13 @@ w32_compare_strings (const char *s1, const char *s2, char *locname,
 
   USE_SAFE_ALLOCA;
 
+  /* The LCID machinery doesn't seem to support the "C" locale, so we
+     need to do that by hand.  */
+  if (locname
+      && ((locname[0] == 'C' && (locname[1] == '\0' || locname[1] == '.'))
+	  || strcmp (locname, "POSIX") == 0))
+    return (ignore_case ? stricmp (s1, s2) : strcmp (s1, s2));
+
   if (!g_b_init_compare_string_w)
     {
       if (os_subtype == OS_9X)