patch 7.4.1683

Problem:    Generated .bat files do not support --nofork.
Solution:   Add check for --nofork.  Also add "setlocal". (Kevin Cantú,
            closes #659)
This commit is contained in:
Bram Moolenaar
2016-03-28 23:05:48 +02:00
parent 72188e9aae
commit e609ad557c
2 changed files with 6 additions and 0 deletions

View File

@ -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");

View File

@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1683,
/**/
1682,
/**/