Mercurial > vim

changeset 3463:3daba355b0c1 v7.3.496

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.3.496 Problem: MS-DOS: When "diff" trips over difference in line separators some tests fail. Solution: Make some .ok files use unix line separators. (David Pope)
author Bram Moolenaar <bram@vim.org>
date Fri, 13 Apr 2012 19:11:20 +0200
parents a104dae7f903
children d01eb8722b5a
files src/testdir/Make_dos.mak src/testdir/Make_ming.mak src/version.c
diffstat 3 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -52,7 +52,8 @@ win32:	fixff $(SCRIPTS16) $(SCRIPTS) $(S
 
 fixff:
 	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
-	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q dotest.in
+	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \
+		dotest.in test60.ok test71.ok test74.ok
 
 clean:
 	-del *.out
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -75,6 +75,8 @@ win32:	fixff $(SCRIPTS16) $(SCRIPTS) $(S
 
 fixff:
 	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
+	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \
+		dotest.in test60.ok test71.ok test74.ok
 
 clean:
 	-$(DEL) *.out
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    496,
+/**/
     495,
 /**/
     494,