diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-09-28 20:20:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-28 20:20:48 -0400 |
| commit | 6f2138eb03766680b012ee0bdfca04fdc2c22e89 (patch) | |
| tree | e551c39c7cf8ea912f9669936e0bb30ff6658433 /src/nvim/os/lang.c | |
| parent | f520c1ef859b245c9932106b5487d55c984d410d (diff) | |
| download | rneovim-6f2138eb03766680b012ee0bdfca04fdc2c22e89.tar.gz rneovim-6f2138eb03766680b012ee0bdfca04fdc2c22e89.tar.bz2 rneovim-6f2138eb03766680b012ee0bdfca04fdc2c22e89.zip | |
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)
https://github.com/vim/vim/commit/a5fe91e6dc610bc823bc3201e2c88179989b13fb
Cherry-pick test_environ.vim changes from patch 8.2.1432.
Diffstat (limited to 'src/nvim/os/lang.c')
| -rw-r--r-- | src/nvim/os/lang.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/nvim/os/lang.c b/src/nvim/os/lang.c index fe2d7986bf..603191a0ff 100644 --- a/src/nvim/os/lang.c +++ b/src/nvim/os/lang.c @@ -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 |