Merge from origin/emacs-28

2782bc113e Revert "Fix localized display of date and time in the NS p...
2021-11-10 12:12:29 +01:00 · 2021-11-10 12:12:29 +01:00 · 1bb3fb4e45
commit 1bb3fb4e45
parent b1de4a2ede 2782bc113e
1 changed files with 1 additions and 3 deletions
--- a/src/nsterm.m
+++ b/src/nsterm.m
@ -544,10 +544,8 @@ - (NSColor *)colorUsingDefaultColorSpace
      NSString *localeID = [NSString stringWithFormat:@"%@.UTF-8",
                                     [locale localeIdentifier]];

-      /* Set LANG and LC_ALL to locale, but not if the variables are
-         already set.  */
+      /* Set LANG to locale, but not if LANG is already set.  */
      setenv("LANG", [localeID UTF8String], 0);
-      setenv("LC_ALL", [localeID UTF8String], 0);
    }
  @catch (NSException *e)
    {