diff options
| author | Stefan Kangas | 2021-11-10 12:12:29 +0100 |
|---|---|---|
| committer | Stefan Kangas | 2021-11-10 12:12:29 +0100 |
| commit | 1bb3fb4e45a14c7ebeead655ed3fb58b361787b0 (patch) | |
| tree | 9d6c2a2b68da0177516308f2aab02b6ecc6b1b00 /src | |
| parent | b1de4a2ede9ccf0144eca637a46a3b4fcfedc5f7 (diff) | |
| parent | 2782bc113e5944ad404dc87ec309147c39ccca1f (diff) | |
| download | emacs-1bb3fb4e45a14c7ebeead655ed3fb58b361787b0.tar.gz emacs-1bb3fb4e45a14c7ebeead655ed3fb58b361787b0.zip | |
Merge from origin/emacs-28
2782bc113e Revert "Fix localized display of date and time in the NS p...
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsterm.m | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/nsterm.m b/src/nsterm.m index ed0e7a2aae8..1f17a30272c 100644 --- a/src/nsterm.m +++ b/src/nsterm.m | |||
| @@ -544,10 +544,8 @@ ns_init_locale (void) | |||
| 544 | NSString *localeID = [NSString stringWithFormat:@"%@.UTF-8", | 544 | NSString *localeID = [NSString stringWithFormat:@"%@.UTF-8", |
| 545 | [locale localeIdentifier]]; | 545 | [locale localeIdentifier]]; |
| 546 | 546 | ||
| 547 | /* Set LANG and LC_ALL to locale, but not if the variables are | 547 | /* Set LANG to locale, but not if LANG is already set. */ |
| 548 | already set. */ | ||
| 549 | setenv("LANG", [localeID UTF8String], 0); | 548 | setenv("LANG", [localeID UTF8String], 0); |
| 550 | setenv("LC_ALL", [localeID UTF8String], 0); | ||
| 551 | } | 549 | } |
| 552 | @catch (NSException *e) | 550 | @catch (NSException *e) |
| 553 | { | 551 | { |