From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 28 Jan 2016 14:07:38 +0000 (+0100)
Subject: patch 7.4.1189
X-Git-Tag: v7.4.1189
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=923e43b837ca4c8edb7998743f142823eaeaf588;p=vim

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.
---

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,
 /**/