From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 13 Apr 2012 17:11:20 +0000 (+0200)
Subject: updated for version 7.3.496
X-Git-Tag: v7.3.496
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=09210ac93cacd4552593604066a86b2e7036a636;p=vim

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)
---

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 4498c1c81..c3006225e 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -52,7 +52,8 @@ win32:	fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32)
 
 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
diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 4aee8cdef..dfc1487df 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -75,6 +75,8 @@ win32:	fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32)
 
 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
diff --git a/src/version.c b/src/version.c
index 65b8c5825..c0d60e8aa 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    496,
 /**/
     495,
 /**/