vim-patch:8.0.0174

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)

b8f7bd68f6
This commit is contained in:
ckelsel
2017-08-10 08:36:31 +08:00
parent 085102fadf
commit 4cd2749b10
2 changed files with 16 additions and 11 deletions

View File

@@ -3610,18 +3610,11 @@ void ex_language(exarg_T *eap)
static char_u **locales = NULL; // Array of all available locales static char_u **locales = NULL; // Array of all available locales
#ifndef WIN32
static bool did_init_locales = false; static bool did_init_locales = false;
/// Lazy initialization of all available locales. /// Return an array of strings for all available locales + NULL for the
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. /// last element. Return NULL in case of error.
static char_u **find_locales(void) static char_u **find_locales(void)
{ {
@@ -3653,6 +3646,18 @@ static char_u **find_locales(void)
((char_u **)locales_ga.ga_data)[locales_ga.ga_len] = NULL; ((char_u **)locales_ga.ga_data)[locales_ga.ga_len] = NULL;
return (char_u **)locales_ga.ga_data; 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) # if defined(EXITFREE)
void free_locales(void) void free_locales(void)

View File

@@ -778,7 +778,7 @@ static const int included_patches[] = {
177, 177,
176, 176,
// 175, // 175,
// 174, 174,
// 173 NA // 173 NA
172, 172,
// 171, // 171,