patch 7.4.855

Problem:    GTK: font glitches for combining characters
Solution:   Use pango_shape_full() instead of pango_shape(). (luchr, PR #393)

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 553844605622f6efc5d2228d431096dbda2bcd78..5c4abce65e67b5666622e9e33bbb6e28499241b6 100644 (file)
--- 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 7f7f0dda2cc05c47fa1037ed068bc3501f1693ac..7733d4b5e2618b0decbce5b8532e4810fe97cbb5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    855,
 /**/
     854,
 /**/