aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/cmd/9term/9term.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/cmd/9term/9term.c b/src/cmd/9term/9term.c
index b6658b2f..c18e78c1 100644
--- a/src/cmd/9term/9term.c
+++ b/src/cmd/9term/9term.c
@@ -1136,6 +1136,7 @@ conswrite(char *p, int n)
void
runewrite(Rune *r, int n)
{
+ static int havecr;
int i;
uint initial;
uint q0, q1;
@@ -1146,8 +1147,13 @@ runewrite(Rune *r, int n)
if(n == 0)
return;
- /* get rid of backspaces */
+ /* process trailing \r from previous write */
initial = 0;
+ if(havecr && *r != '\r' && *r != '\n')
+ initial = bswidth(0x15, t.qh, 0);
+ havecr = 0;
+
+ /* get rid of backspaces */
p = q = r;
for(i=0; i<n; i++) {
if(*p == '\b') {
@@ -1167,7 +1173,8 @@ runewrite(Rune *r, int n)
q--;
if(q==r)
initial = bswidth(0x15, t.qh, 0);
- }
+ }else if(i == n-1)
+ havecr = 1;
} else if(*p)
*q++ = *p;
p++;