To: vim-dev@vim.org Subject: Patch 6.2f.020 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 8bit ------------ Patch 6.2f.020 Problem: Win32: test50 produces beeps and fails with some versions of diff. Solution: Remove empty lines and convert the output to dos fileformat. Files: src/testdir/test50.in *** ../vim-6.2f.019/src/testdir/test50.in Mon May 26 22:15:05 2003 --- src/testdir/test50.in Thu May 29 14:08:10 2003 *************** *** 3,37 **** STARTTEST :so small.vim - :fun! TestIt(file, bits, expected) ! : let res=fnamemodify(a:file,a:bits) ! : if a:expected == '' ! : echo "'".a:file."'->(".a:bits.")->'".res."'" ! : else ! : if substitute(res,'/','\\', 'g') != substitute( a:expected, '/','\\', 'g') ! : echo "FAILED: '".a:file."'->(".a:bits.")->'".res."'" ! : echo "Expected: '".a:expected."'" ! : else ! : echo "OK" ! : endif ! : endif ! :endfun ! :fun! MakeDir( dirname ) ! : "exe '!mkdir '.substitute(a:dirname,'/','\\','g') ! : call system('mkdir '.substitute(a:dirname,'/','\\','g')) ! :endfun :fun! RMDir( dirname) ! : "exe '!rmdir '.substitute(a:dirname,'/','\\','g') ! : call system('rmdir '.substitute(a:dirname,'/','\\','g')) ! :endfun ! :fun! MakeFile( filename) ! : "exe '!copy nul '.substitute(a:filename,'/','\\','g') ! : call system('copy nul '.substitute(a:filename,'/','\\','g')) ! :endfun ! :fun! TestColonEight() redir! >test.out " This could change for CygWin to //cygdrive/c --- 3,33 ---- STARTTEST :so small.vim :fun! TestIt(file, bits, expected) ! let res=fnamemodify(a:file,a:bits) ! if a:expected == '' ! echo "'".a:file."'->(".a:bits.")->'".res."'" ! else ! if substitute(res,'/','\\', 'g') != substitute( a:expected, '/','\\', 'g') ! echo "FAILED: '".a:file."'->(".a:bits.")->'".res."'" ! echo "Expected: '".a:expected."'" ! else ! echo "OK" ! endif ! endif ! endfun :fun! MakeDir( dirname ) ! "exe '!mkdir '.substitute(a:dirname,'/','\\','g') ! call system('mkdir '.substitute(a:dirname,'/','\\','g')) ! endfun :fun! RMDir( dirname) ! "exe '!rmdir '.substitute(a:dirname,'/','\\','g') ! call system('rmdir '.substitute(a:dirname,'/','\\','g')) ! endfun :fun! MakeFile( filename) ! "exe '!copy nul '.substitute(a:filename,'/','\\','g') ! call system('copy nul '.substitute(a:filename,'/','\\','g')) ! endfun :fun! TestColonEight() redir! >test.out " This could change for CygWin to //cygdrive/c *************** *** 77,85 **** call RMDir( dir1 ) echo redir END - qa! endfun :call TestColonEight() :qa! ENDTEST --- 73,85 ---- call RMDir( dir1 ) echo redir END endfun + :let dir = getcwd() :call TestColonEight() + :exe "cd " . dir + :edit! test.out + :set ff=dos + :w :qa! ENDTEST *** ../vim-6.2f.019/src/version.c Thu May 29 13:48:16 2003 --- src/version.c Thu May 29 14:00:25 2003 *************** *** 632,633 **** --- 632,635 ---- { /* Add new patch number below this line */ + /**/ + 20, /**/ -- If all you have is a hammer, everything looks like a nail. When your hammer is C++, everything begins to look like a thumb. -- Steve Hoflich, comp.lang.c++ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ \\\ Project leader for A-A-P -- http://www.A-A-P.org /// \\\ Help AIDS victims, buy at Amazon -- http://ICCF.nl/click1.html ///