Commit fb6cdfc0 authored by Michael Albinus's avatar Michael Albinus

* sysdep.c (str_collate) [__STDC_ISO_10646__]: Move up setting errno.

parent e6a4c15f
2014-08-29 Michael Albinus <michael.albinus@gmx.de>
* sysdep.c (str_collate) [__STDC_ISO_10646__]: Move up setting errno.
2014-08-29 Paul Eggert <eggert@cs.ucla.edu>
* sysdep.c (str_collate): Do not look at errno after towlower_l.
errno's value is not specified after towlower_l. Instead, assume
that towlower_l returns its argument on failure, which is portable
in practice.
* sysdep.c (str_collate) [__STDC_ISO_10646__]: Do not look at
errno after towlower_l. errno's value is not specified after
towlower_l. Instead, assume that towlower_l returns its argument
on failure, which is portable in practice.
2014-08-29 Eli Zaretskii <eliz@gnu.org>
......
......@@ -3740,6 +3740,8 @@ str_collate (Lisp_Object s1, Lisp_Object s2,
FETCH_STRING_CHAR_ADVANCE (*(p2+i-1), s2, i, i_byte);
*(p2+len) = 0;
errno = 0;
if (STRINGP (locale))
{
locale_t loc = newlocale (LC_COLLATE_MASK | LC_CTYPE_MASK,
......@@ -3761,7 +3763,6 @@ str_collate (Lisp_Object s1, Lisp_Object s2,
}
else
{
errno = 0;
if (! NILP (ignore_case))
for (int i = 1; i < 3; i++)
{
......@@ -3769,6 +3770,7 @@ str_collate (Lisp_Object s1, Lisp_Object s2,
for (; *p; p++)
*p = towlower (*p);
}
res = wcscoll (p1, p2);
err = errno;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment