diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-09-08 16:31:06 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-09-08 16:31:06 +0200 |
| commit | 7e2ec008f5c5152205d0b8a7d88177b374225d8d (patch) | |
| tree | af484d39ef651a6a72eec4f638bdcc89cdda1718 /src | |
| parent | b58988b832b69b52dfefeca338ea4802d0c4cdca (diff) | |
patch 7.4.855v7.4.855
Problem: GTK: font glitches for combining characters
Solution: Use pango_shape_full() instead of pango_shape(). (luchr, PR #393)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui_gtk_x11.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 5538446056..5c4abce65e 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -5063,8 +5063,8 @@ not_ascii: * done, because drawing the cursor would change the display. */ item->analysis.shape_engine = default_shape_engine; - pango_shape((const char *)s + item->offset, item->length, - &item->analysis, glyphs); + pango_shape_full((const char *)s + item->offset, item->length, + (const char *)s, len, &item->analysis, glyphs); /* * Fixed-width hack: iterate over the array and assign a fixed * width to each glyph, thus overriding the choice made by the diff --git a/src/version.c b/src/version.c index 7f7f0dda2c..7733d4b5e2 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 855, +/**/ 854, /**/ 853, |