From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 21 Mar 2015 13:20:16 +0000 (+0100)
Subject: updated for version 7.4.671
X-Git-Tag: v7.4.671
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4df702999d14955255fcdfb820511767dcfec463;p=vim

updated for version 7.4.671
Problem:    Warning for shadowing a variable.
Solution:   Rename off to mb_off. (Kazunobu Kuriyama)
---

diff --git a/src/screen.c b/src/screen.c
index 4e1fb36e0..c215d4df5 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4507,11 +4507,11 @@ win_line(wp, lnum, startrow, endrow, nochange)
 		if (wp->w_p_lbr && vim_isbreak(c) && !vim_isbreak(*ptr))
 		{
 # ifdef FEAT_MBYTE
-		    int off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0;
+		    int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0;
 # endif
 		    char_u *p = ptr - (
 # ifdef FEAT_MBYTE
-				off +
+				mb_off +
 # endif
 				1);
 
@@ -4523,7 +4523,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
 				       - vcol % (int)wp->w_buffer->b_p_ts - 1;
 
 # ifdef FEAT_MBYTE
-		    c_extra = off > 0 ? MB_FILLER_CHAR : ' ';
+		    c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' ';
 # else
 		    c_extra = ' ';
 # endif
diff --git a/src/version.c b/src/version.c
index af86a1729..405b8a7ce 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 */
+/**/
+    671,
 /**/
     670,
 /**/