patch 8.0.1472: MS-Windows: nsis installer is a bit slow
Problem: MS-Windows: nsis installer is a bit slow.
Solution: Use ReserveFile for vimrc.ini. (closes #2522)
diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index 871ce67..a1820f4 100644
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -89,6 +89,11 @@
UninstPage uninstConfirm
UninstPage instfiles
+# Reserve files
+# Needed for showing the _vimrc setting page faster.
+ReserveFile /plugin InstallOptions.dll
+ReserveFile vimrc.ini
+
##########################################################
# Functions
@@ -475,14 +480,12 @@
# Display the InstallOptions dialog
# Check if a _vimrc should be created
- SectionGetFlags ${sec_vimrc_id} $0
- IntOp $0 $0 & 1
- StrCmp $0 "1" +2 0
+ SectionGetFlags ${sec_vimrc_id} $3
+ IntOp $3 $3 & 1
+ StrCmp $3 "1" +2 0
Abort
- Push $3
- InstallOptions::dialog "$PLUGINSDIR\vimrc.ini"
- Pop $3
+ InstallOptions::dialog "$PLUGINSDIR\vimrc.ini"
Pop $3
FunctionEnd
diff --git a/src/version.c b/src/version.c
index df15d11..5c4e17b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1472,
+/**/
1471,
/**/
1470,