summaryrefslogtreecommitdiff
path: root/src/option.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-06-28 22:23:00 +0200
committerBram Moolenaar <Bram@vim.org>2018-06-28 22:23:00 +0200
commit307ac5c68e9e624ab713136d79f35bb73f780d2d (patch)
treee0d413bd5431690d4331b94cc6a4ab46e0ed2e43 /src/option.c
parent630afe889a2a02b367ea8eaaa48e66ed81e77ff3 (diff)
downloadvim-git-307ac5c68e9e624ab713136d79f35bb73f780d2d.tar.gz
patch 8.1.0126: various problems with 'vartabstop'v8.1.0126
Problem: Various problems with 'vartabstop'. Solution: Fix memory leak. Fix crash. Add a few more tests. (Christian Brabandt, closes #3076)
Diffstat (limited to 'src/option.c')
-rw-r--r--src/option.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/option.c b/src/option.c
index 4fdfe1000..50d42ebf7 100644
--- a/src/option.c
+++ b/src/option.c
@@ -12870,7 +12870,7 @@ tabstop_start(colnr_T col, int ts, int *vts)
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;