From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 8 Sep 2015 14:31:06 +0000 (+0200)
Subject: patch 7.4.855
X-Git-Tag: v7.4.855
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e2ec008f5c5152205d0b8a7d88177b374225d8d;p=vim

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 553844605..5c4abce65 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 7f7f0dda2..7733d4b5e 100644
--- 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,
 /**/