diff options
| author | Tom Rhodes <trhodes@FreeBSD.org> | 2004-08-17 04:56:03 +0000 |
|---|---|---|
| committer | Tom Rhodes <trhodes@FreeBSD.org> | 2004-08-17 04:56:03 +0000 |
| commit | 1bdc6fddbf7652637ff03d99eeec01c3913ef2ea (patch) | |
| tree | 680171427efac1506bdfc1bc34c8b2845f9d6fce /lib/libc | |
| parent | daa790840cd5a25a45eecf88c2cab70bbfc04feb (diff) | |
Notes
Diffstat (limited to 'lib/libc')
| -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') |