aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-06 21:53:38 -04:00
Code

patch 7.4.1488

Browse Source 
Problem:    Not using key when result from hangul_string_convert() is NULL.
Solution:   Fall back to not converted string.
This commit is contained in:
Bram Moolenaar 2016-03-04 22:52:34 +01:00
parent 328da0dcb7
commit 179f1b9a7d
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ui.c
View File

@ -1686,16 +1686,17 @@ add_to_input_buf_csi(char_u *str, int len)
push_raw_key(char_u *s, int len) push_raw_key(char_u *s, int len)
{ {
char_u *tmpbuf; char_u *tmpbuf;
char_u *inp = s;
/* use the conversion result if possible */
tmpbuf = hangul_string_convert(s, &len); tmpbuf = hangul_string_convert(s, &len);
if (tmpbuf != NULL) if (tmpbuf != NULL)
{ inp = tmpbuf;
s = tmpbuf;
for (; len--; s++) for (; len--; inp++)
{ {
inbuf[inbufcount++] = *s; inbuf[inbufcount++] = *inp;
if (*s == CSI) if (*inp == CSI)
{ {
/* Turn CSI into K_CSI. */ /* Turn CSI into K_CSI. */
inbuf[inbufcount++] = KS_EXTRA; inbuf[inbufcount++] = KS_EXTRA;
@ -1703,7 +1704,6 @@ push_raw_key(char_u *s, int len)
} }
} }
vim_free(tmpbuf); vim_free(tmpbuf);
}
} }
#endif #endif

2
src/version.c
View File

@ -743,6 +743,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1488,
/**/ /**/
1487, 1487,
/**/ /**/