GitHub/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-07-16 01:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated for version 7.4.504

Browse Source 
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)
This commit is contained in:
Bram Moolenaar
2014-11-05 18:18:17 +01:00
parent 6b2e938f13
commit 0434482e5a
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nsis/gvim.nsi
View File

@ -1,6 +1,6 @@
# NSIS file to create a self-installing exe for Vim. # NSIS file to create a self-installing exe for Vim.
# It requires NSIS version 2.0 or later. # 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, # WARNING: if you make changes to this script, look out for $0 to be valid,
# because uninstall deletes most files in $0. # because uninstall deletes most files in $0.
@ -38,7 +38,7 @@ SetDatablockOptimize on
RequestExecutionLevel highest RequestExecutionLevel highest
ComponentText "This will install Vim ${VER_MAJOR}.${VER_MINOR} on your computer." 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 Icon icons\vim_16c.ico
# NSIS2 uses a different strategy with six different images in a strip... # NSIS2 uses a different strategy with six different images in a strip...
#EnabledBitmap icons\enabled.bmp #EnabledBitmap icons\enabled.bmp
@ -135,11 +135,6 @@ FunctionEnd
# We only accept the directory if it ends in "vim". Using .onVerifyInstDir has # We only accept the directory if it ends in "vim". Using .onVerifyInstDir has
# the disadvantage that the browse dialog is difficult to use. # the disadvantage that the browse dialog is difficult to use.
Function CheckInstallDir Function CheckInstallDir
StrCpy $0 $INSTDIR 3 -3
StrCmp $0 "vim" PathGood
MessageBox MB_OK "The path must end in 'vim'."
Abort
PathGood:
FunctionEnd FunctionEnd
Function .onInstSuccess Function .onInstSuccess

2
src/version.c
View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
504,
/**/ /**/
503, 503,
/**/ /**/