diff options
| -rw-r--r-- | lib/libc/locale/wcwidth.3 | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/libc/locale/wcwidth.3 b/lib/libc/locale/wcwidth.3 index c87c7ed3adf7..0c7c74fed155 100644 --- a/lib/libc/locale/wcwidth.3 +++ b/lib/libc/locale/wcwidth.3 @@ -65,16 +65,10 @@ int column, w; column = 0; while ((ch = getwchar()) != WEOF) { -<<<<<<< wcwidth.3 - if ((w = wcwidth(ch)) > 0) - column += w; - if (column > 20) { -======= w = wcwidth(ch); if (w > 0 && column + w >= 20) { ->>>>>>> 1.4 putwchar(L'\en'); - column = w; + column = 0; } putwchar(ch); if (ch == L'\en') |