fbt/sbase
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ed: place newly joined lines correctly

Browse Source
This commit is contained in:
Thomas Mannay 2016-10-09 23:12:46 +00:00 committed by Laslo Hunhold
parent 696520714b
commit 2304df908c
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ed.c
View File

@ -299,13 +299,17 @@ undo(void)
} }
static void static void
inject(char *s) inject(char *s, int j)
{ {
int off, k, begin, end; int off, k, begin, end;
begin = getindex(curln); if (j) {
end = getindex(nextln(curln)); begin = getindex(curln-1);
end = getindex(nextln(curln-1));
} else {
begin = getindex(curln);
end = getindex(nextln(curln));
}
while (*s) { while (*s) {
k = makeline(s, &off); k = makeline(s, &off);
s += off; s += off;
@ -636,7 +640,7 @@ doread(char *fname)
s[n-1] = '\n'; s[n-1] = '\n';
s[n] = '\0'; s[n] = '\0';
} }
inject(s); inject(s, 0);
} }
if (optdiag) if (optdiag)
printf("%zu\n", cnt); printf("%zu\n", cnt);
@ -753,7 +757,7 @@ append(int num)
while (getline(&s, &len, stdin) > 0) { while (getline(&s, &len, stdin) > 0) {
if (*s == '.' && s[1] == '\n') if (*s == '.' && s[1] == '\n')
break; break;
inject(s); inject(s, 0);
} }
free(s); free(s);
} }
@ -818,7 +822,7 @@ join(void)
s = addchar('\n', s, &cap, &len); s = addchar('\n', s, &cap, &len);
s = addchar('\0', s, &cap, &len); s = addchar('\0', s, &cap, &len);
delete(line1, line2); delete(line1, line2);
inject(s); inject(s, 1);
free(s); free(s);
} }
@ -845,7 +849,7 @@ copy(int where)
curln = where; curln = where;
for (i = line1; i <= line2; ++i) for (i = line1; i <= line2; ++i)
inject(gettxt(i)); inject(gettxt(i), 0);
} }
static void static void
@ -1020,7 +1024,7 @@ subline(int num, int nth)
addpost(&s, &cap, &siz); addpost(&s, &cap, &siz);
delete(num, num); delete(num, num);
curln = prevln(num); curln = prevln(num);
inject(s); inject(s, 0);
} }
static void static void