aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.2317

Browse Source 
Problem:    Normal mode tests fail on MS-Windows.
Solution:   Do some tests only on Unix.  Set 'fileformat' to "unix".
This commit is contained in:
Bram Moolenaar 2016-09-03 19:11:59 +02:00
parent f7f3e32fcc
commit 0913a1089a
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/testdir/test_normal.vim
View File

@ -1137,7 +1137,8 @@ func! Test_normal19_z_spell()
endfu endfu
func! Test_normal20_exmode() func! Test_normal20_exmode()
if !(has("win32") || has("win64")) if !has("unix")
" Reading from redirected file doesn't work on MS-Windows
return return
endif endif
call writefile(['1a', 'foo', 'bar', '.', 'w! Xfile2', 'q!'], 'Xscript') call writefile(['1a', 'foo', 'bar', '.', 'w! Xfile2', 'q!'], 'Xscript')
@ -1168,8 +1169,8 @@ endfu
func! Test_normal22_zet() func! Test_normal22_zet()
" Test for ZZ " Test for ZZ
let shell = &shell " let shell = &shell
let &shell = 'sh' " let &shell = 'sh'
call writefile(['1', '2'], 'Xfile') call writefile(['1', '2'], 'Xfile')
let args = ' -u NONE -N -U NONE -i NONE --noplugins -X --not-a-term' 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') call system(v:progpath . args . ' -c "%d" -c ":norm! ZZ" Xfile')
@ -1185,7 +1186,7 @@ func! Test_normal22_zet()
for file in ['Xfile'] for file in ['Xfile']
call delete(file) call delete(file)
endfor endfor
let &shell = shell " let &shell = shell
endfu endfu
func! Test_normal23_K() func! Test_normal23_K()
@ -1206,7 +1207,8 @@ func! Test_normal23_K()
call assert_match('\*version8\.0\*', getline('.')) call assert_match('\*version8\.0\*', getline('.'))
helpclose helpclose
if !(has("win32") || has("win64")) " Only expect "man" to work on Unix
if !has("unix")
let &keywordprg = k let &keywordprg = k
bw! bw!
return return
@ -1642,6 +1644,7 @@ fun! Test_normal33_g_cmd2()
call assert_equal('l', getreg(0)) call assert_equal('l', getreg(0))
" Test for g Ctrl-G " Test for g Ctrl-G
set ff=unix
let a=execute(":norm! g\<c-g>") let a=execute(":norm! g\<c-g>")
call assert_match('Col 15 of 43; Line 2 of 2; Word 2 of 2; Byte 16 of 45', a) call assert_match('Col 15 of 43; Line 2 of 2; Word 2 of 2; Byte 16 of 45', a)
@ -1692,6 +1695,7 @@ endfu
fun! Test_normal36_g_cmd5() fun! Test_normal36_g_cmd5()
new new
call append(0, 'abcdefghijklmnopqrstuvwxyz') call append(0, 'abcdefghijklmnopqrstuvwxyz')
set ff=unix
" Test for gp gP " Test for gp gP
call append(1, range(1,10)) call append(1, range(1,10))
1 1

2
src/version.c
View File

@ -763,6 +763,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2317,
/**/ /**/
2316, 2316,
/**/ /**/