Mercurial > vim
changeset 10569:0bf064e7917a v8.0.0174
patch 8.0.0174: executing "locale -a" on MS-Windows needlessly
commit https://github.com/vim/vim/commit/b8f7bd68f6fdff51ca4db5b145dcde42ee7b804b
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jan 12 20:28:25 2017 +0100
patch 8.0.0174: executing "locale -a" on MS-Windows needlessly
Problem: For completion "locale -a" is executed on MS-Windows, even though
it most likely won't work.
Solution: Skip executing "locale -a" on MS-Windows. (Ken Takata)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 12 Jan 2017 20:30:04 +0100 |
| parents | b52f3fe64a0d |
| children | 33f9dbbfb7e5 |
| files | src/ex_cmds2.c src/version.c |
| diffstat | 2 files changed, 20 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds2.c +++ b/src/ex_cmds2.c @@ -5091,24 +5091,10 @@ ex_language(exarg_T *eap) # if defined(FEAT_CMDL_COMPL) || defined(PROTO) static char_u **locales = NULL; /* Array of all available locales */ + +# ifndef WIN32 static int did_init_locales = FALSE; -static void init_locales(void); -static char_u **find_locales(void); - -/* - * Lazy initialization of all available locales. - */ - static void -init_locales(void) -{ - if (!did_init_locales) - { - did_init_locales = TRUE; - locales = find_locales(); - } -} - /* Return an array of strings for all available locales + NULL for the * last element. Return NULL in case of error. */ static char_u ** @@ -5149,6 +5135,22 @@ find_locales(void) ((char_u **)locales_ga.ga_data)[locales_ga.ga_len] = NULL; return (char_u **)locales_ga.ga_data; } +# endif + +/* + * Lazy initialization of all available locales. + */ + static void +init_locales(void) +{ +# ifndef WIN32 + if (!did_init_locales) + { + did_init_locales = TRUE; + locales = find_locales(); + } +# endif +} # if defined(EXITFREE) || defined(PROTO) void