master 3ec6520 1/4: Merge from origin/emacs-28

[Eli Zaretskii]

branch: master
commit 3ec65200882d3860b0c003c499ca77d030a6c004
Merge: bd3ca9f 5e05be5
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    Merge from origin/emacs-28
    
    5e05be5 Fix localized display of date and time in the NS port
---
 src/nsterm.m | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/nsterm.m b/src/nsterm.m
index f4dbe95..ec4833b 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -543,8 +543,10 @@ ns_init_locale (void)
       NSString *localeID = [NSString stringWithFormat:@"%@.UTF-8",
                                      [locale localeIdentifier]];
 
-      /* Set LANG to locale, but not if LANG is already set.  */
+      /* Set LANG and LC_ALL to locale, but not if the variables are
+         already set.  */
       setenv("LANG", [localeID UTF8String], 0);
+      setenv("LC_ALL", [localeID UTF8String], 0);
     }
   @catch (NSException *e)
     {