diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-11-27 20:58:39 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-11-27 20:58:39 -0500 |
| commit | 49b65b0fcd360f483d93d3b1ed70610bcffd95c4 (patch) | |
| tree | 95bf8900c29f7ee3361d1a0454da4e75a0aaeca7 /src/nvim/charset.c | |
| parent | e5a386d2f819ee3a357384279d1a7810ec213087 (diff) | |
| parent | 9ab44e74abb7553ad39c13621e0904680e61287d (diff) | |
| download | rneovim-49b65b0fcd360f483d93d3b1ed70610bcffd95c4.tar.gz rneovim-49b65b0fcd360f483d93d3b1ed70610bcffd95c4.tar.bz2 rneovim-49b65b0fcd360f483d93d3b1ed70610bcffd95c4.zip | |
Merge pull request #1516 from fmoralesc/new-patches
vim-patch:7.4.425,435,467,472,473,478
Diffstat (limited to 'src/nvim/charset.c')
| -rw-r--r-- | src/nvim/charset.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/nvim/charset.c b/src/nvim/charset.c index f3bb3d8c73..bbe80a519c 100644 --- a/src/nvim/charset.c +++ b/src/nvim/charset.c @@ -1058,6 +1058,11 @@ int win_lbr_chartabsize(win_T *wp, char_u *line, char_u *s, colnr_T col, int *he if (col >= (colnr_T)wp->w_width) { col -= wp->w_width; numberextra = wp->w_width - (numberextra - win_col_off2(wp)); + if (*p_sbr != NUL) { + colnr_T sbrlen = (colnr_T)MB_CHARLEN(p_sbr); + if (col >= sbrlen) + col -= sbrlen; + } if (numberextra > 0) { col = col % numberextra; } |