[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117773: src/sysdep.c (str_collate) [WINDOWSNT]: Fix
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] trunk r117773: src/sysdep.c (str_collate) [WINDOWSNT]: Fix a typo in r117771. |
Date: |
Fri, 29 Aug 2014 18:29:33 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117773
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Fri 2014-08-29 21:29:30 +0300
message:
src/sysdep.c (str_collate) [WINDOWSNT]: Fix a typo in r117771.
modified:
src/sysdep.c sysdep.c-20091113204419-o5vbwnq5f7feedwu-448
src/w32proc.c w32proc.c-20091113204419-o5vbwnq5f7feedwu-814
=== modified file 'src/sysdep.c'
--- a/src/sysdep.c 2014-08-29 17:57:36 +0000
+++ b/src/sysdep.c 2014-08-29 18:29:30 +0000
@@ -3791,7 +3791,8 @@
#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;
=== modified file 'src/w32proc.c'
--- a/src/w32proc.c 2014-08-25 15:55:46 +0000
+++ b/src/w32proc.c 2014-08-29 18:29:30 +0000
@@ -3288,7 +3288,7 @@
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)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117773: src/sysdep.c (str_collate) [WINDOWSNT]: Fix a typo in r117771.,
Eli Zaretskii <=