diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-03-21 14:20:16 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-03-21 14:20:16 +0100 |
| commit | 4df702999d14955255fcdfb820511767dcfec463 (patch) | |
| tree | d7ab5d0313c66f1fb3dc4e0d71b48f2ba6840092 | |
| parent | dcefba993456263100785f18d21d780cf531f2dc (diff) | |
| download | vim-4df702999d14955255fcdfb820511767dcfec463.zip | |
updated for version 7.4.671
Problem: Warning for shadowing a variable.
Solution: Rename off to mb_off. (Kazunobu Kuriyama)
| -rw-r--r-- | src/screen.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 3 deletions
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 @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 671, +/**/ 670, /**/ 669, |