(main): Set LANG=C iff AX3_2 defined.

diff --git a/src/ChangeLog b/src/ChangeLog
index 9e5d8f5af24248c1560985b6863f0e2fc97034d5..c9a645dd0cf72873583835169fe0cc988ee4f471 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+1999-12-01  Dave Love  <fx@gnu.org>
+
+       * emacs.c (main): Set LANG=C iff AX3_2 defined.
+
+1999-11-28  eliz  <eliz@dlpx1>
+
+       * emacs.c (synchronize_locale): Avoid compiler warnings about
+       pointer type mismatch.
+
 1999-11-28  Gerd Moellmann  <gerd@gnu.org>
 
        * window.c (Fwindow_end): Don't call temp_set_pt_both with

diff --git a/src/emacs.c b/src/emacs.c
index cb08e2f44134a9b03eae66c16fd6991ac01e0990..521225687dfdfeedab75e145e8b1b2239cf0015e 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1189,7 +1189,8 @@ the Bugs section of the Emacs manual or the file BUGS.\n", argv[0]);
   /* AIX crashes are reported in system versions 3.2.3 and 3.2.4
      if this is not done.  Do it after set_process_environment so that we
      don't pollute Vprocess_environment.  */
-#ifdef AIX
+  /* Setting LANG here will defeat the startup locale processing...  */
+#ifdef AIX3_2
   putenv ("LANG=C");
 #endif