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'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4e6b3c34ed950d2199ba764c3e7c7fbf03498584..5b2074c77439db672d9099b2f1bba32555a256eb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-11  Juanma Barranquero  <lekktu@gmail.com>
+
+       * 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'.
+
 2008-12-11  Chong Yidong  <cyd@stupidchicken.com>
 
        * progmodes/ruby-mode.el: Fix auto-mode-alist entry.

diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 5228e4f8fdf7a9a1a09201661ee17d092b7a9565..c7284fafd369a203805720fed311150c17bff209 100644 (file)
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -221,15 +221,11 @@ You should set this to t when using a non-system shell.\n\n"))))
     (setq w32-valid-locales (sort (w32-get-valid-locale-ids) #'<)))
   (with-output-to-temp-buffer "*Supported Locales*"
     (princ "LCID\tAbbrev\tFull name\n\n")
-    (princ (decode-coding-string (mapconcat
-                                 (lambda (x)
-                                   (format "%d\t%s\t%s"
-                                           x
-                                           (w32-get-locale-info x)
-                                           (w32-get-locale-info x t)))
-                                 w32-valid-locales "\n")
-                                locale-coding-system))
-    (princ "\n")))
+    (dolist (locale w32-valid-locales)
+      (princ (format "%d\t%s\t%s\n"
+                    locale
+                    (w32-get-locale-info locale)
+                    (w32-get-locale-info locale t))))))
 
 ;;; Setup Info-default-directory-list to include the info directory
 ;;; near where Emacs executable was installed.  We used to set INFOPATH,

diff --git a/src/ChangeLog b/src/ChangeLog
index 14d02758271982704a81cb7f4e5ad1b7be012548..453c61bbbb25f83a278d35c35717bd42d11e32a9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-11  Juanma Barranquero  <lekktu@gmail.com>
+
+       * w32proc.c (Fw32_get_locale_info): Decode long form of locale name.
+
 2008-12-11  Juanma Barranquero  <lekktu@gmail.com>
 
        * process.c (Fsystem_process_attributes, syms_of_process):

diff --git a/src/w32proc.c b/src/w32proc.c
index 867ceb60f3735e0ad23d9ae862e9bd47f34dbabb..3e5dcd29325efcfa18b5713b3483fb2afa79f4fd 100644 (file)
--- 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.  */)
                                LOCALE_SLANGUAGE | LOCALE_USE_CP_ACP,
                                full_name, sizeof (full_name));
       if (got_full)
-       return build_string (full_name);
+       return DECODE_SYSTEM (build_string (full_name));
     }
   else if (NUMBERP (longform))
     {