thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 9.0.1463: virtual text truncation only works with Unicode 'encoding'

Browse Source 
Problem:    Virtual text truncation only works with Unicode 'encoding'.
Solution:   Convert the ellipsis character to 'encoding' if needed. (Hirohito
            Higashi, closes #12233)
This commit is contained in:
h-east
2023-04-17 21:44:57 +01:00
committed by Bram Moolenaar
parent 42994bf678
commit 4c42c7eef4
5 changed files with 100 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/drawline.c
View File

@@ -739,10 +739,37 @@ text_prop_position(
if (has_mbyte)
{
// change last character to '…'
char_u buf[MB_MAXBYTES + 1];
char_u *cp = buf;
// change the last character to '…', converted to the
// current 'encoding'
STRCPY(buf, "…");
if (!enc_utf8)
{
vimconv_T vc;
vc.vc_type = CONV_NONE;
convert_setup(&vc, (char_u *)"utf-8", p_enc);
if (vc.vc_type != CONV_NONE)
{
cp = string_convert(&vc, buf, NULL);
if (cp == NULL)
{
// when conversion fails use '>'
cp = buf;
STRCPY(buf, ">");
}
convert_setup(&vc, NULL, NULL);
}
}
lp -= (*mb_ptr2cells)(cp) - 1;
lp -= (*mb_head_off)(l, lp);
STRCPY(lp, "…");
STRCPY(lp, cp);
n_used = lp - l + 3 - before - padding;
if (cp != buf)
vim_free(cp);
}
else
// change last character to '>'