diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-01-20 19:01:35 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-01-20 19:01:35 +0100 |
| commit | 6a6028cf4b0a2c48e34f657d478adee814d471c5 (patch) | |
| tree | e5638e23d284f79a2b8a9e6df5cd207c3b5dc285 /src/screen.c | |
| parent | 6bf7a5933f50db03455104a018f5de1efd82b7fb (diff) | |
| download | vim-git-6a6028cf4b0a2c48e34f657d478adee814d471c5.tar.gz | |
updated for version 7.4.587v7.4.587
Problem: Conceal does not work properly with 'linebreak'. (cs86661)
Solution: Save and restore boguscols. (Christian Brabandt)
Diffstat (limited to 'src/screen.c')
| -rw-r--r-- | src/screen.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/screen.c b/src/screen.c index b767ec3c1..698f96968 100644 --- a/src/screen.c +++ b/src/screen.c @@ -3003,6 +3003,7 @@ win_line(wp, lnum, startrow, endrow, nochange) wrapping */ int vcol_off = 0; /* offset for concealed characters */ int did_wcol = FALSE; + int old_boguscols = 0; # define VCOL_HLC (vcol - vcol_off) # define FIX_FOR_BOGUSCOLS \ { \ @@ -3010,6 +3011,7 @@ win_line(wp, lnum, startrow, endrow, nochange) vcol -= vcol_off; \ vcol_off = 0; \ col -= boguscols; \ + old_boguscols = boguscols; \ boguscols = 0; \ } #else @@ -4545,10 +4547,16 @@ win_line(wp, lnum, startrow, endrow, nochange) int saved_nextra = n_extra; #ifdef FEAT_CONCEAL - if (is_concealing && vcol_off > 0) + if ((is_concealing || boguscols > 0) && vcol_off > 0) /* there are characters to conceal */ tab_len += vcol_off; + /* boguscols before FIX_FOR_BOGUSCOLS macro from above + */ + if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 + && n_extra > tab_len) + tab_len += n_extra - tab_len; #endif + /* if n_extra > 0, it gives the number of chars, to * use for a tab, else we need to calculate the width * for a tab */ @@ -4577,7 +4585,7 @@ win_line(wp, lnum, startrow, endrow, nochange) #ifdef FEAT_CONCEAL /* n_extra will be increased by FIX_FOX_BOGUSCOLS * macro below, so need to adjust for that here */ - if (is_concealing && vcol_off > 0) + if ((is_concealing || boguscols > 0) && vcol_off > 0) n_extra -= vcol_off; #endif } @@ -4590,6 +4598,12 @@ win_line(wp, lnum, startrow, endrow, nochange) * the tab can be longer than 'tabstop' when there * are concealed characters. */ FIX_FOR_BOGUSCOLS; + /* Make sure, the highlighting for the tab char will be + * correctly set further below (effectively reverts the + * FIX_FOR_BOGSUCOLS macro */ + if (old_boguscols > 0 && n_extra > tab_len && wp->w_p_list + && lcs_tab1) + tab_len += n_extra - tab_len; #endif #ifdef FEAT_MBYTE mb_utf8 = FALSE; /* don't draw as UTF-8 */ |