=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/utf8.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- src/usr.bin/tmux/utf8.c 2023/07/03 08:37:14 1.62 +++ src/usr.bin/tmux/utf8.c 2023/09/01 14:29:11 1.63 @@ -1,4 +1,4 @@ -/* $OpenBSD: utf8.c,v 1.62 2023/07/03 08:37:14 nicm Exp $ */ +/* $OpenBSD: utf8.c,v 1.63 2023/09/01 14:29:11 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott @@ -136,8 +136,8 @@ goto fail; if (ud->size <= 3) { index = (((utf8_char)ud->data[2] << 16)| - ((utf8_char)ud->data[1] << 8)| - ((utf8_char)ud->data[0])); + ((utf8_char)ud->data[1] << 8)| + ((utf8_char)ud->data[0])); } else if (utf8_put_item(ud->data, ud->size, &index) != 0) goto fail; *uc = UTF8_SET_SIZE(ud->size)|UTF8_SET_WIDTH(ud->width)|index; @@ -226,9 +226,9 @@ case 0: return (UTF8_ERROR); } - log_debug("UTF-8 %.*s is %08X", (int)ud->size, ud->data, (u_int)wc); + log_debug("UTF-8 %.*s is %05X", (int)ud->size, ud->data, (u_int)wc); *width = wcwidth(wc); - log_debug("wcwidth(%08X) returned %d", (u_int)wc, *width); + log_debug("wcwidth(%05X) returned %d", (u_int)wc, *width); if (*width < 0) { /* * C1 control characters are nonprintable, so they are always