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

patch 7.4.1429

Browse Source 
Problem:    On MS-Windows, when not use renderoptions=type:directx, drawing
            emoji will be broken.
Solution:   Fix usage of unicodepdy. (Yasuhiro Matsumoto)
This commit is contained in:
Bram Moolenaar
2016-02-27 16:04:58 +01:00
parent edb4f2b360
commit d804fdf4c2
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui_w32.c
View File

@@ -6658,7 +6658,13 @@ gui_mch_draw_string(
/* Use unicodepdy to make characters fit as we expect, even /* Use unicodepdy to make characters fit as we expect, even
* when the font uses different widths (e.g., bold character * when the font uses different widths (e.g., bold character
* is wider). */ * is wider). */
unicodepdy[clen] = cw * gui.char_width; if (c >= 0x10000)
{
unicodepdy[wlen - 2] = cw * gui.char_width;
unicodepdy[wlen - 1] = 0;
}
else
unicodepdy[wlen - 1] = cw * gui.char_width;
} }
cells += cw; cells += cw;
i += utfc_ptr2len_len(text + i, len - i); i += utfc_ptr2len_len(text + i, len - i);

2
src/version.c
View File

@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1429,
/**/ /**/
1428, 1428,
/**/ /**/