emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 1bb3fb4 1/3: Merge from origin/emacs-28


From: Stefan Kangas
Subject: master 1bb3fb4 1/3: Merge from origin/emacs-28
Date: Wed, 10 Nov 2021 06:29:50 -0500 (EST)

branch: master
commit 1bb3fb4e45a14c7ebeead655ed3fb58b361787b0
Merge: b1de4a2 2782bc1
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>

    Merge from origin/emacs-28
    
    2782bc113e Revert "Fix localized display of date and time in the NS p...
---
 src/nsterm.m | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/nsterm.m b/src/nsterm.m
index ed0e7a2..1f17a30 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -544,10 +544,8 @@ ns_init_locale (void)
       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)
     {



reply via email to

[Prev in Thread] Current Thread [Next in Thread]