0
0
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00

patch 9.0.0817

This commit is contained in:
Bram Moolenaar
2022-10-22 11:25:19 +01:00
parent 9c50eeb401
commit fb0cf2357e
10 changed files with 37 additions and 14 deletions

View File

@@ -590,6 +590,7 @@ readfile(
if (!read_buffer)
{
curbuf->b_p_eol = TRUE;
curbuf->b_p_eof = FALSE;
curbuf->b_start_eol = TRUE;
}
curbuf->b_p_bomb = FALSE;
@@ -2278,13 +2279,15 @@ failed:
&& !got_int
&& linerest != 0
&& !(!curbuf->b_p_bin
&& fileformat == EOL_DOS
&& *line_start == Ctrl_Z
&& ptr == line_start + 1))
&& fileformat == EOL_DOS))
{
// remember for when writing
if (set_options)
{
curbuf->b_p_eol = FALSE;
if (*line_start == Ctrl_Z && ptr == line_start + 1)
curbuf->b_p_eof = FALSE;
}
*ptr = NUL;
len = (colnr_T)(ptr - line_start + 1);
if (ml_append(lnum, line_start, len, newfile) == FAIL)