To: vim_dev@googlegroups.com Subject: Patch 7.4.2317 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.2317 (after 7.4.2315) Problem: Normal mode tests fail on MS-Windows. Solution: Do some tests only on Unix. Set 'fileformat' to "unix". Files: src/testdir/test_normal.vim *** ../vim-7.4.2316/src/testdir/test_normal.vim 2016-09-03 17:33:39.752215409 +0200 --- src/testdir/test_normal.vim 2016-09-03 19:09:27.064409116 +0200 *************** *** 1137,1143 **** endfu func! Test_normal20_exmode() ! if !(has("win32") || has("win64")) return endif call writefile(['1a', 'foo', 'bar', '.', 'w! Xfile2', 'q!'], 'Xscript') --- 1137,1144 ---- endfu func! Test_normal20_exmode() ! if !has("unix") ! " Reading from redirected file doesn't work on MS-Windows return endif call writefile(['1a', 'foo', 'bar', '.', 'w! Xfile2', 'q!'], 'Xscript') *************** *** 1168,1175 **** func! Test_normal22_zet() " Test for ZZ ! let shell = &shell ! let &shell = 'sh' call writefile(['1', '2'], 'Xfile') let args = ' -u NONE -N -U NONE -i NONE --noplugins -X --not-a-term' call system(v:progpath . args . ' -c "%d" -c ":norm! ZZ" Xfile') --- 1169,1176 ---- func! Test_normal22_zet() " Test for ZZ ! " let shell = &shell ! " let &shell = 'sh' call writefile(['1', '2'], 'Xfile') let args = ' -u NONE -N -U NONE -i NONE --noplugins -X --not-a-term' call system(v:progpath . args . ' -c "%d" -c ":norm! ZZ" Xfile') *************** *** 1185,1191 **** for file in ['Xfile'] call delete(file) endfor ! let &shell = shell endfu func! Test_normal23_K() --- 1186,1192 ---- for file in ['Xfile'] call delete(file) endfor ! " let &shell = shell endfu func! Test_normal23_K() *************** *** 1206,1212 **** call assert_match('\*version8\.0\*', getline('.')) helpclose ! if !(has("win32") || has("win64")) let &keywordprg = k bw! return --- 1207,1214 ---- call assert_match('\*version8\.0\*', getline('.')) helpclose ! " Only expect "man" to work on Unix ! if !has("unix") let &keywordprg = k bw! return *************** *** 1642,1647 **** --- 1644,1650 ---- call assert_equal('l', getreg(0)) " Test for g Ctrl-G + set ff=unix let a=execute(":norm! g\") call assert_match('Col 15 of 43; Line 2 of 2; Word 2 of 2; Byte 16 of 45', a) *************** *** 1692,1697 **** --- 1695,1701 ---- fun! Test_normal36_g_cmd5() new call append(0, 'abcdefghijklmnopqrstuvwxyz') + set ff=unix " Test for gp gP call append(1, range(1,10)) 1 *** ../vim-7.4.2316/src/version.c 2016-09-03 18:47:19.209586251 +0200 --- src/version.c 2016-09-03 19:10:50.681584519 +0200 *************** *** 765,766 **** --- 765,768 ---- { /* Add new patch number below this line */ + /**/ + 2317, /**/ -- hundred-and-one symptoms of being an internet addict: 154. You fondle your mouse. /// 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 ///