From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 3 Mar 2016 10:45:15 +0000 (+0100)
Subject: patch 7.4.1475
X-Git-Tag: v7.4.1475
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00ded43a5a85df57abb74f9e3a38a401f6fbd8fd;p=thirdparty%2Fvim.git

patch 7.4.1475
Problem:    When using hangulinput with utf-8 a CSI character is
            misintepreted.
Solution:   Convert CSI to K_CSI. (SungHyun Nam)
---

diff --git a/src/ui.c b/src/ui.c
index be5d8c50fb..3e88758510 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1689,13 +1689,21 @@ push_raw_key(char_u *s, int len)
 
     tmpbuf = hangul_string_convert(s, &len);
     if (tmpbuf != NULL)
+    {
 	s = tmpbuf;
 
-    while (len--)
-	inbuf[inbufcount++] = *s++;
-
-    if (tmpbuf != NULL)
+	for (; len--; s++)
+	{
+	    inbuf[inbufcount++] = *s;
+	    if (*s == CSI)
+	    {
+		/* Turn CSI into K_CSI. */
+		inbuf[inbufcount++] = KS_EXTRA;
+		inbuf[inbufcount++] = (int)KE_CSI;
+	    }
+	}
 	vim_free(tmpbuf);
+    }
 }
 #endif
 
diff --git a/src/version.c b/src/version.c
index de168020ad..3491a4bad4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1475,
 /**/
     1474,
 /**/