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 4498c1c81ea8e49aaf1a3440d8ee8037d8f82cc6..c3006225ef2e78a531e790e50ecd64fc8a01f895 100644 (file)
--- 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 4aee8cdef8bddc01ac58c75d822cf818bb7041b4..dfc1487dffc32f59be5ea7db3a5361b2403ae66a 100644 (file)
--- 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 65b8c582556ce863495cd12b5d2c785220083e46..c0d60e8aad48cee7118b9d2c9881c4a44802bfcb 100644 (file)
--- 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,
 /**/