Lines Matching refs:new
59 struct diff {struct range old, new; }; member
222 dd[i].new.from = c; in readin()
223 dd[i].new.to = d; in readin()
226 dd[i].new.from = dd[i-1].new.to; in readin()
289 d1->new.from, d1->new.to, in merge()
291 d2->new.from, d2->new.to); in merge()
295 if (!t2 || t1 && d1->new.to < d2->new.from) { in merge()
300 keep(2, &d1->new); in merge()
301 change(3, &d1->new, 0); in merge()
308 if (!t1 || t2 && d2->new.to < d1->new.from) { in merge()
311 keep(1, &d2->new); in merge()
313 change(3, &d2->new, 0); in merge()
322 if (d1+1 < d13+m1 && d1->new.to >= d1[1].new.from) { in merge()
324 d1[1].new.from = d1->new.from; in merge()
330 if (d2+1 < d23+m2 && d2->new.to >= d2[1].new.from) { in merge()
332 d2[1].new.from = d2->new.from; in merge()
338 if (d1->new.from == d2->new.from && d1->new.to == d2->new.to) { in merge()
349 change(3, &d3->new, 0); in merge()
361 if (d1->new.from < d2->new.from) { in merge()
362 d2->old.from -= d2->new.from-d1->new.from; in merge()
363 d2->new.from = d1->new.from; in merge()
364 } else if (d2->new.from < d1->new.from) { in merge()
365 d1->old.from -= d1->new.from-d2->new.from; in merge()
366 d1->new.from = d2->new.from; in merge()
369 if (d1->new.to > d2->new.to) { in merge()
370 d2->old.to += d1->new.to - d2->new.to; in merge()
371 d2->new.to = d1->new.to; in merge()
372 } else if (d2->new.to > d1->new.to) { in merge()
373 d1->old.to += d2->new.to - d1->new.to; in merge()
374 d1->new.to = d2->new.to; in merge()
524 de[j].new.from = de[j-1].new.to + skip(2, diff->new.from, (char *)0); in edit()
525 de[j].new.to = de[j].new.from + skip(2, diff->new.to, (char *)0); in edit()
541 (void) fseek(fp[2], (long)de[n].new.from, 0); in edscript()
542 for (k = de[n].new.to-de[n].new.from; k > 0; k -= j) { in edscript()