Karsten Hopp d5697f
To: vim_dev@googlegroups.com
Karsten Hopp d5697f
Subject: Patch 7.3.496
Karsten Hopp d5697f
Fcc: outbox
Karsten Hopp d5697f
From: Bram Moolenaar <Bram@moolenaar.net>
Karsten Hopp d5697f
Mime-Version: 1.0
Karsten Hopp d5697f
Content-Type: text/plain; charset=UTF-8
Karsten Hopp d5697f
Content-Transfer-Encoding: 8bit
Karsten Hopp d5697f
------------
Karsten Hopp d5697f
Karsten Hopp d5697f
Patch 7.3.496
Karsten Hopp d5697f
Problem:    MS-DOS: When "diff" trips over difference in line separators some
Karsten Hopp d5697f
	    tests fail.
Karsten Hopp d5697f
Solution:   Make some .ok files use unix line separators. (David Pope)
Karsten Hopp d5697f
Files:	    src/testdir/Make_dos.mak, src/testdir/Make_ming.mak
Karsten Hopp d5697f
Karsten Hopp d5697f
Karsten Hopp d5697f
*** ../vim-7.3.495/src/testdir/Make_dos.mak	2012-04-05 16:56:38.000000000 +0200
Karsten Hopp d5697f
--- src/testdir/Make_dos.mak	2012-04-09 21:23:43.000000000 +0200
Karsten Hopp d5697f
***************
Karsten Hopp d5697f
*** 52,58 ****
Karsten Hopp d5697f
  
Karsten Hopp d5697f
  fixff:
Karsten Hopp d5697f
  	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
Karsten Hopp d5697f
! 	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q dotest.in
Karsten Hopp d5697f
  
Karsten Hopp d5697f
  clean:
Karsten Hopp d5697f
  	-del *.out
Karsten Hopp d5697f
--- 52,59 ----
Karsten Hopp d5697f
  
Karsten Hopp d5697f
  fixff:
Karsten Hopp d5697f
  	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
Karsten Hopp d5697f
! 	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \
Karsten Hopp d5697f
! 		dotest.in test60.ok test71.ok test74.ok
Karsten Hopp d5697f
  
Karsten Hopp d5697f
  clean:
Karsten Hopp d5697f
  	-del *.out
Karsten Hopp d5697f
*** ../vim-7.3.495/src/testdir/Make_ming.mak	2012-04-05 16:56:38.000000000 +0200
Karsten Hopp d5697f
--- src/testdir/Make_ming.mak	2012-04-09 21:25:55.000000000 +0200
Karsten Hopp d5697f
***************
Karsten Hopp d5697f
*** 75,80 ****
Karsten Hopp d5697f
--- 75,82 ----
Karsten Hopp d5697f
  
Karsten Hopp d5697f
  fixff:
Karsten Hopp d5697f
  	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok
Karsten Hopp d5697f
+ 	-$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \
Karsten Hopp d5697f
+ 		dotest.in test60.ok test71.ok test74.ok
Karsten Hopp d5697f
  
Karsten Hopp d5697f
  clean:
Karsten Hopp d5697f
  	-$(DEL) *.out
Karsten Hopp d5697f
*** ../vim-7.3.495/src/version.c	2012-04-09 20:42:20.000000000 +0200
Karsten Hopp d5697f
--- src/version.c	2012-04-13 19:10:04.000000000 +0200
Karsten Hopp d5697f
***************
Karsten Hopp d5697f
*** 716,717 ****
Karsten Hopp d5697f
--- 716,719 ----
Karsten Hopp d5697f
  {   /* Add new patch number below this line */
Karsten Hopp d5697f
+ /**/
Karsten Hopp d5697f
+     496,
Karsten Hopp d5697f
  /**/
Karsten Hopp d5697f
Karsten Hopp d5697f
-- 
Karsten Hopp d5697f
There are 2 kinds of people in my world: those who know Unix, Perl, Vim, GNU,
Karsten Hopp d5697f
Linux, etc, and those who know COBOL.  It gets very difficult for me at
Karsten Hopp d5697f
parties, not knowing which group to socialise with :-)
Karsten Hopp d5697f
						Sitaram Chamarty
Karsten Hopp d5697f
Karsten Hopp d5697f
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
Karsten Hopp d5697f
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
Karsten Hopp d5697f
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
Karsten Hopp d5697f
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///