From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 8 Apr 1996 23:12:25 +0000 (+0000)
Subject: Include locale.h if HAVE_SETLOCALE.
X-Git-Tag: emacs-19.34~897
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=10537cb12d10a1d04a0214f4319e2969c0c5a59f;p=emacs.git

Include locale.h if HAVE_SETLOCALE.
(x_term_init): Restore LC_TIME as well as LC_NUMERIC.
---

diff --git a/src/xterm.c b/src/xterm.c
index 080afbcccfb..62deeeb1e55 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -105,7 +105,7 @@ extern void _XEditResCheckMessages ();
 #endif
 #endif
 
-#ifdef HAVE_X11XTR6
+#ifdef HAVE_SETLOCALE
 /* So we can do setlocale.  */
 #include <locale.h>
 #endif
@@ -5891,6 +5891,7 @@ x_term_init (display_name, xrm_option, resource_name)
   setlocale (LC_ALL, "");
   /* In case we just overrode what init_lread did, redo it.  */
   setlocale (LC_NUMERIC, "C");
+  setlocale (LC_TIME, "C");
 #endif
 
 #ifdef USE_X_TOOLKIT
@@ -5920,6 +5921,7 @@ x_term_init (display_name, xrm_option, resource_name)
 			 &argc, argv);
 
 #ifdef HAVE_X11XTR6
+    /* I think this is to compensate for XtSetLanguageProc.  */
     setlocale (LC_NUMERIC, "C");
     setlocale (LC_TIME, "C");
 #endif