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 <stefan@haller-berlin.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/gitk b/gitk
index a569c0d4b8a7616fdf0651251a021a5e03015501..bc73eea518f551251c56511c239e6d73857bc5a9 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -7979,8 +7979,9 @@ proc highlightfile {cline} {
 }
 
 proc highlightfile_for_scrollpos {topidx} {
 }
 
 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]
     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
 
     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}
     }
 
     catch {unset suppress_highlighting_file_for_this_scrollpos}