# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1456586104 -3600
# Node ID 0c3210caefa6a957dd061e771eec8e5adf190f99
# Parent  e34e1550788da404f0b426066172a197fde91037
commit https://github.com/vim/vim/commit/d804fdf4c25435284333258856bc265f1ff10b09
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Feb 27 16:04:58 2016 +0100

    patch 7.4.1429
    Problem:    On MS-Windows, when not use renderoptions=type:directx, drawing
                emoji will be broken.
    Solution:   Fix usage of unicodepdy. (Yasuhiro Matsumoto)

diff --git a/src/gui_w32.c b/src/gui_w32.c
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -6658,7 +6658,13 @@ gui_mch_draw_string(
 		/* Use unicodepdy to make characters fit as we expect, even
 		 * when the font uses different widths (e.g., bold character
 		 * 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;
 	    i += utfc_ptr2len_len(text + i, len - i);
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1429,
+/**/
     1428,
 /**/
     1427,