From e609ad557c15e3e5d1e9ace2c578f48c5589c488 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 28 Mar 2016 23:05:48 +0200 Subject: =?UTF-8?q?patch=207.4.1683=20Problem:=20=20=20=20Generated=20.bat?= =?UTF-8?q?=20files=20do=20not=20support=20--nofork.=20Solution:=20=20=20A?= =?UTF-8?q?dd=20check=20for=20--nofork.=20=20Also=20add=20"setlocal".=20(K?= =?UTF-8?q?evin=20Cant=C3=BA,=20=20=20=20=20=20=20=20=20=20=20=20=20closes?= =?UTF-8?q?=20#659)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/dosinst.c | 4 ++++ src/version.c | 2 ++ 2 files changed, 6 insertions(+) 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 @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1683, /**/ 1682, /**/ -- cgit v1.2.1