2 files changed, 11 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 9e5d8f5af24..c9a645dd0cf 100644
--- 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 cb08e2f4413..521225687df 100644
--- 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