To: vim_dev@googlegroups.com Subject: Patch 8.2.2201 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.2201 Problem: Write file test fails on MS-Windows. Solution: Force edit after setting 'fileformat'. Files: src/testdir/test_writefile.vim *** ../vim-8.2.2200/src/testdir/test_writefile.vim 2020-12-23 18:54:53.569837273 +0100 --- src/testdir/test_writefile.vim 2020-12-23 20:53:55.622289728 +0100 *************** *** 683,689 **** " when file is read 'eol' is off set ff=unix nofixeol ! e XNoEolSetEol call assert_equal(0, &eol) " writing with 'eol' set adds the newline --- 683,689 ---- " when file is read 'eol' is off set ff=unix nofixeol ! e! XNoEolSetEol call assert_equal(0, &eol) " writing with 'eol' set adds the newline *************** *** 692,697 **** --- 692,699 ---- call assert_equal(0z6E6F656F6C0A, readfile('XNoEolSetEol', 'B')) call delete('XNoEolSetEol') + set ff& + bwipe! XNoEolSetEol endfunc " vim: shiftwidth=2 sts=2 expandtab *** ../vim-8.2.2200/src/version.c 2020-12-23 20:27:26.737538542 +0100 --- src/version.c 2020-12-23 20:54:52.250012447 +0100 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 2201, /**/ -- Shift happens. -- Doppler /// 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 ///