# HG changeset patch # User Bram Moolenaar # Date 1296576745 -3600 # Node ID 42cafbf4b6e81160c26fc99148eb333aab5d2f96 # Parent 0887e8a13e5f33db2f832a52654a0d1fa82f322f updated for version 7.3.110 Problem: The "nbsp" item in 'listchars' isn't used for ":list". Solution: Make it work. (Christian Brabandt) diff --git a/src/message.c b/src/message.c --- a/src/message.c +++ b/src/message.c @@ -1637,8 +1637,16 @@ msg_prt_line(s, list) else if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) { col += (*mb_ptr2cells)(s); - mch_memmove(buf, s, (size_t)l); - buf[l] = NUL; + if (lcs_nbsp != NUL && list && mb_ptr2char(s) == 160) + { + mb_char2bytes(lcs_nbsp, buf); + buf[(*mb_ptr2len)(buf)] = NUL; + } + else + { + mch_memmove(buf, s, (size_t)l); + buf[l] = NUL; + } msg_puts(buf); s += l; continue; @@ -1664,6 +1672,11 @@ msg_prt_line(s, list) attr = hl_attr(HLF_8); } } + else if (c == 160 && list && lcs_nbsp != NUL) + { + c = lcs_nbsp; + attr = hl_attr(HLF_8); + } else if (c == NUL && list && lcs_eol != NUL) { p_extra = (char_u *)""; diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 110, +/**/ 109, /**/ 108,