summaryrefslogtreecommitdiff
path: root/lisp/w32-fns.el
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2008-12-11 09:40:44 +0000
committerJuanma Barranquero <lekktu@gmail.com>2008-12-11 09:40:44 +0000
commit011a014396e59cb621470309ff7865e3972a2953 (patch)
treea4acccbc9bc527cde287fec6f24123f8c563f1cb /lisp/w32-fns.el
parent3c309f345ba1eeee920fa00295873c1ce36567a9 (diff)
downloademacs-011a014396e59cb621470309ff7865e3972a2953.tar.gz
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 'lisp/w32-fns.el')
-rw-r--r--lisp/w32-fns.el14
1 files changed, 5 insertions, 9 deletions
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 5228e4f8fdf..c7284fafd36 100644
--- 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,