Hi Bram,
Quoting from https://www.vim.org/download.php#pc
> newer intl library libintl
> The included libintl.dll does not support encoding conversion. If you
> have installed the iconv library, as mentioned above, you can install a
> gettext library that uses it. Get "intl.dll" from the bin directory in
> the gettext-win32 archive and store it as "libintl.dll" in the same
> directory as gvim.exe, overwriting the file that may already be there.
Currently we support libintl.dll and libintl-8.dll, but I think it's also
better to support intl.dll.
With this patch, users don't need to rename intl.dll to libintl.dll anymore.
(We already do a similar thing for iconv.dll.)
(We can get much newer versions of libintl and libiconv at
https://github.com/mlocati/gettext-iconv-windows, and already included in
gvim81.exe, though.)
Regards,
Ken Takata
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
# HG changeset patch
# Parent aeabcaf55533342e8dfb79dfcbf1d2898ce85c91
# Parent da3d74bc07a63d8af65bb877f64876ba337b2391
diff --git a/src/os_win32.c b/src/os_win32.c
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -464,7 +464,8 @@ vimLoadLib(char *name)
#if defined(DYNAMIC_GETTEXT) || defined(PROTO)
# ifndef GETTEXT_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
/* Dummy functions */
static char *null_libintl_gettext(const char *);
@@ -501,9 +502,13 @@ dyn_libintl_init()
return 1;
/* Load gettext library (libintl.dll) */
hLibintlDLL = vimLoadLib(GETTEXT_DLL);
-#ifdef GETTEXT_DLL_ALT
+#ifdef GETTEXT_DLL_ALT1
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
if (!hLibintlDLL)
{
