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 871ce673a99635b93a9bebf79a714d2a2af048e6..a1820f449f993587b5eae62e160cac52a4d9c744 100644 (file)
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -89,6 +89,11 @@ Page instfiles
 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 @@ Function SetCustom
        # 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 df15d1117d5615cc7bd661a42cdd93bf2dcc24af..5c4e17ba9cad10747326309b918e50a36d0928aa 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1472,
 /**/
     1471,
 /**/