aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.1.0452: MS-Windows: not finding intl.dll

Browse Source 
Problem:    MS-Windows: not finding intl.dll.
Solution:   Also find intl.dll next to libintl.dll. (Ken Takata)
This commit is contained in:
Bram Moolenaar
2018-10-06 15:03:15 +02:00
parent 2bc152ab53
commit 7554c548a4
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/doc/mlang.txt
View File

@@ -102,8 +102,10 @@ Or:
This also contains tools xgettext, msgformat and others. This also contains tools xgettext, msgformat and others.
libintl.dll should be placed in same directory with (g)vim.exe, or some libintl.dll should be placed in same directory as (g)vim.exe, or one of the
place where PATH environment value describe. Vim also finds libintl-8.dll. directories listed in the PATH environment value. Vim also looks for the
alternate names "libintl-8.dll" and "intl.dll".
Message files (vim.mo) have to be placed in "$VIMRUNTIME/lang/xx/LC_MESSAGES", Message files (vim.mo) have to be placed in "$VIMRUNTIME/lang/xx/LC_MESSAGES",
where "xx" is the abbreviation of the language (mostly two letters). where "xx" is the abbreviation of the language (mostly two letters).

17
src/os_win32.c
View File

@@ -573,7 +573,8 @@ get_dll_import_func(HINSTANCE hInst, const char *funcname)
#if defined(DYNAMIC_GETTEXT) || defined(PROTO) #if defined(DYNAMIC_GETTEXT) || defined(PROTO)
# ifndef GETTEXT_DLL # ifndef GETTEXT_DLL
# define GETTEXT_DLL "libintl.dll" # define GETTEXT_DLL "libintl.dll"
# define GETTEXT_DLL_ALT "libintl-8.dll" # define GETTEXT_DLL_ALT1 "libintl-8.dll"
# define GETTEXT_DLL_ALT2 "intl.dll"
# endif # endif
/* Dummy functions */ /* Dummy functions */
static char *null_libintl_gettext(const char *); static char *null_libintl_gettext(const char *);
@@ -614,14 +615,18 @@ dyn_libintl_init(void)
}; };
HINSTANCE hmsvcrt; HINSTANCE hmsvcrt;
/* No need to initialize twice. */ // No need to initialize twice.
if (hLibintlDLL) if (hLibintlDLL != NULL)
return 1; return 1;
/* Load gettext library (libintl.dll) */ // Load gettext library (libintl.dll and other names).
hLibintlDLL = vimLoadLib(GETTEXT_DLL); hLibintlDLL = vimLoadLib(GETTEXT_DLL);
#ifdef GETTEXT_DLL_ALT #ifdef GETTEXT_DLL_ALT1
if (!hLibintlDLL) if (!hLibintlDLL)
hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT); hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT1);
#endif
#ifdef GETTEXT_DLL_ALT2
if (!hLibintlDLL)
hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT2);
#endif #endif
if (!hLibintlDLL) if (!hLibintlDLL)
{ {

2
src/version.c
View File

@@ -792,6 +792,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
452,
/**/ /**/
451, 451,
/**/ /**/