summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-09-17 21:00:03 +0200
committerBram Moolenaar <Bram@vim.org>2017-09-17 21:00:03 +0200
commit49150a41f86ff5c50de6d679168532682f49c672 (patch)
treedcc55fe0e7e916a9dc2756fa5b6ca220cc710130
parent63c4e8a1986796094e6f15b893f2deccdf482617 (diff)
downloadvim-git-8.0.1121.tar.gz
patch 8.0.1121: can uncheck executables in MS-Windows installerv8.0.1121
Problem: Can uncheck executables in MS-Windows installer. Solution: Make the choice read-only. (Ken Takata, closes #2106)
-rw-r--r--nsis/gvim.nsi2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index 8bfe5e6c8..1a169f3e0 100644
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -179,7 +179,7 @@ FunctionEnd
##########################################################
Section "Vim executables and runtime files"
- SectionIn 1 2 3
+ SectionIn 1 2 3 RO
# we need also this here if the user changes the instdir
StrCpy $0 "$INSTDIR\vim${VER_MAJOR}${VER_MINOR}"
diff --git a/src/version.c b/src/version.c
index dae5d3f08..e215d3e72 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1121,
+/**/
1120,
/**/
1119,