diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-01-14 19:35:14 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-01-14 19:35:14 +0100 |
| commit | d574ea2f80b271aff4bac7dc7fa83b292f0ac486 (patch) | |
| tree | c7753824b197d5bb0c9193fcea12eb0a4ce730dc /src/screen.c | |
| parent | 084abaec061f830e2d389c416499d013e47fb0db (diff) | |
| download | vim-git-d574ea2f80b271aff4bac7dc7fa83b292f0ac486.tar.gz | |
updated for version 7.4.579v7.4.579
Problem: Wrong cursor positioning when 'linebreak' is set and lines wrap.
Solution: (Christian Brabandt)
Diffstat (limited to 'src/screen.c')
| -rw-r--r-- | src/screen.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/screen.c b/src/screen.c index bbf57b112..b767ec3c1 100644 --- a/src/screen.c +++ b/src/screen.c @@ -2842,6 +2842,9 @@ win_line(wp, lnum, startrow, endrow, nochange) unsigned off; /* offset in ScreenLines/ScreenAttrs */ int c = 0; /* init for GCC */ long vcol = 0; /* virtual column (for tabs) */ +#ifdef FEAT_LINEBREAK + long vcol_sbr = -1; /* virtual column after showbreak */ +#endif long vcol_prev = -1; /* "vcol" of previous character */ char_u *line; /* current line */ char_u *ptr; /* current position in "line" */ @@ -3759,6 +3762,7 @@ win_line(wp, lnum, startrow, endrow, nochange) n_extra = (int)STRLEN(p_sbr); char_attr = hl_attr(HLF_AT); need_showbreak = FALSE; + vcol_sbr = vcol + MB_CHARLEN(p_sbr); /* Correct end of highlighted area for 'showbreak', * required when 'linebreak' is also set. */ if (tocol == vcol) @@ -4516,9 +4520,17 @@ win_line(wp, lnum, startrow, endrow, nochange) if (c == TAB && (!wp->w_p_list || lcs_tab1)) { int tab_len = 0; + long vcol_adjusted = vcol; /* removed showbreak length */ +#ifdef FEAT_LINEBREAK + /* only adjust the tab_len, when at the first column + * after the showbreak value was drawn */ + if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) + vcol_adjusted = vcol - MB_CHARLEN(p_sbr); +#endif /* tab amount depends on current column */ tab_len = (int)wp->w_buffer->b_p_ts - - vcol % (int)wp->w_buffer->b_p_ts - 1; + - vcol_adjusted % (int)wp->w_buffer->b_p_ts - 1; + #ifdef FEAT_LINEBREAK if (!wp->w_p_lbr || !wp->w_p_list) #endif |