vim-patch:8.2.1757: Mac: default locale is lacking the encoding (#12994)

vim-patch:8.2.1757: Mac: default locale is lacking the encoding

Problem:    Mac: default locale is lacking the encoding.
Solution:   Add ".UTF-8 to the locale. (Yee Cheng Chin, closes vim/vim#7022)
a5fe91e6dc

Cherry-pick test_environ.vim changes from patch 8.2.1432.
This commit is contained in:
Jan Edmund Lazo
2020-09-28 20:20:48 -04:00
committed by GitHub
parent f520c1ef85
commit 6f2138eb03
2 changed files with 36 additions and 5 deletions

View File

@@ -43,14 +43,20 @@ void lang_init(void)
}
}
char buf[50] = { 0 };
bool set_lang;
if (lang_region) {
os_setenv("LANG", lang_region, true);
set_lang = true;
xstrlcpy(buf, lang_region, sizeof(buf));
} else {
char buf[20] = { 0 };
if (CFStringGetCString(cf_lang_region, buf, 20,
kCFStringEncodingUTF8)) {
os_setenv("LANG", buf, true);
set_lang = CFStringGetCString(cf_lang_region, buf, 40,
kCFStringEncodingUTF8);
}
if (set_lang) {
if (strcasestr(buf, "utf-8") == NULL) {
xstrlcat(buf, ".UTF-8", sizeof(buf));
}
os_setenv("LANG", buf, true);
}
CFRelease(cf_lang_region);
# ifdef HAVE_LOCALE_H