summaryrefslogtreecommitdiffstats
path: root/src/fileio.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-10-22 11:25:19 +0100
committerBram Moolenaar <Bram@vim.org>2022-10-22 11:25:19 +0100
commitfb0cf2357e0c85bbfd9f9178705ad8d77b6b3b4e (patch)
tree25307998711d15645e29dac9ba83815a31f1fb4d /src/fileio.c
parent9c50eeb40117413bf59a9da904c8d0921ed0a6e6 (diff)
patch 9.0.0817v9.0.0817v9.0.0816
Diffstat (limited to 'src/fileio.c')
-rw-r--r--src/fileio.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/fileio.c b/src/fileio.c
index 701521a419..ab867b7c8f 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -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)