To: vim_dev@googlegroups.com
Subject: Patch 7.4.1683
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

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


*** ../vim-7.4.1682/src/dosinst.c	2013-11-21 18:13:26.000000000 +0100
--- src/dosinst.c	2016-03-28 23:00:22.709355266 +0200
***************
*** 762,767 ****
--- 762,768 ----
  	    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,798 ****
--- 794,802 ----
  	    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");
*** ../vim-7.4.1682/src/version.c	2016-03-28 22:48:26.000724752 +0200
--- src/version.c	2016-03-28 23:01:42.392536449 +0200
***************
*** 750,751 ****
--- 750,753 ----
  {   /* Add new patch number below this line */
+ /**/
+     1683,
  /**/


-- 
If you feel lonely, try schizophrenia.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///