aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/message.c
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-12-03 21:31:29 -0500
committerGitHub <noreply@github.com>2020-12-03 21:31:29 -0500
commit44be2dfca192db9f47d59c6bb29975c9730c5827 (patch)
treea4c65c0b3e257b75e0a0bfeee1f65b3296b580a4 /src/nvim/message.c
parentf5e0f17968eae6770cc0da136d8c9a4b23bc6da2 (diff)
parent2bcae2024230eb4dd1013779ec1b69dc104c4021 (diff)
downloadrneovim-44be2dfca192db9f47d59c6bb29975c9730c5827.tar.gz
rneovim-44be2dfca192db9f47d59c6bb29975c9730c5827.tar.bz2
rneovim-44be2dfca192db9f47d59c6bb29975c9730c5827.zip
Merge pull request #13434 from janlazo/vim-8.2.2076
vim-patch:8.1.{1013,1774},8.2.{1164,1673,1907,2076,2077,2078,2085,2086}
Diffstat (limited to 'src/nvim/message.c')
-rw-r--r--src/nvim/message.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c
index f76a408481..ad38e6d060 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1711,8 +1711,11 @@ void msg_prt_line(char_u *s, int list)
} else if ((l = utfc_ptr2len(s)) > 1) {
col += utf_ptr2cells(s);
char buf[MB_MAXBYTES + 1];
- if (curwin->w_p_lcs_chars.nbsp != NUL && list
- && (utf_ptr2char(s) == 160 || utf_ptr2char(s) == 0x202f)) {
+ if (l >= MB_MAXBYTES) {
+ xstrlcpy(buf, "¿", sizeof(buf));
+ } else if (curwin->w_p_lcs_chars.nbsp != NUL && list
+ && (utf_ptr2char(s) == 160
+ || utf_ptr2char(s) == 0x202f)) {
utf_char2bytes(curwin->w_p_lcs_chars.nbsp, (char_u *)buf);
buf[utfc_ptr2len((char_u *)buf)] = NUL;
} else {