To: vim_dev@googlegroups.com
Subject: Patch 7.4.1698
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.4.1698
Problem:    Two tests fail when running tests with MinGW. (Michael Soyka)
Solution:   Convert test_getcwd.ok test_wordcount.ok to unix fileformat.
Files:      src/testdir/Make_ming.mak


*** ../vim-7.4.1697/src/testdir/Make_ming.mak	2016-02-25 21:21:47.985840901 +0100
--- src/testdir/Make_ming.mak	2016-04-02 22:23:24.524938694 +0200
***************
*** 65,73 ****
  	echo ALL DONE
  
  fixff:
  	-$(VIMPROG) -u dos.vim $(NO_PLUGIN) "+argdo set ff=dos|upd" +q *.in *.ok
  	-$(VIMPROG) -u dos.vim $(NO_PLUGIN) "+argdo set ff=unix|upd" +q \
! 		dotest.in test60.ok test71.ok test74.ok test_listchars.ok
  
  clean:
  	-$(DEL) *.out
--- 65,75 ----
  	echo ALL DONE
  
  fixff:
+ 	# TODO: find a way to avoid changing the distributed files.
  	-$(VIMPROG) -u dos.vim $(NO_PLUGIN) "+argdo set ff=dos|upd" +q *.in *.ok
  	-$(VIMPROG) -u dos.vim $(NO_PLUGIN) "+argdo set ff=unix|upd" +q \
! 		dotest.in test60.ok test71.ok test74.ok test_listchars.ok \
! 		test_getcwd.ok test_wordcount.ok
  
  clean:
  	-$(DEL) *.out
*** ../vim-7.4.1697/src/version.c	2016-04-02 22:14:47.074253291 +0200
--- src/version.c	2016-04-02 22:22:58.533205488 +0200
***************
*** 750,751 ****
--- 750,753 ----
  {   /* Add new patch number below this line */
+ /**/
+     1698,
  /**/

-- 
Spam seems to be something useful to novices.  Later you realize that
it's a bunch of indigestable junk that only clogs your system.
Applies to both the food and the e-mail!

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///