From 978904bf16600dd21888964f3d5cabf02ba39f22 Mon Sep 17 00:00:00 2001 From: Stefan Haller Date: Thu, 4 Oct 2012 22:50:17 +0200 Subject: [PATCH] gitk: When searching, only highlight files when in Patch mode This fixes another regression that was introduced in b967135 ("gitk: Synchronize highlighting in file view when scrolling diff"): when searching for a string in tree mode, jumping to the next search hit would highlight the "Comments" entry in the file list. Signed-off-by: Stefan Haller Signed-off-by: Paul Mackerras --- gitk | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gitk b/gitk index a569c0d4b8..bc73eea518 100755 --- a/gitk +++ b/gitk @@ -7979,8 +7979,9 @@ proc highlightfile {cline} { } proc highlightfile_for_scrollpos {topidx} { - global difffilestart + global cmitmode difffilestart + if {$cmitmode eq "tree"} return if {![info exists difffilestart]} return set top [lindex [split $topidx .] 0] @@ -8204,12 +8205,10 @@ proc scrolltext {f0 f1} { global searchstring cmitmode ctext global suppress_highlighting_file_for_this_scrollpos - if {$cmitmode ne "tree"} { - set topidx [$ctext index @0,0] - if {![info exists suppress_highlighting_file_for_this_scrollpos] - || $topidx ne $suppress_highlighting_file_for_this_scrollpos} { - highlightfile_for_scrollpos $topidx - } + set topidx [$ctext index @0,0] + if {![info exists suppress_highlighting_file_for_this_scrollpos] + || $topidx ne $suppress_highlighting_file_for_this_scrollpos} { + highlightfile_for_scrollpos $topidx } catch {unset suppress_highlighting_file_for_this_scrollpos} -- 2.11.4.GIT