comparison src/xterm.c @ 23115:b992f7bb67d7

(fixup_locale): New function. For now, it resets LC_TIME to "C" (reverting the 1998-08-07 change), and also resets LC_MESSAGES to "C". (x_term_init): Use it to fix up the locale after setlocale (LC_ALL, "").

23114:e51b304d8195

	  && (*name1 == '.' || *name1 == '\0')
	  && (*name2 == '.' || *name2 == '\0'));
}
#endif

struct x_display_info *
x_term_init (display_name, xrm_option, resource_name)
     Lisp_Object display_name;
     char *xrm_option;
     char *resource_name;

      x_initialized = 1;
    }

#ifdef HAVE_X_I18N
  setlocale (LC_ALL, "");
  /* In case we just overrode what init_lread did, redo it.  */
  setlocale (LC_NUMERIC, "C");
#endif

#ifdef USE_X_TOOLKIT
  /* [e-mail] reports that this causes
     errors with X11R5:

			 emacs_options, XtNumber (emacs_options),
			 &argc, argv);

#ifdef HAVE_X11XTR6
    /* I think this is to compensate for XtSetLanguageProc.  */
    setlocale (LC_NUMERIC, "C");
#endif
  }

#else /* not USE_X_TOOLKIT */
#ifdef HAVE_X11R5

23115:b992f7bb67d7

	  && (*name1 == '.' || *name1 == '\0')
	  && (*name2 == '.' || *name2 == '\0'));
}
#endif

#if defined (HAVE_X_I18N) || (defined (USE_X_TOOLKIT) && defined (HAVE_X11XTR6))
/* Recover from setlocale (LC_ALL, "").  */
static void
fixup_locale ()
{
  /* Currently we require strerror to use the "C" locale,
     since we don't yet support decoding its string result.  */
#ifdef LC_MESSAGES
  setlocale (LC_MESSAGES, "C");
#endif

  /* The Emacs Lisp reader needs LC_NUMERIC to be "C",
     so that numbers are read and printed properly for Emacs Lisp.  */
  setlocale (LC_NUMERIC, "C");

  /* Currently we require strftime to use the "C" locale,
     since we don't yet support encoding its format argument,
     or decoding its string result.  */
  setlocale (LC_TIME, "C");
}
#endif

struct x_display_info *
x_term_init (display_name, xrm_option, resource_name)
     Lisp_Object display_name;
     char *xrm_option;
     char *resource_name;

      x_initialized = 1;
    }

#ifdef HAVE_X_I18N
  setlocale (LC_ALL, "");
  fixup_locale ();
#endif

#ifdef USE_X_TOOLKIT
  /* [e-mail] reports that this causes
     errors with X11R5:

			 emacs_options, XtNumber (emacs_options),
			 &argc, argv);

#ifdef HAVE_X11XTR6
    /* I think this is to compensate for XtSetLanguageProc.  */
    fixup_locale ();
#endif
  }

#else /* not USE_X_TOOLKIT */
#ifdef HAVE_X11R5