summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-06-22 22:05:02 +0200
committerBram Moolenaar <Bram@vim.org>2017-06-22 22:05:02 +0200
commita1fed064d1eca6ae2c526311ec5464175c6f19e2 (patch)
treeb8cbc7d1c4f84e8f99794902886b1b782fc5e0df
parent4d785895d1f8b54cdd3fabd87446ca692f49e94e (diff)
downloadvim-git-a1fed064d1eca6ae2c526311ec5464175c6f19e2.tar.gz
patch 8.0.0660: silent install on MS-Windows shows dialogv8.0.0660
Problem: Silent install on MS-Windows does show a dialog. Solution: Add /SD to the default choice. (allburov, closes #1772)
-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 74a54333a..9ace4ea2c 100644
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -87,7 +87,7 @@ UninstPage instfiles
Function .onInit
MessageBox MB_YESNO|MB_ICONQUESTION \
"This will install Vim ${VER_MAJOR}.${VER_MINOR} on your computer.$\n Continue?" \
- IDYES NoAbort
+ /SD IDYES NoAbort
Abort ; causes installer to quit.
NoAbort:
diff --git a/src/version.c b/src/version.c
index cb4ac7f0b..877a1c5b1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 660,
+/**/
659,
/**/
658,