Fossil

Check-in [65397b57]
Login

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

Overview
Comment:Oops
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | diff-eolws
Files: files | file ages | folders
SHA1:65397b575eee808a4d40eae083a1bacedba244f2
User & Date: jan.nijtmans 2014-03-03 11:37:25
Context
2014-03-03
11:55
Make option --ignore-space-at-sol work correctly with side-by-side diff as well. check-in: 7763b2e6 user: jan.nijtmans tags: diff-eolws
11:37
Oops check-in: 65397b57 user: jan.nijtmans tags: diff-eolws
11:17
Fix indenting behavior of --ignore-space-at-sol option check-in: 2faa1a27 user: jan.nijtmans tags: diff-eolws
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to src/diff.c.

169
170
171
172
173
174
175
176
177
178
179
180


181
182
183
184
185
186
187
    k = j;
    s = 0;
    indent = 0;
    if( diffFlags & DIFF_IGNORE_EOLWS ){
      while( k>0 && fossil_isspace(z[k-1]) ){ k--; }
    }
    if( diffFlags & DIFF_IGNORE_SOLWS ){
      while( s<k && fossil_isspace(z[s]) ){ s++; }
      if( z[s]=='\t' ){
        indent = ((indent+9)/8)*8;
      }else if( z[s]==' ' ){
        indent++;


      }
    }
    a[i].z = z+s;
    a[i].indent = s;
    for(h=0, x=s; x<k; x++){
      h = h ^ (h<<2) ^ z[x];
    }







|
|
|
|
|
>
>







169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
    k = j;
    s = 0;
    indent = 0;
    if( diffFlags & DIFF_IGNORE_EOLWS ){
      while( k>0 && fossil_isspace(z[k-1]) ){ k--; }
    }
    if( diffFlags & DIFF_IGNORE_SOLWS ){
      while( s<k && fossil_isspace(z[s]) ){
        if( z[s]=='\t' ){
          indent = ((indent+9)/8)*8;
        }else if( z[s]==' ' ){
          indent++;
        }
        s++;
      }
    }
    a[i].z = z+s;
    a[i].indent = s;
    for(h=0, x=s; x<k; x++){
      h = h ^ (h<<2) ^ z[x];
    }