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 4e1fb36..c215d4d 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4507,11 +4507,11 @@
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 @@
- 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 af86a17..405b8a7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 671,
+/**/
670,
/**/
669,
