From d6247a575c12f413e21ff5e7e94a86214246579d Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Tue, 7 Jun 2022 20:01:46 +0800 Subject: vim-patch:8.2.5066: lcs-leadmultispace https://github.com/vim/vim/commit/aca12fd89b082dd9cc12ae085a84f1805747bbdf --- src/nvim/message.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'src/nvim/message.c') diff --git a/src/nvim/message.c b/src/nvim/message.c index 2e57d11fb6..e3f87ed3e6 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,28 @@ 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) { 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 && 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 (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; -- cgit From b8742afb6f46c165e1f279c8099f112def3acc3b Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Thu, 9 Jun 2022 21:05:57 +0800 Subject: vim-patch:8.2.5070: unnecessary code Problem: Unnecessary code. Solution: Remove code that isn't needed. (closes vim/vim#10534) https://github.com/vim/vim/commit/b5f0801b1f043b5cf99380f58eca51b75b3236c7 --- src/nvim/message.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'src/nvim/message.c') diff --git a/src/nvim/message.c b/src/nvim/message.c index e3f87ed3e6..8085b90ddd 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -1880,19 +1880,12 @@ void msg_prt_line(char_u *s, int list) multispace_pos = 0; } attr = HL_ATTR(HLF_0); - } else if (lead != NULL && s <= lead && curwin->w_p_lcs_chars.lead) { + } 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 && 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 (list && in_multispace && curwin->w_p_lcs_chars.multispace != NULL) { c = curwin->w_p_lcs_chars.multispace[multispace_pos++]; -- cgit