patch 8.2.4370: MS-Windows: libsodium.dll not included with the installer

Problem:    MS-Windows: libsodium.dll not included with the installer.
Solution:   Add the file to the installer if it exists. (Christian Brabandt,
            closes #9762)

diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index 649c6950dde640be026d13d2fa61884c0069b23e..c32a8868f61ef37cef6d6be86a17d46ef68e59d3 100644 (file)
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -347,6 +347,9 @@ Section "$(str_section_exe)" id_section_exe
        File /oname=gvim.exe ${VIMSRC}\gvim_ole.exe
 !if /FileExists "${VIMSRC}\vim${BIT}.dll"
        File ${VIMSRC}\vim${BIT}.dll
+!endif
+!if /FileExists "${VIMRT}\libsodium.dll"
+       File ${VIMRT}\libsodium.dll
 !endif
        File /oname=install.exe ${VIMSRC}\installw32.exe
        File /oname=uninstall.exe ${VIMSRC}\uninstallw32.exe

diff --git a/src/version.c b/src/version.c
index 3c676829a7a73af5fcc7c97de2f152b1418b0fa6..b7fbbbd8b6ab8d7ef5daa0f1947323beb247c043 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4370,
 /**/
     4369,
 /**/