diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-06-24 15:11:01 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-06-24 15:11:01 +0200 |
| commit | a1bd86e0f2056f796390bc0cd3aba5c89513d0d2 (patch) | |
| tree | 7dfea12e059c4bc89c154e0d6094971b77d2fafd | |
| parent | 53564f7c1a2998d92568e07fff1f2a4c1cecb646 (diff) | |
patch 8.0.0668: nsis installer script does not workv8.0.0668
Problem: Nsis installer script does not work. (Christian Brabandt)
Solution: Fix the syntax of /SD.
| -rw-r--r-- | nsis/gvim.nsi | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi index 9ace4ea2c0..dba9021b0d 100644 --- a/nsis/gvim.nsi +++ b/nsis/gvim.nsi @@ -87,7 +87,8 @@ UninstPage instfiles Function .onInit MessageBox MB_YESNO|MB_ICONQUESTION \ "This will install Vim ${VER_MAJOR}.${VER_MINOR} on your computer.$\n Continue?" \ - /SD IDYES NoAbort + /SD IDYES \ + IDYES NoAbort Abort ; causes installer to quit. NoAbort: diff --git a/src/version.c b/src/version.c index daa3531c12..eda74a207d 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 */ /**/ + 668, +/**/ 667, /**/ 666, |