IntenseFinance/neovim
3
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-02-25 18:55:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.2199: first write after setting 'eol' does not have NL added

Browse Source 
Problem:    First write after setting 'eol' does not have NL added. (Tomáš
            Janoušek)
Solution:   Only use b_no_eol_lnum when doing a binary write. (closes vim/vim#7535)
b3c8b1d254
This commit is contained in:
zeertzjq 2022-02-09 19:24:41 +08:00
parent 92e4394562
commit 47a98ab394
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/fileio.c
View File

@ -3318,7 +3318,7 @@ restore_backup:
if (end == 0 if (end == 0
|| (lnum == end || (lnum == end
&& (write_bin || !buf->b_p_fixeol) && (write_bin || !buf->b_p_fixeol)
&& (lnum == buf->b_no_eol_lnum && ((write_bin && lnum == buf->b_no_eol_lnum)
|| (lnum == buf->b_ml.ml_line_count && !buf->b_p_eol)))) { || (lnum == buf->b_ml.ml_line_count && !buf->b_p_eol)))) {
lnum++; // written the line, count it lnum++; // written the line, count it
no_eol = true; no_eol = true;

18
src/nvim/testdir/test_writefile.vim
View File

@ -497,6 +497,24 @@ func Test_readwrite_file_with_bom()
%bw! %bw!
endfunc endfunc
func Test_read_write_bin()
" write file missing EOL
call writefile(['noeol'], "XNoEolSetEol", 'bS')
call assert_equal(0z6E6F656F6C, readfile('XNoEolSetEol', 'B'))
" 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
setlocal eol
w
call assert_equal(0z6E6F656F6C0A, readfile('XNoEolSetEol', 'B'))
call delete('XNoEolSetEol')
endfunc
" Check that buffer is written before triggering QuitPre " Check that buffer is written before triggering QuitPre
func Test_wq_quitpre_autocommand() func Test_wq_quitpre_autocommand()
edit Xsomefile edit Xsomefile