Fossil SCM
Fix yet another issue with tables in side-by-side diffs - an off-by-one error this time.
Commit
de719b4396d8426c3d6372ed16cdb920c33cef5e
Parent
db1365bc3bdc93d…
1 file changed
+1
-1
+1
-1
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -394,11 +394,11 @@ | ||
| 394 | 394 | int w = p->width; |
| 395 | 395 | for(i=j=k=0; k<w && i<n; i++, k++){ |
| 396 | 396 | char c = zIn[i]; |
| 397 | 397 | if( c=='\t' ){ |
| 398 | 398 | z[j++] = ' '; |
| 399 | - while( (k&7)!=0 && k<w ){ z[j++] = ' '; k++; } | |
| 399 | + while( (k&7)!=7 && k<w ){ z[j++] = ' '; k++; } | |
| 400 | 400 | }else if( c=='\r' || c=='\f' ){ |
| 401 | 401 | z[j++] = ' '; |
| 402 | 402 | }else if( c=='<' && p->escHtml ){ |
| 403 | 403 | memcpy(&z[j], "<", 4); |
| 404 | 404 | j += 4; |
| 405 | 405 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -394,11 +394,11 @@ | |
| 394 | int w = p->width; |
| 395 | for(i=j=k=0; k<w && i<n; i++, k++){ |
| 396 | char c = zIn[i]; |
| 397 | if( c=='\t' ){ |
| 398 | z[j++] = ' '; |
| 399 | while( (k&7)!=0 && k<w ){ z[j++] = ' '; k++; } |
| 400 | }else if( c=='\r' || c=='\f' ){ |
| 401 | z[j++] = ' '; |
| 402 | }else if( c=='<' && p->escHtml ){ |
| 403 | memcpy(&z[j], "<", 4); |
| 404 | j += 4; |
| 405 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -394,11 +394,11 @@ | |
| 394 | int w = p->width; |
| 395 | for(i=j=k=0; k<w && i<n; i++, k++){ |
| 396 | char c = zIn[i]; |
| 397 | if( c=='\t' ){ |
| 398 | z[j++] = ' '; |
| 399 | while( (k&7)!=7 && k<w ){ z[j++] = ' '; k++; } |
| 400 | }else if( c=='\r' || c=='\f' ){ |
| 401 | z[j++] = ' '; |
| 402 | }else if( c=='<' && p->escHtml ){ |
| 403 | memcpy(&z[j], "<", 4); |
| 404 | j += 4; |
| 405 |