Git fork

Merge branch 'top-panel-search-highlight' of github.com:bnfour/gitk

* 'top-panel-search-highlight' of github.com:bnfour/gitk:
gitk: do not hard-code color of search results in commit list

Signed-off-by: Johannes Sixt <j6t@kdbg.org>

+2 -2
+2 -2
gitk
··· 7108 7108 7109 7109 # mark the bits of a headline or author that match a find string 7110 7110 proc markmatches {canv l str tag matches font row} { 7111 - global selectedline 7111 + global selectedline foundbgcolor 7112 7112 7113 7113 set bbox [$canv bbox $tag] 7114 7114 set x0 [lindex $bbox 0] ··· 7122 7122 set xlen [font measure $font [string range $str 0 [expr {$end}]]] 7123 7123 set t [$canv create rect [expr {$x0+$xoff}] $y0 \ 7124 7124 [expr {$x0+$xlen+2}] $y1 \ 7125 - -outline {} -tags [list match$l matches] -fill yellow] 7125 + -outline {} -tags [list match$l matches] -fill $foundbgcolor] 7126 7126 $canv lower $t 7127 7127 if {$row == $selectedline} { 7128 7128 $canv raise $t secsel