Fossil SCM

Fix the SKIP display for --tk diffs.

drh 2021-09-04 15:00 diff-color-enhancements

Commit 581d3f8d88359b00523964c411b34977aa6b249ac65ac647cd9be4c04a16e12e

Parent 723ce36ddbcd851…

1 file changed +10 -3

M src/diff.tcl

+10 -3

		--- src/diff.tcl
		+++ src/diff.tcl
		@@ -19,11 +19,11 @@
19	19	MKR_COL_BG #444444
20	20	MKR_COL_FG #dddddd
21	21	CHNG_BG #d0d0ff
22	22	ADD_BG #c0ffc0
23	23	RM_BG #ffc0c0
24		- HR_FG #888888
	24	+ HR_FG #444444
25	25	HR_PAD_TOP 4
26	26	HR_PAD_BTM 8
27	27	FN_BG #444444
28	28	FN_FG #ffffff
29	29	FN_PAD 5
		@@ -93,10 +93,15 @@
93	93	}
94	94	SKIP {
95	95	set n [lindex $line 1]
96	96	incr n1 $n
97	97	incr n2 $n
	98	+ .lnA insert end ...\n hrln
	99	+ .txtA insert end [string repeat . 30]\n hrtxt
	100	+ .mkr insert end \n hrln
	101	+ .lnB insert end ...\n hrln
	102	+ .txtB insert end [string repeat . 30]\n hrtxt
98	103	}
99	104	COM {
100	105	set x [lindex $line 1]
101	106	incr n1
102	107	incr n2
		@@ -361,12 +366,14 @@
361	366	foreach c [cols] {
362	367	set keyPrefix [string toupper [colType $c]]_COL_
363	368	if {[tk windowingsystem] eq "win32"} {$c config -font {courier 9}}
364	369	$c config -bg $CFG(${keyPrefix}BG) -fg $CFG(${keyPrefix}FG) -borderwidth 0 \
365	370	-padx $CFG(PADX) -yscroll sync-y
366		- $c tag config hr -spacing1 $CFG(HR_PAD_TOP) -spacing3 $CFG(HR_PAD_BTM) \
367		- -foreground $CFG(HR_FG)
	371	+ $c tag config hrln -spacing1 $CFG(HR_PAD_TOP) -spacing3 $CFG(HR_PAD_BTM) \
	372	+ -foreground $CFG(HR_FG) -justify right
	373	+ $c tag config hrtxt -spacing1 $CFG(HR_PAD_TOP) -spacing3 $CFG(HR_PAD_BTM) \
	374	+ -foreground $CFG(HR_FG) -justify center
368	375	$c tag config fn -spacing1 $CFG(FN_PAD) -spacing3 $CFG(FN_PAD)
369	376	bindtags $c ". $c Text all"
370	377	bind $c <1> {focus %W}
371	378	}
372	379
373	380

	--- src/diff.tcl
	+++ src/diff.tcl
	@@ -19,11 +19,11 @@
19	MKR_COL_BG #444444
20	MKR_COL_FG #dddddd
21	CHNG_BG #d0d0ff
22	ADD_BG #c0ffc0
23	RM_BG #ffc0c0
24	HR_FG #888888
25	HR_PAD_TOP 4
26	HR_PAD_BTM 8
27	FN_BG #444444
28	FN_FG #ffffff
29	FN_PAD 5
	@@ -93,10 +93,15 @@
93	}
94	SKIP {
95	set n [lindex $line 1]
96	incr n1 $n
97	incr n2 $n





98	}
99	COM {
100	set x [lindex $line 1]
101	incr n1
102	incr n2
	@@ -361,12 +366,14 @@
361	foreach c [cols] {
362	set keyPrefix [string toupper [colType $c]]_COL_
363	if {[tk windowingsystem] eq "win32"} {$c config -font {courier 9}}
364	$c config -bg $CFG(${keyPrefix}BG) -fg $CFG(${keyPrefix}FG) -borderwidth 0 \
365	-padx $CFG(PADX) -yscroll sync-y
366	$c tag config hr -spacing1 $CFG(HR_PAD_TOP) -spacing3 $CFG(HR_PAD_BTM) \
367	-foreground $CFG(HR_FG)


368	$c tag config fn -spacing1 $CFG(FN_PAD) -spacing3 $CFG(FN_PAD)
369	bindtags $c ". $c Text all"
370	bind $c <1> {focus %W}
371	}
372
373

	--- src/diff.tcl
	+++ src/diff.tcl
	@@ -19,11 +19,11 @@
19	MKR_COL_BG #444444
20	MKR_COL_FG #dddddd
21	CHNG_BG #d0d0ff
22	ADD_BG #c0ffc0
23	RM_BG #ffc0c0
24	HR_FG #444444
25	HR_PAD_TOP 4
26	HR_PAD_BTM 8
27	FN_BG #444444
28	FN_FG #ffffff
29	FN_PAD 5
	@@ -93,10 +93,15 @@
93	}
94	SKIP {
95	set n [lindex $line 1]
96	incr n1 $n
97	incr n2 $n
98	.lnA insert end ...\n hrln
99	.txtA insert end [string repeat . 30]\n hrtxt
100	.mkr insert end \n hrln
101	.lnB insert end ...\n hrln
102	.txtB insert end [string repeat . 30]\n hrtxt
103	}
104	COM {
105	set x [lindex $line 1]
106	incr n1
107	incr n2
	@@ -361,12 +366,14 @@
366	foreach c [cols] {
367	set keyPrefix [string toupper [colType $c]]_COL_
368	if {[tk windowingsystem] eq "win32"} {$c config -font {courier 9}}
369	$c config -bg $CFG(${keyPrefix}BG) -fg $CFG(${keyPrefix}FG) -borderwidth 0 \
370	-padx $CFG(PADX) -yscroll sync-y
371	$c tag config hrln -spacing1 $CFG(HR_PAD_TOP) -spacing3 $CFG(HR_PAD_BTM) \
372	-foreground $CFG(HR_FG) -justify right
373	$c tag config hrtxt -spacing1 $CFG(HR_PAD_TOP) -spacing3 $CFG(HR_PAD_BTM) \
374	-foreground $CFG(HR_FG) -justify center
375	$c tag config fn -spacing1 $CFG(FN_PAD) -spacing3 $CFG(FN_PAD)
376	bindtags $c ". $c Text all"
377	bind $c <1> {focus %W}
378	}
379
380