From 179f1b9a7ddf3624daf6380c3dad740e0a1ba361 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 4 Mar 2016 22:52:34 +0100 Subject: patch 7.4.1488 Problem: Not using key when result from hangul_string_convert() is NULL. Solution: Fall back to not converted string. --- src/ui.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'src/ui.c') diff --git a/src/ui.c b/src/ui.c index 3e8875851..875be1b30 100644 --- a/src/ui.c +++ b/src/ui.c @@ -1686,24 +1686,24 @@ add_to_input_buf_csi(char_u *str, int len) 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 -- cgit v1.2.1