To: vim-dev@vim.org
Subject: Patch 6.2.500
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.2.500 (extra)
Problem:    The DOS/MS-Windows the installer doesn't use the --binary flag for
	    diff.
Solution:   Add --binary to the diff argument in MyDiff(). (Alejandro Lopez-
	    Valencia)
Files:	    src/dosinst.c


*** ../vim-6.2.499/src/dosinst.c	Wed Mar 17 15:17:46 2004
--- src/dosinst.c	Tue Apr 20 11:48:20 2004
***************
*** 1174,1180 ****
  	fprintf(fd, "\n");
  	fprintf(fd, "set diffexpr=MyDiff()\n");
  	fprintf(fd, "function MyDiff()\n");
! 	fprintf(fd, "  let opt = ''\n");
  	fprintf(fd, "  if &diffopt =~ 'icase' | let opt = opt . '-i ' | endif\n");
  	fprintf(fd, "  if &diffopt =~ 'iwhite' | let opt = opt . '-b ' | endif\n");
  	/* Use quotes only when needed, they may cause trouble. */
--- 1174,1180 ----
  	fprintf(fd, "\n");
  	fprintf(fd, "set diffexpr=MyDiff()\n");
  	fprintf(fd, "function MyDiff()\n");
! 	fprintf(fd, "  let opt = '-a --binary '\n");
  	fprintf(fd, "  if &diffopt =~ 'icase' | let opt = opt . '-i ' | endif\n");
  	fprintf(fd, "  if &diffopt =~ 'iwhite' | let opt = opt . '-b ' | endif\n");
  	/* Use quotes only when needed, they may cause trouble. */
***************
*** 1193,1207 ****
  	     * end of the command.  Putting quotes around the whole thing
  	     * doesn't work on Win 95/98/ME.  This is mostly guessed! */
  	    fprintf(fd, "  if &sh =~ '\\<cmd'\n");
! 	    fprintf(fd, "    silent execute '!\"\"%s\\diff\" -a ' . opt . arg1 . ' ' . arg2 . ' > ' . arg3 . '\"'\n", installdir);
  	    fprintf(fd, "  else\n");
  	    *p = NUL;
! 	    fprintf(fd, "    silent execute '!%s\" %s\\diff\" -a ' . opt . arg1 . ' ' . arg2 . ' > ' . arg3\n", installdir, p + 1);
  	    *p = ' ';
  	    fprintf(fd, "  endif\n");
  	}
  	else
! 	    fprintf(fd, "  silent execute '!%s\\diff -a ' . opt . arg1 . ' ' . arg2 . ' > ' . arg3\n", installdir);
  	fprintf(fd, "endfunction\n");
  	fprintf(fd, "\n");
      }
--- 1193,1207 ----
  	     * end of the command.  Putting quotes around the whole thing
  	     * doesn't work on Win 95/98/ME.  This is mostly guessed! */
  	    fprintf(fd, "  if &sh =~ '\\<cmd'\n");
! 	    fprintf(fd, "    silent execute '!\"\"%s\\diff\" ' . opt . arg1 . ' ' . arg2 . ' > ' . arg3 . '\"'\n", installdir);
  	    fprintf(fd, "  else\n");
  	    *p = NUL;
! 	    fprintf(fd, "    silent execute '!%s\" %s\\diff\" ' . opt . arg1 . ' ' . arg2 . ' > ' . arg3\n", installdir, p + 1);
  	    *p = ' ';
  	    fprintf(fd, "  endif\n");
  	}
  	else
! 	    fprintf(fd, "  silent execute '!%s\\diff ' . opt . arg1 . ' ' . arg2 . ' > ' . arg3\n", installdir);
  	fprintf(fd, "endfunction\n");
  	fprintf(fd, "\n");
      }
*** ../vim-6.2.499/src/version.c	Sun Apr 25 16:26:29 2004
--- src/version.c	Sun Apr 25 16:28:41 2004
***************
*** 639,640 ****
--- 639,642 ----
  {   /* Add new patch number below this line */
+ /**/
+     500,
  /**/

-- 
For a moment, nothing happened.
Then, after a second or so, nothing continued to happen.
		-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\  Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html ///