gitk: Highlight commit/comment text only if search type is "containing:".
PATCH v2 1/1 gitk: Highlight commit/comment text only if search type is "containing:".
Highlighting the text in the commit list and comments that matches the current find string is useful when the search type is "containing:". When the search type is "touching paths:" or "adding/removing string:" the highlight doesn't help so this patch suppresses the highlighting for those search types.
Signed-off-by Mark Burton <[email protected]>
---
Patch same as before - just made the commit message a bit clearer.
gitk-git/gitk | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)
gitk-git/gitk +6 -3
@@ -4302,6 +4302,7 @@ proc askfindhighlight {row id} { global nhighlights commitinfo iddrawn global findloc global markingmatches + global gdttype if {![info exists commitinfo($id)]} { getcommit $id
@@ -4326,7 +4327,7 @@ proc askfindhighlight {row id} { bolden_name $row mainfontbold } } - if {$markingmatches} { + if {$markingmatches && $gdttype eq [mc "containing:"]} { markrowmatches $row $id } }
@@ -5565,6 +5566,7 @@ proc drawcmitrow {row} { global filehighlight fhighlights findpattern nhighlights global hlview vhighlights global highlight_related rhighlights + global gdttype if {$row >= $numcommits} return
@@ -5595,7 +5597,7 @@ proc drawcmitrow {row} { set iddrawn($id) 1 incr nrows_drawn } - if {$markingmatches} { + if {$markingmatches && $gdttype eq [mc "containing:"]} { markrowmatches $row $id } }
@@ -6227,7 +6229,8 @@ proc findselectline {l} { set markingmatches 1 set findcurline $l selectline $l 1 - if {$findloc == [mc "All fields"] || $findloc == [mc "Comments"]} { + if {$gdttype eq [mc "containing:"] && + ($findloc == [mc "All fields"] || $findloc == [mc "Comments"])} { # highlight the matches in the comments set f [$ctext get 1.0 $commentend] set matches [findmatches $f]
Signature · 1 line
1.6.0.4