summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2014-08-29 21:29:30 +0300
committerEli Zaretskii <eliz@gnu.org>2014-08-29 21:29:30 +0300
commita17b628624a4fedd68b9b5a2421f7b45df44db8a (patch)
treeef84e0c8c36d5bc292d117173b2ae3ad08a9bdf7
parentf894b23d7fe3125b807b171fb779fed15d02be07 (diff)
downloademacs-a17b628624a4fedd68b9b5a2421f7b45df44db8a.tar.gz
src/sysdep.c (str_collate) [WINDOWSNT]: Fix a typo in 2014-08-29T17:57:36Z!michael.albinus@gmx.de.
-rw-r--r--src/sysdep.c3
-rw-r--r--src/w32proc.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/sysdep.c b/src/sysdep.c
index a730cb4a8ff..7993a59e721 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -3791,7 +3791,8 @@ str_collate (Lisp_Object s1, Lisp_Object s2,
#ifdef WINDOWSNT
int
str_collate (Lisp_Object s1, Lisp_Object s2,
-{ Lisp_Object locale, Lisp_Object ignore_case)
+ Lisp_Object locale, Lisp_Object ignore_case)
+{
char *loc = STRINGP (locale) ? SSDATA (locale) : NULL;
diff --git a/src/w32proc.c b/src/w32proc.c
index ed62de02433..ff7a2caed08 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -3288,7 +3288,7 @@ w32_compare_strings (const char *s1, const char *s2, char *locname)
CODESET part of LOCNAME. In particular, ls-lisp will want
NORM_IGNORESYMBOLS and sometimes LINGUISTIC_IGNORECASE or
NORM_IGNORECASE. */
- val = pCompareStringW (lcid, 0, string1_w, -1, string2_w, -1);
+ val = pCompareStringW (lcid, NORM_IGNORESYMBOLS, string1_w, -1, string2_w, -1);
SAFE_FREE ();
if (!val)
{