summaryrefslogtreecommitdiff
path: root/src/screen.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-06-25 21:24:51 +0200
committerBram Moolenaar <Bram@vim.org>2018-06-25 21:24:51 +0200
commita87b72cc316e065d66dcbcf7ec1cde330adef3a3 (patch)
treeba5b5e3e7fd4d6ce94875ef246104b387a8ee633 /src/screen.c
parentb7a5ab112ab2267c54acdb6a326642afcd797bc4 (diff)
downloadvim-git-a87b72cc316e065d66dcbcf7ec1cde330adef3a3.tar.gz
patch 8.1.0116: display problem with 'vartabstop' and 'linebreak'v8.1.0116
Problem: Display problem with 'vartabstop' and 'linebreak'. (Chauca Fuentes) Solution: Call tabstop_padding(). (Christian Brabandt, closes #3076)
Diffstat (limited to 'src/screen.c')
-rw-r--r--src/screen.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/screen.c b/src/screen.c
index eac50c52c..c03443fec 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4753,8 +4753,13 @@ win_line(
n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol,
NULL) - 1;
if (c == TAB && n_extra + col > wp->w_width)
+#ifdef FEAT_VARTABS
+ n_extra = tabstop_padding(vcol, wp->w_buffer->b_p_ts,
+ wp->w_buffer->b_p_vts_array) - 1;
+#else
n_extra = (int)wp->w_buffer->b_p_ts
- vcol % (int)wp->w_buffer->b_p_ts - 1;
+ #endif
# ifdef FEAT_MBYTE
c_extra = mb_off > 0 ? MB_FILLER_CHAR : ' ';