d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

/me kicks cvs update

Browse Source 
Revert previous commit, tjr already fixed it and I was too stupid to
notice this fact.

Approved by:	re (to avoid failing cvs ci)
This commit is contained in:
Tom Rhodes 2004-08-17 04:56:03 +00:00
parent daa790840c
commit 1bdc6fddbf
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=133915
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libc/locale/wcwidth.3
View File

@ -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')