diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-05-29 09:02:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-05-29 09:02:14 -0700 |
| commit | 6ab5693aa298f0e3034a1273cf4bf61c31b0e7f0 (patch) | |
| tree | 64da47aa19efebf0f686127adb6022491f493563 /gitk-git/gitk | |
| parent | b32feae0f1b21faaf8e191e8d3314a32470a536b (diff) | |
| parent | bfb0fa7099e541c15d103b75f453f613a751da03 (diff) | |
| download | git-6ab5693aa298f0e3034a1273cf4bf61c31b0e7f0.tar.gz | |
Merge branch 'master' of https://github.com/j6t/gitk
* 'master' of https://github.com/j6t/gitk:
gitk: do not hard-code color of search results in commit list
gitk: place file name arguments after options in msgfmt call
gitk: Legacy widgets doesn't have combobox
Diffstat (limited to 'gitk-git/gitk')
| -rwxr-xr-x | gitk-git/gitk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gitk-git/gitk b/gitk-git/gitk index 11ad639d06..19689765cd 100755 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -7108,7 +7108,7 @@ proc findselectline {l} { # mark the bits of a headline or author that match a find string proc markmatches {canv l str tag matches font row} { - global selectedline + global selectedline foundbgcolor set bbox [$canv bbox $tag] set x0 [lindex $bbox 0] @@ -7122,7 +7122,7 @@ proc markmatches {canv l str tag matches font row} { set xlen [font measure $font [string range $str 0 [expr {$end}]]] set t [$canv create rect [expr {$x0+$xoff}] $y0 \ [expr {$x0+$xlen+2}] $y1 \ - -outline {} -tags [list match$l matches] -fill yellow] + -outline {} -tags [list match$l matches] -fill $foundbgcolor] $canv lower $t if {$row == $selectedline} { $canv raise $t secsel @@ -11736,13 +11736,11 @@ proc prefspage_general {notebook} { grid x $page.tabstopl $page.tabstop -sticky w ${NS}::label $page.wrapcommentl -text [mc "Wrap comment text"] - ${NS}::combobox $page.wrapcomment -values {none char word} -state readonly \ - -textvariable wrapcomment + makedroplist $page.wrapcomment wrapcomment none char word grid x $page.wrapcommentl $page.wrapcomment -sticky w ${NS}::label $page.wrapdefaultl -text [mc "Wrap other text"] - ${NS}::combobox $page.wrapdefault -values {none char word} -state readonly \ - -textvariable wrapdefault + makedroplist $page.wrapdefault wrapdefault none char word grid x $page.wrapdefaultl $page.wrapdefault -sticky w ${NS}::checkbutton $page.ntag -text [mc "Display nearby tags/heads"] \ |