diff options
| -rw-r--r-- | src/nvim/memline.c | 3 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/memline.c b/src/nvim/memline.c index 53f9a544b4..d90e91be5d 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -3934,8 +3934,9 @@ long ml_find_line_or_offset(buf_T *buf, linenr_T lnum, long *offp) size += lnum - 1; /* Don't count the last line break if 'bin' and 'noeol'. */ - if (buf->b_p_bin && !buf->b_p_eol) + if (buf->b_p_bin && !buf->b_p_eol && buf->b_ml.ml_line_count == lnum) { size -= ffdos + 1; + } } return size; diff --git a/src/nvim/version.c b/src/nvim/version.c index 4b9142323d..1f8aaf6e69 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -80,7 +80,7 @@ static int included_patches[] = { 784, //783, //782, - //781, + 781, //780, //779, //778, |