xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

samterm: revert previous changes.

Browse source
This commit is contained in:
ppatience0 2013-05-08 20:34:50 -04:00
parent 6a2b5055f5
commit c24a442ae2
1 changed files with 5 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

22
sys/src/cmd/samterm/main.c
View file

@ -359,29 +359,19 @@ getcol(Rasp *r, long p)
return col; return col;
} }
int
sptotab(Rasp *r, long p)
{
int i, col, n;
col = getcol(r, p);
if((n = maxtab - col % maxtab) == maxtab)
n = 0;
for(i = 0; p < r->nrunes && raspc(r, p)==' ' && i<n; p++, i++)
;
return i;
}
long long
del(Rasp *r, long o, long p) del(Rasp *r, long o, long p)
{ {
int i; int i, col, n;
if(--p < o) if(--p < o)
return o; return o;
if(!spacesindent || raspc(r, p)!=' ') if(!spacesindent || raspc(r, p)!=' ')
return p; return p;
for(i = 0; p-1>=o && raspc(r, p-1)==' ' && i<maxtab-1; --p, i++) col = getcol(r, p) + 1;
if((n = col % maxtab) == 0)
n = maxtab;
for(i = 0; p-1>=o && raspc(r, p-1)==' ' && i<n-1; --p, i++)
; ;
return p>=o? p : o; return p>=o? p : o;
} }
@ -632,8 +622,6 @@ type(Flayer *l, int res) /* what a bloody mess this is */
switch(c){ switch(c){
case '\b': case '\b':
case 0x7F: /* del */ case 0x7F: /* del */
if(spacesindent)
a += sptotab(&t->rasp, a);
l->p0 = del(&t->rasp, l->origin, a); l->p0 = del(&t->rasp, l->origin, a);
break; break;
case 0x15: /* ctrl-u */ case 0x15: /* ctrl-u */