diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-02-04 19:11:30 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-02-04 19:11:30 +0100 |
| commit | 5d4247402b7195c6872485ddf1600a1cea723027 (patch) | |
| tree | 167fb88967fd22a9bf89cd873a2d79d9cc058116 | |
| parent | 28944fecff3c40b44325921d45aaf67451b0937f (diff) | |
patch 8.0.1472: MS-Windows: nsis installer is a bit slowv8.0.1472
Problem: MS-Windows: nsis installer is a bit slow.
Solution: Use ReserveFile for vimrc.ini. (closes #2522)
| -rw-r--r-- | nsis/gvim.nsi | 15 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi index 871ce673a9..a1820f449f 100644 --- 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 df15d1117d..5c4e17ba9c 100644 --- 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, |