XEmacs 21.2.27 "Hera".

[chise/xemacs-chise.git.1] / src / input-method-motif.c

diff --git a/src/input-method-motif.c b/src/input-method-motif.c
index dd95167..d209e88 100644 (file)
--- a/src/input-method-motif.c
+++ b/src/input-method-motif.c
@@ -41,7 +41,12 @@ Initialize_Locale (void)
 {
   char *locale;
 
-  XtSetLanguageProc (NULL, (XtLanguageProc) NULL, NULL);
+  /* dverna - Nov. 98: ### DON'T DO THIS !!! The default XtLanguageProc
+     routine calls setlocale(LC_ALL, lang) which fucks up our lower-level
+     locale management, and especially the value of LC_NUMERIC. Anyway, since
+     at this point, we don't know yet whether we're gonna need an X11 frame,
+     we should really do it manually and not use Xlib's dumb default routine */
+  /*XtSetLanguageProc (NULL, (XtLanguageProc) NULL, NULL);*/
   if ((locale = setlocale (LC_ALL, "")) == NULL)
     {
       stderr_out ("Can't set locale.\n");
@@ -110,9 +115,10 @@ XIM_init_frame (struct frame *f)
      default face, rather than foreground and background resources, or
      that the user can use set-frame-parameters to set xic attributes */
 
-#define res(name, class, representation, field, default_value) \
-  { name, class, representation, sizeof(xim_resources.field), \
-     XtOffsetOf(xim_resources_t, field), XtRString, default_value }
+#define res(name, class, representation, field, default_value) \
+  { name, class, representation, sizeof(xim_resources.field),  \
+    XtOffsetOf(xim_resources_t, field),                                \
+    XtRString, (XtPointer) (default_value) }
 
   static XtResource resources[] =
   {