Skip to content

Commit 5d42474

Browse files
committed
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)
1 parent 28944fe commit 5d42474

2 files changed

Lines changed: 11 additions & 6 deletions

File tree

nsis/gvim.nsi

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@ Page instfiles
8989
UninstPage uninstConfirm
9090
UninstPage instfiles
9191

92+
# Reserve files
93+
# Needed for showing the _vimrc setting page faster.
94+
ReserveFile /plugin InstallOptions.dll
95+
ReserveFile vimrc.ini
96+
9297
##########################################################
9398
# Functions
9499

@@ -475,14 +480,12 @@ Function SetCustom
475480
# Display the InstallOptions dialog
476481

477482
# Check if a _vimrc should be created
478-
SectionGetFlags ${sec_vimrc_id} $0
479-
IntOp $0 $0 & 1
480-
StrCmp $0 "1" +2 0
483+
SectionGetFlags ${sec_vimrc_id} $3
484+
IntOp $3 $3 & 1
485+
StrCmp $3 "1" +2 0
481486
Abort
482487

483-
Push $3
484-
InstallOptions::dialog "$PLUGINSDIR\vimrc.ini"
485-
Pop $3
488+
InstallOptions::dialog "$PLUGINSDIR\vimrc.ini"
486489
Pop $3
487490
FunctionEnd
488491

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -771,6 +771,8 @@ static char *(features[]) =
771771

772772
static int included_patches[] =
773773
{ /* Add new patch number below this line */
774+
/**/
775+
1472,
774776
/**/
775777
1471,
776778
/**/

0 commit comments

Comments
 (0)