thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.034

Browse Source 
Problem:    Win32: may be loading .dll from the wrong directory.
Solution:   Go to the Vim executable directory when opening a library.
This commit is contained in:
Bram Moolenaar
2010-10-23 14:02:54 +02:00
parent b8e86705ca
commit ebbcb824ba
12 changed files with 69 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mbyte.c
View File

@@ -4159,11 +4159,11 @@ iconv_enabled(verbose)
{
if (hIconvDLL != 0 && hMsvcrtDLL != 0)
return TRUE;
hIconvDLL = LoadLibrary(DYNAMIC_ICONV_DLL);
hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL);
if (hIconvDLL == 0) /* sometimes it's called libiconv.dll */
hIconvDLL = LoadLibrary(DYNAMIC_ICONV_DLL_ALT);
hIconvDLL = vimLoadLib(DYNAMIC_ICONV_DLL_ALT);
if (hIconvDLL != 0)
hMsvcrtDLL = LoadLibrary(DYNAMIC_MSVCRT_DLL);
hMsvcrtDLL = vimLoadLib(DYNAMIC_MSVCRT_DLL);
if (hIconvDLL == 0 || hMsvcrtDLL == 0)
{
/* Only give the message when 'verbose' is set, otherwise it might be