Mercurial > vim
diff src/option.c @ 14218:539b070778b0 v8.1.0126
patch 8.1.0126: various problems with 'vartabstop'
commit https://github.com/vim/vim/commit/307ac5c68e9e624ab713136d79f35bb73f780d2d
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jun 28 22:23:00 2018 +0200
patch 8.1.0126: various problems with 'vartabstop'
Problem: Various problems with 'vartabstop'.
Solution: Fix memory leak. Fix crash. Add a few more tests. (Christian
Brabandt, closes #3076)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 28 Jun 2018 22:30:06 +0200 |
| parents | 2bebc49116fd |
| children | fbf0681606fa |
line wrap: on
line diff
--- a/src/option.c +++ b/src/option.c @@ -12870,7 +12870,7 @@ tabstop_start(colnr_T col, int ts, int * tabstop_fromto( colnr_T start_col, colnr_T end_col, - int ts, + int ts_arg, int *vts, int *ntabs, int *nspcs) @@ -12880,12 +12880,14 @@ tabstop_fromto( int padding = 0; int tabcount; int t; + int ts = ts_arg == 0 ? curbuf->b_p_ts : ts_arg; if (vts == NULL || vts[0] == 0) { int tabs = 0; - int initspc = ts - (start_col % ts); - + int initspc = 0; + + initspc = ts - (start_col % ts); if (spaces >= initspc) { spaces -= initspc;