plan9port

commit 304b47c101cd50d019b6021352723ad26e411204
parent 62780722f528fdbc19afb48128f1638e55d1568b
Author: rsc <devnull@localhost>
Date:   Sun, 25 Apr 2004 21:23:27 +0000

collapse \r\r\r\r => \r.

Diffstat:
M
src/cmd/9term/9term.c
 | 
6
+++++-

1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/cmd/9term/9term.c b/src/cmd/9term/9term.c
@@ -229,7 +229,7 @@ threadmain(int argc, char *argv[])
 		maxtab = 4;	/* be like rio */
 
 	snprint(buf, sizeof buf, "%d", maxtab);
-	putenv("tabstop", maxtab);
+	putenv("tabstop", buf);
 
 	initdraw(0, nil, "9term");
 	notify(hangupnote);
@@ -1080,6 +1080,10 @@ runewrite(Rune *r, int n)
 		} else if(*p == '\r') {	/* treat like ^U */
 			/* convert CR without NL into erased line */
 			/* i feel really sleazy about this but it helps */
+			while(i<n-1 && *(p+1) == '\r'){
+				i++;
+				p++;
+			}
 			if(i<n-1 && *(p+1) != '\n'){
 				while(q > r && *(q-1) != '\n')
 					q--;