Skip to content

Commit f2db25d

Browse files
committed
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)
1 parent 42102dd commit f2db25d

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

src/testdir/Make_dos.mak

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ win32: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32)
5252

5353
fixff:
5454
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
55-
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q dotest.in
55+
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \
56+
dotest.in test60.ok test71.ok test74.ok
5657

5758
clean:
5859
-del *.out

src/testdir/Make_ming.mak

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ win32: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32)
7575

7676
fixff:
7777
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
78+
-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \
79+
dotest.in test60.ok test71.ok test74.ok
7880

7981
clean:
8082
-$(DEL) *.out

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,8 @@ static char *(features[]) =
714714

715715
static int included_patches[] =
716716
{ /* Add new patch number below this line */
717+
/**/
718+
496,
717719
/**/
718720
495,
719721
/**/

0 commit comments

Comments
 (0)