summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/dosinst.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/dosinst.c b/src/dosinst.c
index 5b54380fe..809789fb7 100644
--- a/src/dosinst.c
+++ b/src/dosinst.c
@@ -762,6 +762,7 @@ install_bat_choice(int idx)
fprintf(fd, "@echo off\n");
fprintf(fd, "rem -- Run Vim --\n");
fprintf(fd, "\n");
+ fprintf(fd, "setlocal\n");
/* Don't use double quotes for the "set" argument, also when it
* contains a space. The quotes would be included in the value
@@ -793,6 +794,9 @@ install_bat_choice(int idx)
fprintf(fd, "if .%%1==. goto loopend\n");
if (*exename == 'g')
{
+ fprintf(fd, "if NOT .%%1==.--nofork goto noforklongarg\n");
+ fprintf(fd, "set VIMNOFORK=1\n");
+ fprintf(fd, ":noforklongarg\n");
fprintf(fd, "if NOT .%%1==.-f goto noforkarg\n");
fprintf(fd, "set VIMNOFORK=1\n");
fprintf(fd, ":noforkarg\n");
diff --git a/src/version.c b/src/version.c
index 00e25e901..333c0d814 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1683,
+/**/
1682,
/**/
1681,