patch 7.4.781

Problem: line2byte() returns one less when 'bin' and 'noeol' are set. Solution: Only adjust the size for the last line. (Rob Wu)
vim · Jul 12, 2015 · fe6f186 · fe6f186
1 parent 1db43b1
commit fe6f186
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    781,
 /**/
     780,
 /**/