(make_terminal_frame): Remove redundant code and useless

[gnu-emacs] / src / w32proc.c

diff --git a/src/w32proc.c b/src/w32proc.c
index 081749257f591412e216dcd084985774549732f4..3e5dcd29325efcfa18b5713b3483fb2afa79f4fd 100644 (file)
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -703,7 +703,7 @@ w32_executable_type (char * filename, int * is_dos_app, int * is_cygnus_app, int
                 {
                   char * dllname = RVA_TO_PTR (imports->Name, section,
                                                executable);
-                  
+
                   /* The exact name of the cygwin dll has changed with
                      various releases, but hopefully this will be reasonably
                      future proof.  */
@@ -1946,7 +1946,7 @@ DEFUN ("w32-get-locale-info", Fw32_get_locale_info,
        Sw32_get_locale_info, 1, 2, 0,
        doc: /* Return information about the Windows locale LCID.
 By default, return a three letter locale code which encodes the default
-language as the first two characters, and the country or regionial variant
+language as the first two characters, and the country or regional variant
 as the third letter.  For example, ENU refers to `English (United States)',
 while ENC means `English (Canadian)'.
 
@@ -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))
     {