# HG changeset patch # User Christian Brabandt # Date 1517768106 -3600 # Node ID fbc58aa4ea1e72f4e72b28d626c87087a39f0c3f # Parent 65d3eb05ad74267fd58c9870ff2c15d493e18458 patch 8.0.1472: MS-Windows: nsis installer is a bit slow commit https://github.com/vim/vim/commit/5d4247402b7195c6872485ddf1600a1cea723027 Author: Bram Moolenaar Date: Sun Feb 4 19:11:30 2018 +0100 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 https://github.com/vim/vim/issues/2522) diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi --- 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 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1472, +/**/ 1471, /**/ 1470,