Fossil SCM

Oops

jan.nijtmans 2014-03-03 11:37 diff-eolws
Commit 65397b575eee808a4d40eae083a1bacedba244f2
1 file changed +7 -5
+7 -5
--- src/diff.c
+++ src/diff.c
@@ -171,15 +171,17 @@
171171
indent = 0;
172172
if( diffFlags & DIFF_IGNORE_EOLWS ){
173173
while( k>0 && fossil_isspace(z[k-1]) ){ k--; }
174174
}
175175
if( diffFlags & DIFF_IGNORE_SOLWS ){
176
- while( s<k && fossil_isspace(z[s]) ){ s++; }
177
- if( z[s]=='\t' ){
178
- indent = ((indent+9)/8)*8;
179
- }else if( z[s]==' ' ){
180
- indent++;
176
+ while( s<k && fossil_isspace(z[s]) ){
177
+ if( z[s]=='\t' ){
178
+ indent = ((indent+9)/8)*8;
179
+ }else if( z[s]==' ' ){
180
+ indent++;
181
+ }
182
+ s++;
181183
}
182184
}
183185
a[i].z = z+s;
184186
a[i].indent = s;
185187
for(h=0, x=s; x<k; x++){
186188
--- src/diff.c
+++ src/diff.c
@@ -171,15 +171,17 @@
171 indent = 0;
172 if( diffFlags & DIFF_IGNORE_EOLWS ){
173 while( k>0 && fossil_isspace(z[k-1]) ){ k--; }
174 }
175 if( diffFlags & DIFF_IGNORE_SOLWS ){
176 while( s<k && fossil_isspace(z[s]) ){ s++; }
177 if( z[s]=='\t' ){
178 indent = ((indent+9)/8)*8;
179 }else if( z[s]==' ' ){
180 indent++;
 
 
181 }
182 }
183 a[i].z = z+s;
184 a[i].indent = s;
185 for(h=0, x=s; x<k; x++){
186
--- src/diff.c
+++ src/diff.c
@@ -171,15 +171,17 @@
171 indent = 0;
172 if( diffFlags & DIFF_IGNORE_EOLWS ){
173 while( k>0 && fossil_isspace(z[k-1]) ){ k--; }
174 }
175 if( diffFlags & DIFF_IGNORE_SOLWS ){
176 while( s<k && fossil_isspace(z[s]) ){
177 if( z[s]=='\t' ){
178 indent = ((indent+9)/8)*8;
179 }else if( z[s]==' ' ){
180 indent++;
181 }
182 s++;
183 }
184 }
185 a[i].z = z+s;
186 a[i].indent = s;
187 for(h=0, x=s; x<k; x++){
188

Keyboard Shortcuts

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