Skip to content

Commit 50434bd

Browse files
committed
patch 8.2.0262: fileformat test fails on MS-Windows
Problem: Fileformat test fails on MS-Windows. Solution: Set fileformat of buffer.
1 parent f0cee19 commit 50434bd

2 files changed

Lines changed: 5 additions & 0 deletions

File tree

src/testdir/test_fileformat.vim

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,10 +281,13 @@ endfunc
281281
func Test_fileformat_plusplus_read()
282282
new
283283
call setline(1, ['one', 'two', 'three'])
284+
set ff=unix
284285
w ++ff=dos Xfile1
285286
enew!
287+
" A :read doesn't change the fileformat, but does apply to the read lines.
286288
r ++fileformat=unix Xfile1
287289
call assert_equal('unix', &fileformat)
290+
call assert_equal("three\r", getline('$'))
288291
3r ++edit Xfile1
289292
call assert_equal('dos', &fileformat)
290293
close!

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,8 @@ static char *(features[]) =
742742

743743
static int included_patches[] =
744744
{ /* Add new patch number below this line */
745+
/**/
746+
262,
745747
/**/
746748
261,
747749
/**/

0 commit comments

Comments
 (0)