[Emacs-diffs] Changes to emacs/src/mac.c

[YAMAMOTO Mitsuharu]

Index: emacs/src/mac.c
diff -c emacs/src/mac.c:1.45 emacs/src/mac.c:1.46
*** emacs/src/mac.c:1.45        Sun Oct 16 02:22:16 2005
--- emacs/src/mac.c     Wed Nov  9 08:07:59 2005
***************
*** 4119,4125 ****
  The conversion is performed using the converter provided by the system.
  Each encoding is specified by either a coding system symbol, a mime
  charset string, or an integer as a CFStringEncoding value.  Nil for
! encoding means UTF-16 in native byte order, no byte order marker.
  On Mac OS X 10.2 and later, you can do Unicode Normalization by
  specifying the optional argument NORMALIZATION-FORM with a symbol NFD,
  NFKD, NFC, NFKC, HFS+D, or HFS+C.
--- 4119,4125 ----
  The conversion is performed using the converter provided by the system.
  Each encoding is specified by either a coding system symbol, a mime
  charset string, or an integer as a CFStringEncoding value.  Nil for
! encoding means UTF-16 in native byte order, no byte order mark.
  On Mac OS X 10.2 and later, you can do Unicode Normalization by
  specifying the optional argument NORMALIZATION-FORM with a symbol NFD,
  NFKD, NFC, NFKC, HFS+D, or HFS+C.
***************
*** 4192,4197 ****
--- 4192,4220 ----
    return Qnil;
  }
  
+ 
+ static Lisp_Object
+ mac_get_system_locale ()
+ {
+   OSErr err;
+   LangCode lang;
+   RegionCode region;
+   LocaleRef locale;
+   Str255 str;
+ 
+   lang = GetScriptVariable (smSystemScript, smScriptLang);
+   region = GetScriptManagerVariable (smRegionCode);
+   err = LocaleRefFromLangOrRegionCode (lang, region, &locale);
+   if (err == noErr)
+     err = LocaleRefGetPartString (locale, kLocaleAllPartsMask,
+                                 sizeof (str), str);
+   if (err == noErr)
+     return build_string (str);
+   else
+     return Qnil;
+ }
+ 
+ 
  #ifdef MAC_OSX
  #undef select
  
***************
*** 4213,4219 ****
        involved, and timeout is not too short (greater than
        SELECT_TIMEOUT_THRESHHOLD_RUNLOOP seconds).
        -> Create CFSocket for each socket and add it into the current
!          event RunLoop so that an `ready-to-read' event can be posted
           to the event queue that is also used for window events.  Then
           ReceiveNextEvent can wait for both kinds of inputs.
     4. Otherwise.
--- 4236,4242 ----
        involved, and timeout is not too short (greater than
        SELECT_TIMEOUT_THRESHHOLD_RUNLOOP seconds).
        -> Create CFSocket for each socket and add it into the current
!          event RunLoop so that a `ready-to-read' event can be posted
           to the event queue that is also used for window events.  Then
           ReceiveNextEvent can wait for both kinds of inputs.
     4. Otherwise.
***************
*** 4481,4486 ****
--- 4504,4514 ----
    char *p, *q;
    struct stat st;
  
+   /* Initialize locale related variables.  */
+   mac_system_script_code =
+     (ScriptCode) GetScriptManagerVariable (smSysScript);
+   Vmac_system_locale = mac_get_system_locale ();
+ 
    /* Fetch the pathname of the application bundle as a C string into
       app_bundle_pathname.  */
  
***************
*** 4598,4625 ****
      }
  }
  #endif /* MAC_OSX */
- 
- 
- static Lisp_Object
- mac_get_system_locale ()
- {
-   OSErr err;
-   LangCode lang;
-   RegionCode region;
-   LocaleRef locale;
-   Str255 str;
- 
-   lang = GetScriptVariable (smSystemScript, smScriptLang);
-   region = GetScriptManagerVariable (smRegionCode);
-   err = LocaleRefFromLangOrRegionCode (lang, region, &locale);
-   if (err == noErr)
-     err = LocaleRefGetPartString (locale, kLocaleAllPartsMask,
-                                 sizeof (str), str);
-   if (err == noErr)
-     return build_string (str);
-   else
-     return Qnil;
- }
  
  
  void
--- 4626,4631 ----