Fossil SCM

Avoid showing a short block of unchanged code at the end of a unified diff.

drh 2008-02-08 17:22 trunk
Commit ba433cc4fc2cf67c07fbae0c16c57914445e3f74
1 file changed +1 -1
+1 -1
--- src/diff.c
+++ src/diff.c
@@ -211,11 +211,11 @@
211211
212212
A = p->aFrom;
213213
B = p->aTo;
214214
R = p->aEdit;
215215
mxr = p->nEdit;
216
- if( mxr>2 && R[mxr-1]==0 && R[mxr-2]==0 ){ mxr -= 3; }
216
+ while( mxr>2 && R[mxr-1]==0 && R[mxr-2]==0 ){ mxr -= 3; }
217217
for(r=0; r<mxr; r += 3*nr){
218218
/* Figure out how many triples to show in a single block */
219219
for(nr=1; R[r+nr*3]>0 && R[r+nr*3]<nContext*2; nr++){}
220220
/* printf("r=%d nr=%d\n", r, nr); */
221221
222222
--- src/diff.c
+++ src/diff.c
@@ -211,11 +211,11 @@
211
212 A = p->aFrom;
213 B = p->aTo;
214 R = p->aEdit;
215 mxr = p->nEdit;
216 if( mxr>2 && R[mxr-1]==0 && R[mxr-2]==0 ){ mxr -= 3; }
217 for(r=0; r<mxr; r += 3*nr){
218 /* Figure out how many triples to show in a single block */
219 for(nr=1; R[r+nr*3]>0 && R[r+nr*3]<nContext*2; nr++){}
220 /* printf("r=%d nr=%d\n", r, nr); */
221
222
--- src/diff.c
+++ src/diff.c
@@ -211,11 +211,11 @@
211
212 A = p->aFrom;
213 B = p->aTo;
214 R = p->aEdit;
215 mxr = p->nEdit;
216 while( mxr>2 && R[mxr-1]==0 && R[mxr-2]==0 ){ mxr -= 3; }
217 for(r=0; r<mxr; r += 3*nr){
218 /* Figure out how many triples to show in a single block */
219 for(nr=1; R[r+nr*3]>0 && R[r+nr*3]<nContext*2; nr++){}
220 /* printf("r=%d nr=%d\n", r, nr); */
221
222

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button