|
 |
fdd32d1 |
To: vim_dev@googlegroups.com
|
|
|
fdd32d1 |
Subject: Patch 7.4.504
|
|
|
fdd32d1 |
Fcc: outbox
|
|
|
fdd32d1 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
fdd32d1 |
Mime-Version: 1.0
|
|
|
fdd32d1 |
Content-Type: text/plain; charset=UTF-8
|
|
|
fdd32d1 |
Content-Transfer-Encoding: 8bit
|
|
|
fdd32d1 |
------------
|
|
|
fdd32d1 |
|
|
|
fdd32d1 |
Patch 7.4.504
|
|
|
fdd32d1 |
Problem: Restriction of the MS-Windows installer that the path must end in
|
|
|
fdd32d1 |
"Vim" prevents installing more than one version.
|
|
|
fdd32d1 |
Solution: Remove the restriction. (Tim Lebedkov)
|
|
|
fdd32d1 |
Files: nsis/gvim.nsi
|
|
|
fdd32d1 |
|
|
|
fdd32d1 |
|
|
|
fdd32d1 |
*** ../vim-7.4.503/nsis/gvim.nsi 2013-08-10 13:25:08.000000000 +0200
|
|
|
fdd32d1 |
--- nsis/gvim.nsi 2014-11-05 18:17:11.096424861 +0100
|
|
|
fdd32d1 |
***************
|
|
|
fdd32d1 |
*** 1,6 ****
|
|
|
fdd32d1 |
# NSIS file to create a self-installing exe for Vim.
|
|
|
fdd32d1 |
# It requires NSIS version 2.0 or later.
|
|
|
fdd32d1 |
! # Last Change: 2010 Jul 30
|
|
|
fdd32d1 |
|
|
|
fdd32d1 |
# WARNING: if you make changes to this script, look out for $0 to be valid,
|
|
|
fdd32d1 |
# because uninstall deletes most files in $0.
|
|
|
fdd32d1 |
--- 1,6 ----
|
|
|
fdd32d1 |
# NSIS file to create a self-installing exe for Vim.
|
|
|
fdd32d1 |
# It requires NSIS version 2.0 or later.
|
|
|
fdd32d1 |
! # Last Change: 2014 Nov 5
|
|
|
fdd32d1 |
|
|
|
fdd32d1 |
# WARNING: if you make changes to this script, look out for $0 to be valid,
|
|
|
fdd32d1 |
# because uninstall deletes most files in $0.
|
|
|
fdd32d1 |
***************
|
|
|
fdd32d1 |
*** 38,44 ****
|
|
|
fdd32d1 |
RequestExecutionLevel highest
|
|
|
fdd32d1 |
|
|
|
fdd32d1 |
ComponentText "This will install Vim ${VER_MAJOR}.${VER_MINOR} on your computer."
|
|
|
fdd32d1 |
! DirText "Choose a directory to install Vim (must end in 'vim')"
|
|
|
fdd32d1 |
Icon icons\vim_16c.ico
|
|
|
fdd32d1 |
# NSIS2 uses a different strategy with six different images in a strip...
|
|
|
fdd32d1 |
#EnabledBitmap icons\enabled.bmp
|
|
|
fdd32d1 |
--- 38,44 ----
|
|
|
fdd32d1 |
RequestExecutionLevel highest
|
|
|
fdd32d1 |
|
|
|
fdd32d1 |
ComponentText "This will install Vim ${VER_MAJOR}.${VER_MINOR} on your computer."
|
|
|
fdd32d1 |
! DirText "Choose a directory to install Vim (should contain 'vim')"
|
|
|
fdd32d1 |
Icon icons\vim_16c.ico
|
|
|
fdd32d1 |
# NSIS2 uses a different strategy with six different images in a strip...
|
|
|
fdd32d1 |
#EnabledBitmap icons\enabled.bmp
|
|
|
fdd32d1 |
***************
|
|
|
fdd32d1 |
*** 135,145 ****
|
|
|
fdd32d1 |
# We only accept the directory if it ends in "vim". Using .onVerifyInstDir has
|
|
|
fdd32d1 |
# the disadvantage that the browse dialog is difficult to use.
|
|
|
fdd32d1 |
Function CheckInstallDir
|
|
|
fdd32d1 |
- StrCpy $0 $INSTDIR 3 -3
|
|
|
fdd32d1 |
- StrCmp $0 "vim" PathGood
|
|
|
fdd32d1 |
- MessageBox MB_OK "The path must end in 'vim'."
|
|
|
fdd32d1 |
- Abort
|
|
|
fdd32d1 |
- PathGood:
|
|
|
fdd32d1 |
FunctionEnd
|
|
|
fdd32d1 |
|
|
|
fdd32d1 |
Function .onInstSuccess
|
|
|
fdd32d1 |
--- 135,140 ----
|
|
|
fdd32d1 |
*** ../vim-7.4.503/src/version.c 2014-11-05 18:05:48.660441306 +0100
|
|
|
fdd32d1 |
--- src/version.c 2014-11-05 18:14:51.076428235 +0100
|
|
|
fdd32d1 |
***************
|
|
|
fdd32d1 |
*** 743,744 ****
|
|
|
fdd32d1 |
--- 743,746 ----
|
|
|
fdd32d1 |
{ /* Add new patch number below this line */
|
|
|
fdd32d1 |
+ /**/
|
|
|
fdd32d1 |
+ 504,
|
|
|
fdd32d1 |
/**/
|
|
|
fdd32d1 |
|
|
|
fdd32d1 |
--
|
|
|
fdd32d1 |
-rwxr-xr-x 1 root 24 Oct 29 1929 /bin/ed
|
|
|
fdd32d1 |
-rwxr-xr-t 4 root 131720 Jan 1 1970 /usr/ucb/vi
|
|
|
fdd32d1 |
-rwxr-xr-x 1 root 5.89824e37 Oct 22 1990 /usr/bin/emacs
|
|
|
fdd32d1 |
|
|
|
fdd32d1 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
fdd32d1 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
fdd32d1 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
fdd32d1 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|