diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-02-03 15:58:13 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-02-03 15:58:13 +0100 |
| commit | 91478ae49a1b2dc1de63821db731a343e855dcc0 (patch) | |
| tree | 1712c04276688e7664769ca084a5f9a4f76d7ac4 /src/drawline.c | |
| parent | 148be9bc1cca16ce47ad21563f5835682001f9a2 (diff) | |
patch 8.2.2454: leading space can not be made visiblev8.2.2454
Problem: Leading space can not be made visible.
Solution: Add "lead:" to 'listchars'. (closes #7772)
Diffstat (limited to 'src/drawline.c')
| -rw-r--r-- | src/drawline.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/src/drawline.c b/src/drawline.c index d51b4c2d66..4dde0d0740 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -339,6 +339,7 @@ win_line( int change_end = -1; // last col of changed area #endif colnr_T trailcol = MAXCOL; // start of trailing spaces + colnr_T leadcol = 0; // start of leading spaces #ifdef FEAT_LINEBREAK int need_showbreak = FALSE; // overlong line, skipping first x // chars @@ -734,8 +735,9 @@ win_line( if (wp->w_p_list) { - if (lcs_space || lcs_trail || lcs_nbsp) + if (lcs_space || lcs_trail || lcs_lead || lcs_nbsp) extra_check = TRUE; + // find start of trailing whitespace if (lcs_trail) { @@ -744,6 +746,19 @@ win_line( --trailcol; trailcol += (colnr_T) (ptr - line); } + // find end of leading whitespace + if (lcs_lead) + { + leadcol = 0; + while (VIM_ISWHITE(ptr[leadcol])) + ++leadcol; + if (ptr[leadcol] == NUL) + // in a line full of spaces all of them are treated as trailing + leadcol = (colnr_T)0; + else + // keep track of the first column not filled with spaces + leadcol += (colnr_T) (ptr - line) + 1; + } } wcr_attr = get_wcr_attr(wp); @@ -1992,6 +2007,7 @@ win_line( || (c == ' ' && mb_l == 1 && lcs_space + && ptr - line >= leadcol && ptr - line <= trailcol))) { c = (c == ' ') ? lcs_space : lcs_nbsp; @@ -2012,9 +2028,10 @@ win_line( mb_utf8 = FALSE; } - if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') + if ((trailcol != MAXCOL && ptr > line + trailcol && c == ' ') + || (leadcol != 0 && ptr < line + leadcol && c == ' ')) { - c = lcs_trail; + c = (ptr > line + trailcol) ? lcs_trail : lcs_lead; if (!attr_pri) { n_attr = 1; |