Mercurial > vim

changeset 6693:8faab3792a92 v7.4.671

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.671 Problem: Warning for shadowing a variable. Solution: Rename off to mb_off. (Kazunobu Kuriyama)
author Bram Moolenaar <bram@vim.org>
date Sat, 21 Mar 2015 14:20:16 +0100
parents c8ea399de9be
children c0df98c0770c
files src/screen.c src/version.c
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/screen.c
+++ b/src/screen.c
@@ -4507,11 +4507,11 @@ win_line(wp, lnum, startrow, endrow, noc
 		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, noc
 				       - 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
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    671,
+/**/
     670,
 /**/
     669,