circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-04 07:08:50 +00:00
Code Issues Projects Releases Wiki Activity

portable: fixup merge with utf8.c

Browse Source
This commit is contained in:
Thomas Adam 2023-01-08 23:27:54 +00:00
parent 5086377f30
commit 153ae758c9
1 changed files with 0 additions and 6 deletions

6
utf8.c
View File

@ -230,13 +230,10 @@ utf8_width(struct utf8_data *ud, int *width)
return (UTF8_ERROR); return (UTF8_ERROR);
} }
log_debug("UTF-8 %.*s is %08X", (int)ud->size, ud->data, (u_int)wc); log_debug("UTF-8 %.*s is %08X", (int)ud->size, ud->data, (u_int)wc);
<<<<<<< HEAD
#ifdef HAVE_UTF8PROC #ifdef HAVE_UTF8PROC
*width = utf8proc_wcwidth(wc); *width = utf8proc_wcwidth(wc);
log_debug("utf8proc_wcwidth(%08X) returned %d", (u_int)wc, *width); log_debug("utf8proc_wcwidth(%08X) returned %d", (u_int)wc, *width);
#else #else
=======
>>>>>>> obsd-master
*width = wcwidth(wc); *width = wcwidth(wc);
log_debug("wcwidth(%08X) returned %d", (u_int)wc, *width); log_debug("wcwidth(%08X) returned %d", (u_int)wc, *width);
if (*width < 0) { if (*width < 0) {
@ -246,10 +243,7 @@ utf8_width(struct utf8_data *ud, int *width)
*/ */
*width = (wc >= 0x80 && wc <= 0x9f) ? 0 : 1; *width = (wc >= 0x80 && wc <= 0x9f) ? 0 : 1;
} }
<<<<<<< HEAD
#endif #endif
=======
>>>>>>> obsd-master
if (*width >= 0 && *width <= 0xff) if (*width >= 0 && *width <= 0xff)
return (UTF8_DONE); return (UTF8_DONE);
return (UTF8_ERROR); return (UTF8_ERROR);