Fossil SCM
Fix on Check-in pages to preserve the current "diffType" setting (side-by-side or unified) when toggling the show/ignore whitespace option.
Commit
e6ab947e1e8f51a969aa5ff7bb8a7bbde6baf9927c1accda6622fef38311e65b
Parent
551676bc2882f78…
1 file changed
+2
-2
+2
-2
| --- src/info.c | ||
| +++ src/info.c | ||
| @@ -891,14 +891,14 @@ | ||
| 891 | 891 | @ %z(chref("button","%R/%s/%T?diff=2%s",zPage,zName,zW))\ |
| 892 | 892 | @ Side-by-Side Diffs</a> |
| 893 | 893 | } |
| 894 | 894 | if( diffType!=0 ){ |
| 895 | 895 | if( *zW ){ |
| 896 | - @ %z(chref("button","%R/%s/%T",zPage,zName)) | |
| 896 | + @ %z(chref("button","%R/%s/%T?diff=%d",zPage,zName,diffType)) | |
| 897 | 897 | @ Show Whitespace Changes</a> |
| 898 | 898 | }else{ |
| 899 | - @ %z(chref("button","%R/%s/%T?w",zPage,zName)) | |
| 899 | + @ %z(chref("button","%R/%s/%T?diff=%d&w",zPage,zName,diffType)) | |
| 900 | 900 | @ Ignore Whitespace</a> |
| 901 | 901 | } |
| 902 | 902 | } |
| 903 | 903 | if( zParent ){ |
| 904 | 904 | @ %z(chref("button","%R/vpatch?from=%!S&to=%!S",zParent,zUuid)) |
| 905 | 905 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -891,14 +891,14 @@ | |
| 891 | @ %z(chref("button","%R/%s/%T?diff=2%s",zPage,zName,zW))\ |
| 892 | @ Side-by-Side Diffs</a> |
| 893 | } |
| 894 | if( diffType!=0 ){ |
| 895 | if( *zW ){ |
| 896 | @ %z(chref("button","%R/%s/%T",zPage,zName)) |
| 897 | @ Show Whitespace Changes</a> |
| 898 | }else{ |
| 899 | @ %z(chref("button","%R/%s/%T?w",zPage,zName)) |
| 900 | @ Ignore Whitespace</a> |
| 901 | } |
| 902 | } |
| 903 | if( zParent ){ |
| 904 | @ %z(chref("button","%R/vpatch?from=%!S&to=%!S",zParent,zUuid)) |
| 905 |
| --- src/info.c | |
| +++ src/info.c | |
| @@ -891,14 +891,14 @@ | |
| 891 | @ %z(chref("button","%R/%s/%T?diff=2%s",zPage,zName,zW))\ |
| 892 | @ Side-by-Side Diffs</a> |
| 893 | } |
| 894 | if( diffType!=0 ){ |
| 895 | if( *zW ){ |
| 896 | @ %z(chref("button","%R/%s/%T?diff=%d",zPage,zName,diffType)) |
| 897 | @ Show Whitespace Changes</a> |
| 898 | }else{ |
| 899 | @ %z(chref("button","%R/%s/%T?diff=%d&w",zPage,zName,diffType)) |
| 900 | @ Ignore Whitespace</a> |
| 901 | } |
| 902 | } |
| 903 | if( zParent ){ |
| 904 | @ %z(chref("button","%R/vpatch?from=%!S&to=%!S",zParent,zUuid)) |
| 905 |