# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1488654903 -3600
# Node ID 5de2fb612f217770271125ade84dce34ffbeeba5
# Parent  02292c3afb7bd155b1b86b31dd31bc83dbe425bd
patch 8.0.0410: newer gettext/iconv library has extra dll file

commit https://github.com/vim/vim/commit/a54d2fc0d3ec7c4c8ca99b91e2ff7f7fee45c8bd
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Mar 4 20:09:34 2017 +0100

    patch 8.0.0410: newer gettext/iconv library has extra dll file

    Problem:    Newer gettext/iconv library has extra dll file.
    Solution:   Add the file to the Makefile and nsis script. (Christian Brabandt)

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -120,8 +120,9 @@ MINOR = 0
 #
 # MS-Windows:
 # - Run make on Unix to update the ".mo" files.
-# - Get libintl-8.dll and libiconv-2.dll. E.g. from
+# - Get libintl-8.dll, libiconv-2.dll and libgcc_s_sjlj-1.dll. E.g. from
 #   https://mlocati.github.io/gettext-iconv-windows/ .
+#   Use the "shared-32.zip file and extract the archive to get the files.
 #   Put them in the top directory, "make dosrt" uses them.
 # - > make dossrc
 #   > make dosrt
@@ -468,6 +469,7 @@ dosrt_files: dist prepare no_title.vim
 	    done
 	cp libintl-8.dll dist/vim/$(VIMRTDIR)/
 	cp libiconv-2.dll dist/vim/$(VIMRTDIR)/
+	cp libgcc_s_sjlj-1.dll dist/vim/$(VIMRTDIR)/
 
 
 # Used before uploading.  Don't delete the AAPDIR/sign files!
diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -385,6 +385,7 @@ SectionEnd
 		File ${VIMRT}\libintl-8.dll
 		File ${VIMRT}\libiconv-2.dll
 		File /nonfatal ${VIMRT}\libwinpthread-1.dll
+		File /nonfatal ${VIMRT}\libgcc_s_sjlj-1.dll
 	SectionEnd
 !endif
 
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    410,
+/**/
     409,
 /**/
     408,