diff options
| author | trhodes <trhodes@FreeBSD.org> | 2004-08-17 04:56:03 +0000 |
|---|---|---|
| committer | trhodes <trhodes@FreeBSD.org> | 2004-08-17 04:56:03 +0000 |
| commit | 05b6eacd907e6d6bfb6b7e5600632a9348cb63d1 (patch) | |
| tree | 680171427efac1506bdfc1bc34c8b2845f9d6fce /lib | |
| parent | d78838150270c66b44c82589786bdba7408ee7a1 (diff) | |
| download | FreeBSD-src-05b6eacd907e6d6bfb6b7e5600632a9348cb63d1.zip FreeBSD-src-05b6eacd907e6d6bfb6b7e5600632a9348cb63d1.tar.gz | |
/me kicks cvs update
Revert previous commit, tjr already fixed it and I was too stupid to
notice this fact.
Approved by: re (to avoid failing cvs ci)
Diffstat (limited to 'lib')
| -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 c87c7ed..0c7c74f 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') |
