commit 286eacd3f6631e985089176fb1dff1bcf1a1d6b5
author Bram Moolenaar <Bram@vim.org> Sat Jan 16 18:05:50 2016 +0100
committer Bram Moolenaar <Bram@vim.org> Sat Jan 16 18:05:50 2016 +0100
tree 83ec0d2a894f0d35985906dc1c3e04de10a3c9d4
parent 9bbf63dbf8286fadc0cd6b3428010abb67b1b64d

patch 7.4.1106
Problem:    The nsis script can't be used from the appveyor build.
Solution:   Add "ifndef" to allow for variables to be set from the command
            line. Remove duplicate SetCompressor command. Support using other
            gettext binaries. (Ken Takata)  Update build instructions to use
            libintl-8.dll.

src/main.c

diff --git a/src/main.c b/src/main.c
index d7723d2..175bbde 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1580,7 +1580,7 @@
 
 #  ifdef DYNAMIC_GETTEXT
 	/* Initialize the gettext library */
-	dyn_libintl_init(NULL);
+	dyn_libintl_init();
 #  endif
 	/* expand_env() doesn't work yet, because chartab[] is not initialized
 	 * yet, call vim_getenv() directly */

src/os_w32exe.c

diff --git a/src/os_w32exe.c b/src/os_w32exe.c
index 93a1389..d8fa2bf 100644
--- a/src/os_w32exe.c
+++ b/src/os_w32exe.c
@@ -69,7 +69,7 @@
 
 #ifdef DYNAMIC_GETTEXT
     /* Initialize gettext library */
-    dyn_libintl_init(NULL);
+    dyn_libintl_init();
 #endif
 
 #ifdef VIMDLL

src/os_win32.c

diff --git a/src/os_win32.c b/src/os_win32.c
index 69623f9..c5b23ca 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -463,6 +463,7 @@
 #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 *);
@@ -479,7 +480,7 @@
 				       = null_libintl_bind_textdomain_codeset;
 
     int
-dyn_libintl_init(char *libname)
+dyn_libintl_init()
 {
     int i;
     static struct
@@ -498,7 +499,9 @@
     if (hLibintlDLL)
 	return 1;
     /* Load gettext library (libintl.dll) */
-    hLibintlDLL = vimLoadLib(libname != NULL ? libname : GETTEXT_DLL);
+    hLibintlDLL = vimLoadLib(GETTEXT_DLL);
+    if (!hLibintlDLL)
+	hLibintlDLL = vimLoadLib(GETTEXT_DLL_ALT);
     if (!hLibintlDLL)
     {
 	if (p_verbose > 0)

src/proto/os_win32.pro

diff --git a/src/proto/os_win32.pro b/src/proto/os_win32.pro
index 5816fc9..e6fce88 100644
--- a/src/proto/os_win32.pro
+++ b/src/proto/os_win32.pro
@@ -1,6 +1,6 @@
 /* os_win32.c */
 HINSTANCE vimLoadLib __ARGS((char *name));
-int dyn_libintl_init __ARGS((char *libname));
+int dyn_libintl_init __ARGS((void));
 void dyn_libintl_end __ARGS((void));
 void PlatformId __ARGS((void));
 int mch_windows95 __ARGS((void));

src/version.c

diff --git a/src/version.c b/src/version.c
index f74281d..efc77c0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1106,
+/**/
     1105,
 /**/
     1104,