# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1459199704 -7200
# Node ID 667da8443275e7db423fd0aaa3bbc1293a4961aa
# Parent  c29f6fad5319b37ff4d2efd3d3f0f849a544e148
commit https://github.com/vim/vim/commit/e609ad557c15e3e5d1e9ace2c578f48c5589c488
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Mar 28 23:05:48 2016 +0200

    patch 7.4.1683
    Problem:    Generated .bat files do not support --nofork.
    Solution:   Add check for --nofork.  Also add "setlocal". (Kevin Cant?,
                closes https://github.com/vim/vim/issues/659)

diff --git a/src/dosinst.c b/src/dosinst.c
--- 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
--- 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,