patch 7.4.1488
Problem: Not using key when result from hangul_string_convert() is NULL.
Solution: Fall back to not converted string.
diff --git a/src/ui.c b/src/ui.c
index 3e88758..875be1b 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -1686,24 +1686,24 @@
push_raw_key(char_u *s, int len)
{
char_u *tmpbuf;
+ char_u *inp = s;
+ /* use the conversion result if possible */
tmpbuf = hangul_string_convert(s, &len);
if (tmpbuf != NULL)
- {
- s = tmpbuf;
+ inp = tmpbuf;
- for (; len--; s++)
+ for (; len--; inp++)
+ {
+ inbuf[inbufcount++] = *inp;
+ if (*inp == CSI)
{
- inbuf[inbufcount++] = *s;
- if (*s == CSI)
- {
- /* Turn CSI into K_CSI. */
- inbuf[inbufcount++] = KS_EXTRA;
- inbuf[inbufcount++] = (int)KE_CSI;
- }
+ /* Turn CSI into K_CSI. */
+ inbuf[inbufcount++] = KS_EXTRA;
+ inbuf[inbufcount++] = (int)KE_CSI;
}
- vim_free(tmpbuf);
}
+ vim_free(tmpbuf);
}
#endif
diff --git a/src/version.c b/src/version.c
index 3623a09..17fd888 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1488,
+/**/
1487,
/**/
1486,