# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1441723503 -7200
# Node ID 3825da0222311c84e07f15c737c937c84b5c0607
# Parent  48f2b6bd763c754bccf80ec167d451c532e8784f
commit https://github.com/vim/vim/commit/7e2ec008f5c5152205d0b8a7d88177b374225d8d
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Sep 8 16:31:06 2015 +0200

    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
--- 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
--- 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,