aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJuanma Barranquero2008-12-11 09:40:44 +0000
committerJuanma Barranquero2008-12-11 09:40:44 +0000
commit011a014396e59cb621470309ff7865e3972a2953 (patch)
treea4acccbc9bc527cde287fec6f24123f8c563f1cb /src
parent3c309f345ba1eeee920fa00295873c1ce36567a9 (diff)
downloademacs-011a014396e59cb621470309ff7865e3972a2953.tar.gz
emacs-011a014396e59cb621470309ff7865e3972a2953.zip
Move decoding of locale info from Lisp to C.
* src/w32proc.c (Fw32_get_locale_info): Decode long form of locale name. * lisp/w32-fns.el (w32-list-locales): Revert part of 2008-10-17 change; decoding of long locale info is now done in `w32-get-locale-info'.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/w32proc.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 14d02758271..453c61bbbb2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
12008-12-11 Juanma Barranquero <lekktu@gmail.com> 12008-12-11 Juanma Barranquero <lekktu@gmail.com>
2 2
3 * w32proc.c (Fw32_get_locale_info): Decode long form of locale name.
4
52008-12-11 Juanma Barranquero <lekktu@gmail.com>
6
3 * process.c (Fsystem_process_attributes, syms_of_process): 7 * process.c (Fsystem_process_attributes, syms_of_process):
4 Fix typo in name of Ssystem_process_attributes. 8 Fix typo in name of Ssystem_process_attributes.
5 Reported by Ulrich Mueller <ulm@kph.uni-mainz.de>. 9 Reported by Ulrich Mueller <ulm@kph.uni-mainz.de>.
diff --git a/src/w32proc.c b/src/w32proc.c
index 867ceb60f37..3e5dcd29325 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -1983,7 +1983,7 @@ If LCID (a 16-bit number) is not a valid locale, the result is nil. */)
1983 LOCALE_SLANGUAGE | LOCALE_USE_CP_ACP, 1983 LOCALE_SLANGUAGE | LOCALE_USE_CP_ACP,
1984 full_name, sizeof (full_name)); 1984 full_name, sizeof (full_name));
1985 if (got_full) 1985 if (got_full)
1986 return build_string (full_name); 1986 return DECODE_SYSTEM (build_string (full_name));
1987 } 1987 }
1988 else if (NUMBERP (longform)) 1988 else if (NUMBERP (longform))
1989 { 1989 {