Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Tweak the command-line side-by-side diff output so that it deals sanely with \r and \f characters. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
4092208afca3ffe24a1077800df01ff8 |
| User & Date: | drh 2011-10-22 13:29:28.518 |
References
|
2011-10-22
| ||
| 16:00 | Merged/resolved trunk [4092208afca3ff]. Accommodated changes in text_diff() signature. ... (check-in: acc253f44c user: stephan tags: json-multitag-test, json) | |
Context
|
2011-10-26
| ||
| 03:29 | Add an Admin/Access setting to govern the number of octets of the IP address to include in the login cookie. ... (check-in: 313ba5c64f user: drh tags: trunk) | |
|
2011-10-22
| ||
| 16:00 | Merged/resolved trunk [4092208afca3ff]. Accommodated changes in text_diff() signature. ... (check-in: acc253f44c user: stephan tags: json-multitag-test, json) | |
| 13:29 | Tweak the command-line side-by-side diff output so that it deals sanely with \r and \f characters. ... (check-in: 4092208afc user: drh tags: trunk) | |
| 11:55 | Do not assume the CSS background color is "white". ... (check-in: a9fd1c7951 user: drh tags: trunk) | |
Changes
Changes to src/diff.c.
| ︙ | ︙ | |||
315 316 317 318 319 320 321 |
** written.
*/
static int sbsWriteText(char *z, DLine *pLine, int width, int trunc){
int n = pLine->h & LENGTH_MASK;
int i, j;
const char *zIn = pLine->z;
for(i=j=0; i<n && j<width; i++){
| > | > > | | 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 |
** written.
*/
static int sbsWriteText(char *z, DLine *pLine, int width, int trunc){
int n = pLine->h & LENGTH_MASK;
int i, j;
const char *zIn = pLine->z;
for(i=j=0; i<n && j<width; i++){
char c = zIn[i];
if( c=='\t' ){
z[j++] = ' ';
while( (j&7)!=0 && j<width ) z[j++] = ' ';
}else if( c=='\r' || c=='\f' ){
z[j++] = ' ';
}else{
z[j++] = c;
}
}
if( trunc ){
z[j++] = '\n';
z[j] = 0;
}
return j;
|
| ︙ | ︙ |