diff options
author | Stefan Haller <stefan@haller-berlin.de> | 2012-10-04 22:50:17 +0200 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2012-10-22 09:24:47 +1100 |
commit | 978904bf16600dd21888964f3d5cabf02ba39f22 (patch) | |
tree | 54f0326cb72d477c4e1df6f377967f12373b6a9e /gitk | |
parent | gitk: Fix error message when clicking on a connecting line (diff) | |
download | tgif-978904bf16600dd21888964f3d5cabf02ba39f22.tar.xz |
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>
Diffstat (limited to 'gitk')
-rwxr-xr-x | gitk | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -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} |