diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2018-12-13 18:23:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-13 18:23:23 +0100 |
| commit | aec096fc5b8a37df8503a20c16f7dce9bd4af599 (patch) | |
| tree | b176e3658365ae675a9c10ef3ddf78a9deae4214 | |
| parent | 1cca5da05ff1a35cfdb930be82449705507ec661 (diff) | |
| parent | 7ba52c0b2b53a6013b8e31794a1991d641a6b0ab (diff) | |
| download | rneovim-aec096fc5b8a37df8503a20c16f7dce9bd4af599.tar.gz rneovim-aec096fc5b8a37df8503a20c16f7dce9bd4af599.tar.bz2 rneovim-aec096fc5b8a37df8503a20c16f7dce9bd4af599.zip | |
Merge pull request #9362 from bfredl/macnumlocale
os/lang: use the correct LC_NUMERIC also for OS X
| -rw-r--r-- | src/nvim/os/lang.c | 5 | ||||
| -rw-r--r-- | test/functional/viml/lang_spec.lua | 9 |
2 files changed, 14 insertions, 0 deletions
diff --git a/src/nvim/os/lang.c b/src/nvim/os/lang.c index 900cd1f53a..108a9c6c39 100644 --- a/src/nvim/os/lang.c +++ b/src/nvim/os/lang.c @@ -54,6 +54,11 @@ void lang_init(void) CFRelease(cf_lang_region); # ifdef HAVE_LOCALE_H setlocale(LC_ALL, ""); + +# ifdef LC_NUMERIC + // Make sure strtod() uses a decimal point, not a comma. + setlocale(LC_NUMERIC, "C"); +# endif # endif } #endif diff --git a/test/functional/viml/lang_spec.lua b/test/functional/viml/lang_spec.lua index 3ba9221aef..6d603b8822 100644 --- a/test/functional/viml/lang_spec.lua +++ b/test/functional/viml/lang_spec.lua @@ -18,4 +18,13 @@ describe('viml', function() ]]) eq(nil, string.find(eval('v:errmsg'), '^E129')) end) + + it('str2float is not affected by locale', function() + if exc_exec('lang ctype sv_SE.UTF-8') ~= 0 then + pending("Locale sv_SE.UTF-8 not supported") + return + end + clear{env={LANG="", LC_NUMERIC="sv_SE.UTF-8"}} + eq(2.2, eval('str2float("2.2")')) + end) end) |