diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-06-09 22:01:32 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-09 22:01:32 +0800 |
| commit | d189bfaeb2de404455fee699a1c02b8bb8909398 (patch) | |
| tree | 20c0d30c3d3cad1c6e6973e80c8c9583655b1a76 /src/nvim/message.c | |
| parent | 3da3cfc864e89a2dca6917183915683373c85af8 (diff) | |
| parent | b8742afb6f46c165e1f279c8099f112def3acc3b (diff) | |
| download | rneovim-d189bfaeb2de404455fee699a1c02b8bb8909398.tar.gz rneovim-d189bfaeb2de404455fee699a1c02b8bb8909398.tar.bz2 rneovim-d189bfaeb2de404455fee699a1c02b8bb8909398.zip | |
Merge pull request #18908 from zeertzjq/vim-8.2.5066
vim-patch:8.2.{5066,5070}: lcs-leadmultispace
Diffstat (limited to 'src/nvim/message.c')
| -rw-r--r-- | src/nvim/message.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c index 2e57d11fb6..8085b90ddd 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -1783,7 +1783,7 @@ void msg_prt_line(char_u *s, int list) } } // find end of leading whitespace - if (curwin->w_p_lcs_chars.lead) { + if (curwin->w_p_lcs_chars.lead || curwin->w_p_lcs_chars.leadmultispace != NULL) { lead = s; while (ascii_iswhite(lead[0])) { lead++; @@ -1873,13 +1873,21 @@ void msg_prt_line(char_u *s, int list) // the same in plain text. attr = HL_ATTR(HLF_0); } else if (c == ' ') { - if (lead != NULL && s <= lead) { + if (list && lead != NULL && s <= lead && in_multispace + && curwin->w_p_lcs_chars.leadmultispace != NULL) { + c = curwin->w_p_lcs_chars.leadmultispace[multispace_pos++]; + if (curwin->w_p_lcs_chars.leadmultispace[multispace_pos] == NUL) { + multispace_pos = 0; + } + attr = HL_ATTR(HLF_0); + } else if (lead != NULL && s <= lead && curwin->w_p_lcs_chars.lead != NUL) { c = curwin->w_p_lcs_chars.lead; attr = HL_ATTR(HLF_0); } else if (trail != NULL && s > trail) { c = curwin->w_p_lcs_chars.trail; attr = HL_ATTR(HLF_0); - } else if (list && in_multispace && curwin->w_p_lcs_chars.multispace != NULL) { + } else if (list && in_multispace + && curwin->w_p_lcs_chars.multispace != NULL) { c = curwin->w_p_lcs_chars.multispace[multispace_pos++]; if (curwin->w_p_lcs_chars.multispace[multispace_pos] == NUL) { multispace_pos = 0; |