To: vim_dev@googlegroups.com Subject: Patch 8.1.0452 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.0452 Problem: MS-Windows: not finding intl.dll. Solution: Also find intl.dll next to libintl.dll. (Ken Takata) Files: src/os_win32.c, runtime/doc/mlang.txt *** ../vim-8.1.0451/src/os_win32.c 2018-10-03 20:44:16.340886213 +0200 --- src/os_win32.c 2018-10-06 14:57:21.420211524 +0200 *************** *** 573,579 **** #if defined(DYNAMIC_GETTEXT) || defined(PROTO) # ifndef GETTEXT_DLL # define GETTEXT_DLL "libintl.dll" ! # define GETTEXT_DLL_ALT "libintl-8.dll" # endif /* Dummy functions */ static char *null_libintl_gettext(const char *); --- 573,580 ---- #if defined(DYNAMIC_GETTEXT) || defined(PROTO) # ifndef GETTEXT_DLL # define GETTEXT_DLL "libintl.dll" ! # define GETTEXT_DLL_ALT1 "libintl-8.dll" ! # define GETTEXT_DLL_ALT2 "intl.dll" # endif /* Dummy functions */ static char *null_libintl_gettext(const char *); *************** *** 614,627 **** }; HINSTANCE hmsvcrt; ! /* No need to initialize twice. */ ! 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) { --- 615,632 ---- }; HINSTANCE hmsvcrt; ! // No need to initialize twice. ! if (hLibintlDLL != NULL) return 1; ! // Load gettext library (libintl.dll and other names). hLibintlDLL = vimLoadLib(GETTEXT_DLL); ! #ifdef GETTEXT_DLL_ALT1 if (!hLibintlDLL) ! hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT1); ! #endif ! #ifdef GETTEXT_DLL_ALT2 ! if (!hLibintlDLL) ! hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT2); #endif if (!hLibintlDLL) { *** ../vim-8.1.0451/runtime/doc/mlang.txt 2018-05-17 13:41:41.000000000 +0200 --- runtime/doc/mlang.txt 2018-10-06 14:59:44.978840351 +0200 *************** *** 102,109 **** This also contains tools xgettext, msgformat and others. ! libintl.dll should be placed in same directory with (g)vim.exe, or some ! place where PATH environment value describe. Vim also finds libintl-8.dll. 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). --- 102,111 ---- This also contains tools xgettext, msgformat and others. ! libintl.dll should be placed in same directory as (g)vim.exe, or one of the ! 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", where "xx" is the abbreviation of the language (mostly two letters). *************** *** 210,213 **** :endif < ! vim:tw=78:sw=4:ts=8:ft=help:norl: --- 212,215 ---- :endif < ! vim:tw=78:sw=4:ts=8:noet:ft=help:norl: *** ../vim-8.1.0451/src/version.c 2018-10-03 20:44:16.340886213 +0200 --- src/version.c 2018-10-06 14:55:54.765045584 +0200 *************** *** 794,795 **** --- 794,797 ---- { /* Add new patch number below this line */ + /**/ + 452, /**/ -- hundred-and-one symptoms of being an internet addict: 161. You get up before the sun rises to check your e-mail, and you find yourself in the very same chair long after the sun has set. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///