Fossil

Check-in [de719b4396]
Login

Check-in [de719b4396]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix yet another issue with tables in side-by-side diffs - an off-by-one error this time.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: de719b4396d8426c3d6372ed16cdb920c33cef5e
User & Date: drh 2012-02-05 02:49:53.470
Context
2012-02-05
11:41
set maintainer email addr to fossil-dev list. ... (check-in: d3e83cdb64 user: stephan tags: trunk)
02:49
Fix yet another issue with tables in side-by-side diffs - an off-by-one error this time. ... (check-in: de719b4396 user: drh tags: trunk)
02:43
Fix another bug in table handling for side-by-side diffs. ... (check-in: db1365bc3b user: drh tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/diff.c.
︙︙
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406

  const char *zIn = pLine->z;
  char *z = &p->zLine[p->n];
  int w = p->width;
  for(i=j=k=0; k<w && i<n; i++, k++){
    char c = zIn[i];
    if( c=='\t' ){
      z[j++] = ' ';
      while( (k&7)!=0 && k<w ){ z[j++] = ' '; k++; }
    }else if( c=='\r' || c=='\f' ){
      z[j++] = ' ';
    }else if( c=='<' && p->escHtml ){
      memcpy(&z[j], "&lt;", 4);
      j += 4;
    }else if( c=='&' && p->escHtml ){
      memcpy(&z[j], "&amp;", 5);








|








392
393
394
395
396
397
398
399
400
401
402
403
404
405
406

  const char *zIn = pLine->z;
  char *z = &p->zLine[p->n];
  int w = p->width;
  for(i=j=k=0; k<w && i<n; i++, k++){
    char c = zIn[i];
    if( c=='\t' ){
      z[j++] = ' ';
      while( (k&7)!=7 && k<w ){ z[j++] = ' '; k++; }
    }else if( c=='\r' || c=='\f' ){
      z[j++] = ' ';
    }else if( c=='<' && p->escHtml ){
      memcpy(&z[j], "&lt;", 4);
      j += 4;
    }else if( c=='&' && p->escHtml ){
      memcpy(&z[j], "&amp;", 5);
︙︙