Mercurial > vim
diff src/workshop.c @ 14175:2ad722003b36 v8.1.0105
patch 8.1.0105: all tab stops are the same
commit https://github.com/vim/vim/commit/04958cbaf25eea27eceedaa987adfb354ad5f7fd
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jun 23 19:23:02 2018 +0200
patch 8.1.0105: all tab stops are the same
Problem: All tab stops are the same.
Solution: Add the variable tabstop feature. (Christian Brabandt,
closes #2711)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 23 Jun 2018 19:30:07 +0200 |
| parents | 1a450ce6980c |
| children | 3e9b24eac417 |
line wrap: on
line diff
--- a/src/workshop.c +++ b/src/workshop.c @@ -49,7 +49,11 @@ static void load_window(char *, int lnu static void warp_to_pc(int); #ifdef FEAT_BEVAL_GUI void workshop_beval_cb(BalloonEval *, int); +# ifdef FEAT_VARTABS +static int computeIndex(int, char_u *, int, int *); +# else static int computeIndex(int, char_u *, int); +# endif #endif static char *fixAccelText(char *); static void addMenu(char *, char *, char *); @@ -1534,7 +1538,11 @@ workshop_beval_cb( * a column number. Compute the index from col. Also set * line to 0 because thats what dbx expects. */ +#ifdef FEAT_VARTABS + idx = computeIndex(col, text, beval->ts, beval->vts); +#else idx = computeIndex(col, text, beval->ts); +#endif if (idx > 0) { lnum = 0; @@ -1569,7 +1577,11 @@ workshop_beval_cb( computeIndex( int wantedCol, char_u *line, - int ts) + int ts +#ifdef FEAT_VARTABS + int *vts +#else + ) { int col = 0; int idx = 0; @@ -1577,7 +1589,11 @@ computeIndex( while (line[idx]) { if (line[idx] == '\t') +#ifdef FEAT_VARTABS + col += tabstop_padding(col, ts, vts); +#else col += ts - (col % ts); +#endif else col++; idx++;