diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-11-05 18:18:17 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-11-05 18:18:17 +0100 |
| commit | 0434482e5aa5a46b7da27f745c22ec36d35f2c7e (patch) | |
| tree | a37efd33db604df4f834688131806a1d715a2275 | |
| parent | 6b2e938f1307f840165d9049d743161b01af811c (diff) | |
updated for version 7.4.504v7.4.504
Problem: Restriction of the MS-Windows installer that the path must end in
"Vim" prevents installing more than one version.
Solution: Remove the restriction. (Tim Lebedkov)
| -rw-r--r-- | nsis/gvim.nsi | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi index 7b69e7d9cb..a2d20bf829 100644 --- a/nsis/gvim.nsi +++ b/nsis/gvim.nsi @@ -1,6 +1,6 @@ # NSIS file to create a self-installing exe for Vim. # It requires NSIS version 2.0 or later. -# Last Change: 2010 Jul 30 +# Last Change: 2014 Nov 5 # WARNING: if you make changes to this script, look out for $0 to be valid, # because uninstall deletes most files in $0. @@ -38,7 +38,7 @@ SetDatablockOptimize on RequestExecutionLevel highest ComponentText "This will install Vim ${VER_MAJOR}.${VER_MINOR} on your computer." -DirText "Choose a directory to install Vim (must end in 'vim')" +DirText "Choose a directory to install Vim (should contain 'vim')" Icon icons\vim_16c.ico # NSIS2 uses a different strategy with six different images in a strip... #EnabledBitmap icons\enabled.bmp @@ -135,11 +135,6 @@ FunctionEnd # We only accept the directory if it ends in "vim". Using .onVerifyInstDir has # the disadvantage that the browse dialog is difficult to use. Function CheckInstallDir - StrCpy $0 $INSTDIR 3 -3 - StrCmp $0 "vim" PathGood - MessageBox MB_OK "The path must end in 'vim'." - Abort - PathGood: FunctionEnd Function .onInstSuccess diff --git a/src/version.c b/src/version.c index f9c0ece552..4bbc221552 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 504, +/**/ 503, /**/ 502, |