about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Src/params.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b4997820c..a4e2c2931 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-04  Frank Terbeck  <ft@bewatermyfriend.org>
+
+	* 30079: Src/params.c: Restore `LC_ALL' when setting `LANG'.
+
 2012-01-04  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 30084: Src/init.c: zsfree(argzero) before we set it again
@@ -15815,5 +15819,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5553 $
+* $Revision: 1.5554 $
 *****************************************************
diff --git a/Src/params.c b/Src/params.c
index 446cccc7e..6d98b8ee4 100644
--- a/Src/params.c
+++ b/Src/params.c
@@ -3780,6 +3780,9 @@ static struct localename {
 #ifdef LC_TIME
     {"LC_TIME", LC_TIME},
 #endif
+#ifdef LC_ALL
+    {"LC_ALL", LC_ALL},
+#endif
     {NULL, 0}
 };