summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xgitk13
1 files 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}