From 923e43b837ca4c8edb7998743f142823eaeaf588 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 28 Jan 2016 15:07:38 +0100 Subject: [PATCH] patch 7.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. --- src/os_win32.c | 3 +-- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/os_win32.c b/src/os_win32.c index 4c876a05c..be7bd95b5 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -500,12 +500,11 @@ 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 3fc0a7221..338cb7a9a 100644 --- a/src/version.c +++ b/src/version.c @@ -746,6 +746,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1189, /**/ 1188, /**/ -- 2.50.1