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 4c876a05ce780c60b9c5f92884855e931b7965b4..be7bd95b587773e6640031d7ada8a93fc64d5aea 100644 (file)
--- 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 3fc0a7221e85f0ecded071bdb075f5c869fd8c0c..338cb7a9a1696f73a7ff2149feee9e4e113e2c09 100644 (file)
--- 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,
 /**/