kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-24 21:25:04 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9362 from bfredl/macnumlocale

Browse Source 
os/lang: use the correct LC_NUMERIC also for OS X
This commit is contained in:
Björn Linse 2018-12-13 18:23:23 +01:00 committed by GitHub
commit aec096fc5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/os/lang.c
View File

@ -54,6 +54,11 @@ void lang_init(void)
CFRelease(cf_lang_region); CFRelease(cf_lang_region);
# ifdef HAVE_LOCALE_H # ifdef HAVE_LOCALE_H
setlocale(LC_ALL, ""); setlocale(LC_ALL, "");
# ifdef LC_NUMERIC
// Make sure strtod() uses a decimal point, not a comma.
setlocale(LC_NUMERIC, "C");
# endif
# endif # endif
} }
#endif #endif

9
test/functional/viml/lang_spec.lua
View File

@ -18,4 +18,13 @@ describe('viml', function()
]]) ]])
eq(nil, string.find(eval('v:errmsg'), '^E129')) eq(nil, string.find(eval('v:errmsg'), '^E129'))
end) 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) end)