aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2014-09-01 18:07:17 +0300
committerEli Zaretskii2014-09-01 18:07:17 +0300
commit4ef0411746dde0e18a7a4d11e4fd1c2abdba2b9f (patch)
tree87738fc3f2e4cdbd24f49e3c1d2400f43aa2f730 /src
parentcd6f709c4b2be2044df54969f8302278a6c8c42a (diff)
downloademacs-4ef0411746dde0e18a7a4d11e4fd1c2abdba2b9f.tar.gz
emacs-4ef0411746dde0e18a7a4d11e4fd1c2abdba2b9f.zip
src/w32proc.c (w32_compare_strings): Support "C" and "POSIX" locales.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32proc.c7
2 files changed, 12 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ed0edc5f0a1..02435801d69 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12014-09-01 Eli Zaretskii <eliz@gnu.org>
2
3 * w32proc.c (w32_compare_strings): Support "C" and "POSIX"
4 locales.
5
12014-09-01 Paul Eggert <eggert@cs.ucla.edu> 62014-09-01 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 --enable-silent-rules now suppresses more chatter. 8 --enable-silent-rules now suppresses more chatter.
diff --git a/src/w32proc.c b/src/w32proc.c
index 399ed009ce3..96f94a116af 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -3236,6 +3236,13 @@ w32_compare_strings (const char *s1, const char *s2, char *locname,
3236 3236
3237 USE_SAFE_ALLOCA; 3237 USE_SAFE_ALLOCA;
3238 3238
3239 /* The LCID machinery doesn't seem to support the "C" locale, so we
3240 need to do that by hand. */
3241 if (locname
3242 && ((locname[0] == 'C' && (locname[1] == '\0' || locname[1] == '.'))
3243 || strcmp (locname, "POSIX") == 0))
3244 return (ignore_case ? stricmp (s1, s2) : strcmp (s1, s2));
3245
3239 if (!g_b_init_compare_string_w) 3246 if (!g_b_init_compare_string_w)
3240 { 3247 {
3241 if (os_subtype == OS_9X) 3248 if (os_subtype == OS_9X)