Mercurial > vim

comparison src/screen.c @ 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 97cc4ee3e095
children f242cf1f9897
comparison
equal deleted inserted replaced
6692:c8ea399de9be 6693:8faab3792a92
4505 * Found last space before word: check for line break. 4505 * Found last space before word: check for line break.
4506 */ 4506 */
4507 if (wp->w_p_lbr && vim_isbreak(c) && !vim_isbreak(*ptr)) 4507 if (wp->w_p_lbr && vim_isbreak(c) && !vim_isbreak(*ptr))
4508 { 4508 {
4509 # ifdef FEAT_MBYTE 4509 # ifdef FEAT_MBYTE
4510 int off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; 4510 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0;
4511 # endif 4511 # endif
4512 char_u *p = ptr - ( 4512 char_u *p = ptr - (
4513 # ifdef FEAT_MBYTE 4513 # ifdef FEAT_MBYTE
4514 off + 4514 mb_off +
4515 # endif 4515 # endif
4516 1); 4516 1);
4517 4517
4518 /* TODO: is passing p for start of the line OK? */ 4518 /* TODO: is passing p for start of the line OK? */
4519 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, 4519 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol,
4521 if (c == TAB && n_extra + col > W_WIDTH(wp)) 4521 if (c == TAB && n_extra + col > W_WIDTH(wp))
4522 n_extra = (int)wp->w_buffer->b_p_ts 4522 n_extra = (int)wp->w_buffer->b_p_ts
4523 - vcol % (int)wp->w_buffer->b_p_ts - 1; 4523 - vcol % (int)wp->w_buffer->b_p_ts - 1;
4524 4524
4525 # ifdef FEAT_MBYTE 4525 # ifdef FEAT_MBYTE
4526 c_extra = off > 0 ? MB_FILLER_CHAR : ' '; 4526 c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' ';
4527 # else 4527 # else
4528 c_extra = ' '; 4528 c_extra = ' ';
4529 # endif 4529 # endif
4530 if (vim_iswhite(c)) 4530 if (vim_iswhite(c))
4531 { 4531 {