Commit 011a0143 authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

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'.
parent 3c309f34
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> 2008-12-11 Chong Yidong <cyd@stupidchicken.com>
   
* progmodes/ruby-mode.el: Fix auto-mode-alist entry. * progmodes/ruby-mode.el: Fix auto-mode-alist entry.
......
...@@ -221,15 +221,11 @@ You should set this to t when using a non-system shell.\n\n")))) ...@@ -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) #'<))) (setq w32-valid-locales (sort (w32-get-valid-locale-ids) #'<)))
(with-output-to-temp-buffer "*Supported Locales*" (with-output-to-temp-buffer "*Supported Locales*"
(princ "LCID\tAbbrev\tFull name\n\n") (princ "LCID\tAbbrev\tFull name\n\n")
(princ (decode-coding-string (mapconcat (dolist (locale w32-valid-locales)
(lambda (x) (princ (format "%d\t%s\t%s\n"
(format "%d\t%s\t%s" locale
x (w32-get-locale-info locale)
(w32-get-locale-info x) (w32-get-locale-info locale t))))))
(w32-get-locale-info x t)))
w32-valid-locales "\n")
locale-coding-system))
(princ "\n")))
;;; Setup Info-default-directory-list to include the info directory ;;; Setup Info-default-directory-list to include the info directory
;;; near where Emacs executable was installed. We used to set INFOPATH, ;;; near where Emacs executable was installed. We used to set INFOPATH,
......
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> 2008-12-11 Juanma Barranquero <lekktu@gmail.com>
   
* process.c (Fsystem_process_attributes, syms_of_process): * process.c (Fsystem_process_attributes, syms_of_process):
......
...@@ -1983,7 +1983,7 @@ If LCID (a 16-bit number) is not a valid locale, the result is nil. */) ...@@ -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, LOCALE_SLANGUAGE | LOCALE_USE_CP_ACP,
full_name, sizeof (full_name)); full_name, sizeof (full_name));
if (got_full) if (got_full)
return build_string (full_name); return DECODE_SYSTEM (build_string (full_name));
} }
else if (NUMBERP (longform)) else if (NUMBERP (longform))
{ {
......
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