[Emacs-diffs] emacs lisp/ChangeLog lisp/w32-fns.el src/Change...

[Juanma Barranquero]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      08/12/11 09:40:51

Modified files:
        lisp           : ChangeLog w32-fns.el 
        src            : ChangeLog w32proc.c 

Log message:
        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'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.14933&r2=1.14934
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/w32-fns.el?cvsroot=emacs&r1=1.89&r2=1.90
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7186&r2=1.7187
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32proc.c?cvsroot=emacs&r1=1.86&r2=1.87

Patches:
Index: lisp/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.14933
retrieving revision 1.14934
diff -u -b -r1.14933 -r1.14934
--- lisp/ChangeLog      11 Dec 2008 04:22:37 -0000      1.14933
+++ lisp/ChangeLog      11 Dec 2008 09:40:44 -0000      1.14934
@@ -1,3 +1,8 @@
+2008-12-11  Juanma Barranquero  <address@hidden>
+
+       * 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  <address@hidden>
 
        * progmodes/ruby-mode.el: Fix auto-mode-alist entry.

Index: lisp/w32-fns.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/w32-fns.el,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -b -r1.89 -r1.90
--- lisp/w32-fns.el     3 Dec 2008 16:37:00 -0000       1.89
+++ lisp/w32-fns.el     11 Dec 2008 09:40:48 -0000      1.90
@@ -221,15 +221,11 @@
     (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,

Index: src/ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7186
retrieving revision 1.7187
diff -u -b -r1.7186 -r1.7187
--- src/ChangeLog       11 Dec 2008 08:46:35 -0000      1.7186
+++ src/ChangeLog       11 Dec 2008 09:40:49 -0000      1.7187
@@ -1,5 +1,9 @@
 2008-12-11  Juanma Barranquero  <address@hidden>
 
+       * w32proc.c (Fw32_get_locale_info): Decode long form of locale name.
+
+2008-12-11  Juanma Barranquero  <address@hidden>
+
        * process.c (Fsystem_process_attributes, syms_of_process):
        Fix typo in name of Ssystem_process_attributes.
        Reported by Ulrich Mueller <address@hidden>.

Index: src/w32proc.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32proc.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- src/w32proc.c       30 Nov 2008 02:58:33 -0000      1.86
+++ src/w32proc.c       11 Dec 2008 09:40:50 -0000      1.87
@@ -1983,7 +1983,7 @@
                                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))
     {