From a86d4b323e2f5ee9fec791ca1dcce7a608de575d Mon Sep 17 00:00:00 2001
From: Johan Klokkhammer Helsing <johanhelsing@gmail.com>
Date: Thu, 8 Oct 2015 20:17:25 +0200
Subject: vim-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)

https://github.com/vim/vim/commit/34d72d4b6c1a2b04a214d8a49b7d22c97bc7a8bc
---
 src/nvim/ops.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/nvim/ops.c')

diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 3fd2c0b773..6964320d6b 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -4972,7 +4972,7 @@ void cursor_pos_info(void)
               &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;
         }
@@ -4993,7 +4993,7 @@ void cursor_pos_info(void)
     }
 
     /* 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 (l_VIsual_active) {
-- 
cgit