diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-28 15:07:38 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-28 15:07:38 +0100 |
| commit | 923e43b837ca4c8edb7998743f142823eaeaf588 (patch) | |
| tree | e34ad1d6d5340765b0ad276764fd82bc70b78ac0 /src | |
| parent | 009d84a34f3678ec93921bee3bc05be2fd606264 (diff) | |
patch 7.4.1189v7.4.1189
Problem: Using another language on MS-Windows does not work. (Yongwei Wu)
Solution: Undo the change to try loading libintl-8.dll first.
Diffstat (limited to 'src')
| -rw-r--r-- | src/os_win32.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index 4c876a05ce..be7bd95b58 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -500,13 +500,12 @@ dyn_libintl_init() if (hLibintlDLL) return 1; /* Load gettext library (libintl.dll) */ + hLibintlDLL = vimLoadLib(GETTEXT_DLL); #ifdef GETTEXT_DLL_ALT if (!hLibintlDLL) hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT); #endif if (!hLibintlDLL) - hLibintlDLL = vimLoadLib(GETTEXT_DLL); - if (!hLibintlDLL) { if (p_verbose > 0) { diff --git a/src/version.c b/src/version.c index 3fc0a7221e..338cb7a9a1 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1189, +/**/ 1188, /**/ 1187, |