summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/term.c10
-rw-r--r--src/version.c2
2 files changed, 11 insertions, 1 deletions
diff --git a/src/term.c b/src/term.c
index f79514488..496e2ffac 100644
--- a/src/term.c
+++ b/src/term.c
@@ -4920,7 +4920,15 @@ check_termcode(max_offset, buf, buflen)
key_name[0] = KEY2TERMCAP0(key);
key_name[1] = KEY2TERMCAP1(key);
if (key_name[0] == KS_KEY)
- string[new_slen++] = key_name[1]; /* from ":set <M-b>=xx" */
+ {
+ /* from ":set <M-b>=xx" */
+#ifdef FEAT_MBYTE
+ if (has_mbyte)
+ new_slen += (*mb_char2bytes)(key_name[1], string + new_slen);
+ else
+#endif
+ string[new_slen++] = key_name[1];
+ }
else
{
string[new_slen++] = K_SPECIAL;
diff --git a/src/version.c b/src/version.c
index 7171a655f..585940887 100644
--- a/src/version.c
+++ b/src/version.c
@@ -677,6 +677,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 85,
+/**/
84,
/**/
83,