diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-08-29 12:08:43 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-08-29 12:08:43 +0200 |
| commit | 49f9dd7b916fb32bfd0cc9a50f8c4f9bb1bb760b (patch) | |
| tree | 4f9b6c58d378f7f439bf9a329260cdc6c1c6c154 /src/screen.c | |
| parent | 2d46e6075ba3aa369172e610782810b9ac3f1f4b (diff) | |
| download | vim-git-49f9dd7b916fb32bfd0cc9a50f8c4f9bb1bb760b.tar.gz | |
updated for version 7.4.422v7.4.422
Problem: When using conceal with linebreak some text is not displayed
correctly. (Grüner Gimpel)
Solution: Check for conceal mode when using linebreak. (Christian Brabandt)
Diffstat (limited to 'src/screen.c')
| -rw-r--r-- | src/screen.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/screen.c b/src/screen.c index 4c134f0e6..7a9311a45 100644 --- a/src/screen.c +++ b/src/screen.c @@ -4514,6 +4514,11 @@ win_line(wp, lnum, startrow, endrow, nochange) int i; int saved_nextra = n_extra; +#ifdef FEAT_CONCEAL + if (is_concealing && vcol_off > 0) + /* there are characters to conceal */ + tab_len += vcol_off; +#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 */ @@ -4539,6 +4544,12 @@ win_line(wp, lnum, startrow, endrow, nochange) #endif } p_extra = p_extra_free; +#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) + n_extra -= vcol_off; +#endif } #endif #ifdef FEAT_CONCEAL |