patch 7.4.1683

Problem:    Generated .bat files do not support --nofork.
Solution:   Add check for --nofork.  Also add "setlocal". (Kevin Cantú,
            closes #659)

diff --git a/src/dosinst.c b/src/dosinst.c
index 5b54380fe75fcc43b3b0a2e3b6fc66da4cdf2f39..809789fb7f0967cd1878cbe4aa833687ea2eacc7 100644 (file)
--- 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 00e25e9014b79c6005bd32b409a2b1a16329b798..333c0d8145953fe8fa713ace767c12bea43251e4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1683,
 /**/
     1682,
 /**/