Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch backed-out Excluding Merge-Ins
This is equivalent to a diff from d97fe53685 to 0a869bebc2
|
2013-07-09
| ||
| 20:51 | Add better comment explaining why .txtA/.txtB lines are padded with spaces. check-in: 2d8f2b4e24 user: joel tags: sbsreloaded | |
| 12:05 | [Backed out: see next commit in sbsreloaded branch.] Do not pad lines of the Tk diff view with spaces. Closed-Leaf check-in: 0a869bebc2 user: drh tags: backed-out | |
| 11:46 | Merge in the latest trunk changes. check-in: d97fe53685 user: drh tags: sbsreloaded | |
| 10:54 | Comment enhancements. No changes to code. check-in: f04a3242ec user: drh tags: sbsreloaded | |
| 08:51 | Fix "fossil commit" when specifying a directory on the command line which doesn't exist. check-in: 062b82c8b0 user: jan.nijtmans tags: trunk | |
Changes to src/diffcmd.c.
| ︙ | ︙ | |||
707 708 709 710 711 712 713 |
@ }
@ }
@
@ foreach c {.lnA .lnB .mkr} {
@ $c config -width $gDiffs($idx,[colType $c]-width)
@ }
@
| < < < < < < < < < < | 707 708 709 710 711 712 713 714 715 716 717 718 719 720 |
@ }
@ }
@
@ foreach c {.lnA .lnB .mkr} {
@ $c config -width $gDiffs($idx,[colType $c]-width)
@ }
@
@ foreach c [cols] {
@ $c config -state disabled
@ }
@ }
@
@ proc cycleDiffs {{inc 1}} {
@ global gIdx
|
| ︙ | ︙ | |||
741 742 743 744 745 746 747 |
@ } else {
@ grid $sb
@ $sb set $first $last
@ }
@ }
@ }
@
| < < < < < < < < < < < < < | 731 732 733 734 735 736 737 738 739 740 741 742 743 744 |
@ } else {
@ grid $sb
@ $sb set $first $last
@ }
@ }
@ }
@
@ wm withdraw .
@ wm title . $CFG(TITLE)
@ wm iconname . $CFG(TITLE)
@ bind . <q> exit
@ bind . <Tab> {cycleDiffs; break}
@ bind . <<PrevWindow>> {cycleDiffs -1; break}
@ bind . <Return> {
|
| ︙ | ︙ | |||
799 800 801 802 803 804 805 |
@ set txt .txt$side
@ text $txt -width $CFG(WIDTH) -height $CFG(HEIGHT) -wrap none \
@ -xscroll {scrollSync x {.sbxA .sbxB}}
@ foreach tag {add rm chng} {
@ $txt tag config $tag -background $CFG([string toupper $tag]_BG)
@ $txt tag lower $tag
@ }
| < < | 776 777 778 779 780 781 782 783 784 785 786 787 788 789 |
@ set txt .txt$side
@ text $txt -width $CFG(WIDTH) -height $CFG(HEIGHT) -wrap none \
@ -xscroll {scrollSync x {.sbxA .sbxB}}
@ foreach tag {add rm chng} {
@ $txt tag config $tag -background $CFG([string toupper $tag]_BG)
@ $txt tag lower $tag
@ }
@ }
@ text .mkr
@
@ font create mono -family courier -size $CFG(FONT_SIZE)
@ foreach font $CFG(FONTS) {
@ if {[lsearch -exact [font families] $font] != -1} {
@ font config mono -family $font
|
| ︙ | ︙ |