[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 a75b9a6 2/2: Merge branch 'emacs-25' of git.savan
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-25 a75b9a6 2/2: Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25 |
Date: |
Fri, 08 Apr 2016 13:56:05 +0000 |
branch: emacs-25
commit a75b9a6f2276a15a155660c99f7ff654190b7e9a
Merge: c93ae7a f6497c6
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
---
src/nsterm.m | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/nsterm.m b/src/nsterm.m
index 4048ac4..34c5395 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -596,8 +596,15 @@ ns_init_locale (void)
@try
{
+ /* It seems OS X should probably use UTF-8 everywhere.
+ 'localeIdentifier' does not specify the encoding, and I can't
+ find any way to get the OS to tell us which encoding to use,
+ so hard-code '.UTF-8'. */
+ NSString *localeID = [NSString stringWithFormat:@"address@hidden",
+ [locale localeIdentifier]];
+
/* Set LANG to locale, but not if LANG is already set. */
- setenv("LANG", [[locale localeIdentifier] UTF8String], 0);
+ setenv("LANG", [localeID UTF8String], 0);
}
@catch (NSException *e)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 a75b9a6 2/2: Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25,
Eli Zaretskii <=