summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nsis/gvim.nsi7
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 2 deletions
diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index ccdef090e..7c407219f 100644
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -40,7 +40,7 @@ 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')"
Icon icons\vim_16c.ico
-# NSIS2 uses a different strategy with six diferent images in a strip...
+# NSIS2 uses a different strategy with six different images in a strip...
#EnabledBitmap icons\enabled.bmp
#DisabledBitmap icons\disabled.bmp
UninstallText "This will uninstall Vim ${VER_MAJOR}.${VER_MINOR} from your system."
@@ -56,6 +56,9 @@ LicenseData ${VIMRT}\doc\uganda.nsis.txt
!packhdr temp.dat "upx --best --compress-icons=1 temp.dat"
!endif
+SetCompressor /SOLID lzma
+XPStyle on
+
# This adds '\vim' to the user choice automagically. The actual value is
# obtained below with ReadINIStr.
InstallDir "$PROGRAMFILES\Vim"
@@ -250,7 +253,7 @@ Section "Vim console program (vim.exe)"
# Windows 95/98/ME: not supported
Goto lbl_done
lbl_winnt:
- # Windows NT/2000/XT and later
+ # Windows NT/2000/XP and later
File /oname=vim.exe ${VIMSRC}\vimw32.exe
lbl_done:
StrCpy $2 "$2 vim view vimdiff"
diff --git a/src/version.c b/src/version.c
index a8d7def79..e63af1f74 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1310,
+/**/
1309,
/**/
1308,