===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/key-string.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- src/usr.bin/tmux/key-string.c	2020/05/20 07:11:45	1.60
+++ src/usr.bin/tmux/key-string.c	2020/05/25 18:57:25	1.61
@@ -1,4 +1,4 @@
-/* $OpenBSD: key-string.c,v 1.60 2020/05/20 07:11:45 nicm Exp $ */
+/* $OpenBSD: key-string.c,v 1.61 2020/05/25 18:57:25 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -169,7 +169,7 @@
 	struct utf8_data	 ud;
 	u_int			 i;
 	enum utf8_state		 more;
-	wchar_t			 wc;
+	utf8_char		 uc;
 
 	/* Is this no key or any key? */
 	if (strcasecmp(string, "None") == 0)
@@ -210,9 +210,9 @@
 				more = utf8_append(&ud, (u_char)string[i]);
 			if (more != UTF8_DONE)
 				return (KEYC_UNKNOWN);
-			if (utf8_combine(&ud, &wc) != UTF8_DONE)
+			if (utf8_from_data(&ud, &uc) != UTF8_DONE)
 				return (KEYC_UNKNOWN);
-			return (wc|modifiers);
+			return (uc|modifiers);
 		}
 
 		/* Otherwise look the key up in the table. */
@@ -349,12 +349,11 @@
 
 	/* Is this a UTF-8 key? */
 	if (key > 127 && key < KEYC_BASE) {
-		if (utf8_split(key, &ud) == UTF8_DONE) {
-			off = strlen(out);
-			memcpy(out + off, ud.data, ud.size);
-			out[off + ud.size] = '\0';
-			goto out;
-		}
+		utf8_to_data(key, &ud);
+		off = strlen(out);
+		memcpy(out + off, ud.data, ud.size);
+		out[off + ud.size] = '\0';
+		goto out;
 	}
 
 	/* Invalid keys are errors. */