Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2016-04-29 12:01:09 +01:00
commit a9d501e975

8
utf8.c
View File

@ -118,14 +118,6 @@ utf8_width(wchar_t wc)
width = wcwidth(wc); width = wcwidth(wc);
if (width < 0 || width > 0xff) { if (width < 0 || width > 0xff) {
log_debug("Unicode %04x, wcwidth() %d", wc, width); log_debug("Unicode %04x, wcwidth() %d", wc, width);
/*
* Many platforms have no width for relatively common
* characters (wcwidth() returns -1); assume width 1 in this
* case and hope for the best.
*/
if (width < 0)
return (1);
return (-1); return (-1);
} }
return (width); return (width);