To: vim-dev@vim.org
Subject: Patch 6.3a.004
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------

Patch 6.3a.004
Problem:    Test32 fails on Windows XP for the DJGPP version.  Renaming
	    test11.out fails.
Solution:   Don't try renaming, create new files to use for the test.
Files:	    src/testdir/test32.in, src/testdir/test32.ok


*** ../vim-6.3a.003/src/testdir/test32.in	Fri May  7 10:59:36 2004
--- src/testdir/test32.in	Sat May  8 16:41:58 2004
***************
*** 9,16 ****
  * i-add-expands and switches to local
  * add-expands lines (it would end in an empty line if it didn't ignored it self)
  :se cpt=kXtestfile
! * checks k-expansion, and file expansion; rename test11.out to avoid matching
! * it (on PC it may be upper case and matched first).
  :se cpt=w
  * checks make_cyclic in other window
  :se cpt=u nohid
--- 9,16 ----
  * i-add-expands and switches to local
  * add-expands lines (it would end in an empty line if it didn't ignored it self)
  :se cpt=kXtestfile
! * checks k-expansion, and file expansion (use Xtest11 instead of test11,
! * because TEST11.OUT may match first on DOS)
  :se cpt=w
  * checks make_cyclic in other window
  :se cpt=u nohid
***************
*** 32,42 ****
  kOM
  
  :se cpt=kXtestfile
! :!ren test11.out tt
! :!move test11.out tt
! O
! :!ren tt test11.out
! :!move tt test11.out
  :se cpt=w
  OST
  :se cpt=u nohid
--- 32,40 ----
  kOM
  
  :se cpt=kXtestfile
! :w Xtest11.one
! :w Xtest11.two
! OIXA
  :se cpt=w
  OST
  :se cpt=u nohid
*** ../vim-6.3a.003/src/testdir/test32.ok	Fri May  7 10:59:36 2004
--- src/testdir/test32.ok	Sat May  8 16:42:09 2004
***************
*** 5,11 ****
  Makefile	to	run3
  Makefile	to	run3
  Makefile	to	run3
! test11.ok
  STARTTEST
  ENDTEST
  unless
--- 5,11 ----
  Makefile	to	run3
  Makefile	to	run3
  Makefile	to	run3
! Xtest11.two
  STARTTEST
  ENDTEST
  unless
*** ../vim-6.3a.003/src/version.c	Sat May  8 12:32:15 2004
--- src/version.c	Sat May  8 16:39:21 2004
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     4,
  /**/

-- 
A computer program does what you tell it to do, not what you want it to do.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
 \\\  Buy at Amazon and help AIDS victims -- http://ICCF.nl/click1.html ///