From: Stefan Kangas <stefankangas@gmail.com>
Date: Sun, 19 Jan 2025 17:09:36 +0000 (+0100)
Subject: Remove workaround for AIX 3.2 crashes
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=17b83c51298a9b8538a6aa67129e11a24f99b4d2;p=emacs.git

Remove workaround for AIX 3.2 crashes

Emacs does not support AIX 3.2 since 2008.

This workaround for AIX 3.2.3 and 3.2.4 (released in 1992) was
introduced in 1999 and was only active with #ifdef AIX3_2.  In 2008, the
condition was changed to #ifdef AIX when support for these older AIX
versions was dropped. I couldn't find any justification for why this
workaround was retained (instead of being removed) in the commit message
or mailing list archives.

Given that users of AIX 4.0 (released in 1995) or later have not had
this workaround for over a decade (1999-2008), it seems safe to assume
that it is no longer necessary.  Removing it will also prevent the
incorrect overriding of the LANG variable on those systems.

* src/emacs.c [AIX] (main): Remove workaround for AIX 3.2.  (Bug#75153)

(cherry picked from commit 4021b92403ca184bc0cd52f33ed5c6e27780cede)
---

diff --git a/src/emacs.c b/src/emacs.c
index 596dd117a76..6f005c64351 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2195,14 +2195,6 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
   init_ntproc (will_dump_p ()); /* must precede init_editfns.  */
 #endif
 
-  /* AIX crashes are reported in system versions 3.2.3 and 3.2.4
-     if this is not done.  Do it after set_global_environment so that we
-     don't pollute Vglobal_environment.  */
-  /* Setting LANG here will defeat the startup locale processing...  */
-#ifdef AIX
-  xputenv ("LANG=C");
-#endif
-
   /* Init buffer storage and default directory of main buffer.  */
   init_buffer ();