From: Eli Zaretskii <eliz@gnu.org>
Date: Fri, 29 Aug 2014 18:29:30 +0000 (+0300)
Subject: src/sysdep.c (str_collate) [WINDOWSNT]: Fix a typo in 2014-08-29T17:57:36Z!michael... 
X-Git-Tag: emacs-25.0.90~2635^2~679^2~398
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a17b628624a4fedd68b9b5a2421f7b45df44db8a;p=emacs.git

src/sysdep.c (str_collate) [WINDOWSNT]: Fix a typo in 2014-08-29T17:57:36Z!michael.albinus@gmx.de.
---

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)
     {