0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

updated for version 7.4.671

Problem:    Warning for shadowing a variable.
Solution:   Rename off to mb_off. (Kazunobu Kuriyama)
This commit is contained in:
Bram Moolenaar 2015-03-21 14:20:16 +01:00
parent dcefba9934
commit 4df702999d
2 changed files with 5 additions and 3 deletions

View File

@ -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

View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
671,
/**/
670,
/**/