diff --git a/src/testdir/test_fileformat.vim b/src/testdir/test_fileformat.vim index efc5a0dd17..9f90debd7f 100644 --- a/src/testdir/test_fileformat.vim +++ b/src/testdir/test_fileformat.vim @@ -281,10 +281,13 @@ endfunc func Test_fileformat_plusplus_read() new call setline(1, ['one', 'two', 'three']) + set ff=unix w ++ff=dos Xfile1 enew! + " A :read doesn't change the fileformat, but does apply to the read lines. r ++fileformat=unix Xfile1 call assert_equal('unix', &fileformat) + call assert_equal("three\r", getline('$')) 3r ++edit Xfile1 call assert_equal('dos', &fileformat) close! diff --git a/src/version.c b/src/version.c index ba8343dd9c..95d4cd8438 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 262, /**/ 261, /**/