From 34d72d4b6c1a2b04a214d8a49b7d22c97bc7a8bc Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 17 Jul 2015 14:18:08 +0200 Subject: patch 7.4.785 Problem: On some systems automatically adding the missing EOL causes problems. Setting 'binary' has too many side effects. Solution: Add the 'fixeol' option, default on. (Pavel Samarkin) --- src/ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/ops.c') diff --git a/src/ops.c b/src/ops.c index 7ad8222e1..3441f05dd 100644 --- a/src/ops.c +++ b/src/ops.c @@ -7052,7 +7052,7 @@ cursor_pos_info() &char_count_cursor, len, eol_size); if (lnum == curbuf->b_ml.ml_line_count && !curbuf->b_p_eol - && curbuf->b_p_bin + && (curbuf->b_p_bin || !curbuf->b_p_fixeol) && (long)STRLEN(s) < len) byte_count_cursor -= eol_size; } @@ -7076,7 +7076,7 @@ cursor_pos_info() } /* Correction for when last line doesn't have an EOL. */ - if (!curbuf->b_p_eol && curbuf->b_p_bin) + if (!curbuf->b_p_eol && (curbuf->b_p_bin || !curbuf->b_p_fixeol)) byte_count -= eol_size; if (VIsual_active) -- cgit v1.2.1