diff --git a/src/memline.c b/src/memline.c index e80936087f..91ef270bc3 100644 --- a/src/memline.c +++ b/src/memline.c @@ -5362,7 +5362,7 @@ ml_find_line_or_offset(buf, lnum, 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; } diff --git a/src/version.c b/src/version.c index c9691dd81f..e5f2887bec 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 781, /**/ 780, /**/