changeset 7784:29d4ee3f009a v7.4.1189

commit https://github.com/vim/vim/commit/923e43b837ca4c8edb7998743f142823eaeaf588 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jan 28 15:07:38 2016 +0100 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.
author Christian Brabandt <cb@256bit.org>
date Thu, 28 Jan 2016 15:15:04 +0100
parents 78bd525c219f
children 9420058dfec6
files src/os_win32.c src/version.c
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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)
 	{
--- 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,