gitk: Simplify highlighting interface and combine with Find function
This effectively coaelesces the highlighting function and the search function. Instead of separate highlight and find controls, there is now one set of interface elements that controls both. The main selector is a drop-down menu that controls whether commits are highlighted and searched for on the basis of text in the commit (i.e. the commit object), files affected by the commit or strings added/removed by the commit. The functions to highlight by membership of a view or by ancestor/ descendent relation to the selected commit are gone, as is the move to next/previous highlighted commit (shift-up/down) function. Signed-off-by: Paul Mackerras <paulus@samba.org>
Paul Mackerras committed
Sep 22, 2007 at 12:49 UTC
687c8765ec996225a01cadc7d91354ae3cfbdf8a
1 file changed
+220
-200
gitk
+220
-200
@@ -706,62 +706,43 @@ proc makewindow {} {
706
-state disabled -width 26
707
pack .tf.bar.rightbut -side left -fill y
708
709
- button .tf.bar.findbut -text "Find" -command dofind -font $uifont
710
- pack .tf.bar.findbut -side left
709
+ # build up the bottom bar of upper window
710
+ label .tf.lbar.flabel -text "Find " -font $uifont
711
+ button .tf.lbar.fnext -text "next" -command dofind -font $uifont
712
+ button .tf.lbar.fprev -text "prev" -command {dofind 1} -font $uifont
713
+ label .tf.lbar.flab2 -text " commit " -font $uifont
714
+ pack .tf.lbar.flabel .tf.lbar.fnext .tf.lbar.fprev .tf.lbar.flab2 \
715
+ -side left -fill y
716
+ set gdttype "containing:"
717
+ set gm [tk_optionMenu .tf.lbar.gdttype gdttype \
718
+ "containing:" \
719
+ "touching paths:" \
720
+ "adding/removing string:"]
721
+ trace add variable gdttype write gdttype_change
722
+ $gm conf -font $uifont
723
+ .tf.lbar.gdttype conf -font $uifont
724
+ pack .tf.lbar.gdttype -side left -fill y
725
+
726
set findstring {}
712
- set fstring .tf.bar.findstring
727
+ set fstring .tf.lbar.findstring
728
lappend entries $fstring
729
entry $fstring -width 30 -font $textfont -textvariable findstring
730
trace add variable findstring write find_change
716
- pack $fstring -side left -expand 1 -fill x -in .tf.bar
731
set findtype Exact
718
- set findtypemenu [tk_optionMenu .tf.bar.findtype \
732
+ set findtypemenu [tk_optionMenu .tf.lbar.findtype \
733
findtype Exact IgnCase Regexp]
720
- trace add variable findtype write find_change
721
- .tf.bar.findtype configure -font $uifont
722
- .tf.bar.findtype.menu configure -font $uifont
734
+ trace add variable findtype write findcom_change
735
+ .tf.lbar.findtype configure -font $uifont
736
+ .tf.lbar.findtype.menu configure -font $uifont
737
set findloc "All fields"
724
- tk_optionMenu .tf.bar.findloc findloc "All fields" Headline \
738
+ tk_optionMenu .tf.lbar.findloc findloc "All fields" Headline \
739
Comments Author Committer
740
trace add variable findloc write find_change
727
- .tf.bar.findloc configure -font $uifont
728
- .tf.bar.findloc.menu configure -font $uifont
729
- pack .tf.bar.findloc -side right
730
- pack .tf.bar.findtype -side right
731
-
732
- # build up the bottom bar of upper window
733
- label .tf.lbar.flabel -text "Highlight: Commits " \
734
- -font $uifont
735
- pack .tf.lbar.flabel -side left -fill y
736
- set gdttype "touching paths:"
737
- set gm [tk_optionMenu .tf.lbar.gdttype gdttype "touching paths:" \
738
- "adding/removing string:"]
739
- trace add variable gdttype write hfiles_change
740
- $gm conf -font $uifont
741
- .tf.lbar.gdttype conf -font $uifont
742
- pack .tf.lbar.gdttype -side left -fill y
743
- entry .tf.lbar.fent -width 25 -font $textfont \
744
- -textvariable highlight_files
745
- trace add variable highlight_files write hfiles_change
746
- lappend entries .tf.lbar.fent
747
- pack .tf.lbar.fent -side left -fill x -expand 1
748
- label .tf.lbar.vlabel -text " OR in view" -font $uifont
749
- pack .tf.lbar.vlabel -side left -fill y
750
- global viewhlmenu selectedhlview
751
- set viewhlmenu [tk_optionMenu .tf.lbar.vhl selectedhlview None]
752
- $viewhlmenu entryconf None -command delvhighlight
753
- $viewhlmenu conf -font $uifont
754
- .tf.lbar.vhl conf -font $uifont
755
- pack .tf.lbar.vhl -side left -fill y
756
- label .tf.lbar.rlabel -text " OR " -font $uifont
757
- pack .tf.lbar.rlabel -side left -fill y
758
- global highlight_related
759
- set m [tk_optionMenu .tf.lbar.relm highlight_related None \
760
- "Descendent" "Not descendent" "Ancestor" "Not ancestor"]
761
- $m conf -font $uifont
762
- .tf.lbar.relm conf -font $uifont
763
- trace add variable highlight_related write vrel_change
764
- pack .tf.lbar.relm -side left -fill y
741
+ .tf.lbar.findloc configure -font $uifont
742
+ .tf.lbar.findloc.menu configure -font $uifont
743
+ pack .tf.lbar.findloc -side right
744
+ pack .tf.lbar.findtype -side right
745
+ pack $fstring -side left -expand 1 -fill x
746
747
# Finish putting the upper half of the viewer together
748
pack .tf.lbar -in .tf -side bottom -fill x
@@ -914,8 +895,6 @@ proc makewindow {} {
895
bindkey <End> sellastline
896
bind . <Key-Up> "selnextline -1"
897
bind . <Key-Down> "selnextline 1"
917
- bind . <Shift-Key-Up> "next_highlight -1"
918
- bind . <Shift-Key-Down> "next_highlight 1"
898
bindkey <Key-Right> "goforw"
899
bindkey <Key-Left> "goback"
900
bind . <Key-Prior> "selnextpage -1"
@@ -1852,10 +1831,10 @@ proc doviewmenu {m first cmd op argv} {
1831
}
1832
1833
proc allviewmenus {n op args} {
1855
- global viewhlmenu
1834
+ # global viewhlmenu
1835
1836
doviewmenu .bar.view 5 [list showview $n] $op $args
1858
- doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args
1837
+ # doviewmenu $viewhlmenu 1 [list addvhighlight $n] $op $args
1838
}
1839
1840
proc newviewok {top n} {
@@ -1898,8 +1877,8 @@ proc newviewok {top n} {
1877
set viewname($n) $newviewname($n)
1878
doviewmenu .bar.view 5 [list showview $n] \
1879
entryconf [list -label $viewname($n)]
1901
- doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
1902
- entryconf [list -label $viewname($n) -value $viewname($n)]
1880
+ # doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
1881
+ # entryconf [list -label $viewname($n) -value $viewname($n)]
1882
}
1883
if {$files ne $viewfiles($n) || $newargs ne $viewargs($n)} {
1884
set viewfiles($n) $files
@@ -1931,8 +1910,8 @@ proc addviewmenu {n} {
1910
1911
.bar.view add radiobutton -label $viewname($n) \
1912
-command [list showview $n] -variable selectedview -value $n
1934
- $viewhlmenu add radiobutton -label $viewname($n) \
1935
- -command [list addvhighlight $n] -variable selectedhlview
1913
+ #$viewhlmenu add radiobutton -label $viewname($n) \
1914
+ # -command [list addvhighlight $n] -variable selectedhlview
1915
}
1916
1917
proc flatten {var} {
@@ -2208,9 +2187,9 @@ proc askvhighlight {row id} {
2187
}
2188
}
2189
2211
-proc hfiles_change {name ix op} {
2190
+proc hfiles_change {} {
2191
global highlight_files filehighlight fhighlights fh_serial
2213
- global mainfont highlight_paths
2192
+ global mainfont highlight_paths gdttype
2193
2194
if {[info exists filehighlight]} {
2195
# delete previous highlights
@@ -2228,6 +2207,66 @@ proc hfiles_change {name ix op} {
2207
}
2208
}
2209
2210
+proc gdttype_change {name ix op} {
2211
+ global gdttype highlight_files findstring findpattern
2212
+
2213
+ if {$findstring ne {}} {
2214
+ if {$gdttype eq "containing:"} {
2215
+ if {$highlight_files ne {}} {
2216
+ set highlight_files {}
2217
+ hfiles_change
2218
+ }
2219
+ findcom_change
2220
+ } else {
2221
+ if {$findpattern ne {}} {
2222
+ set findpattern {}
2223
+ findcom_change
2224
+ }
2225
+ set highlight_files $findstring
2226
+ hfiles_change
2227
+ }
2228
+ drawvisible
2229
+ }
2230
+ # enable/disable findtype/findloc menus too
2231
+}
2232
+
2233
+proc find_change {name ix op} {
2234
+ global gdttype findstring highlight_files
2235
+
2236
+ if {$gdttype eq "containing:"} {
2237
+ findcom_change
2238
+ } else {
2239
+ if {$highlight_files ne $findstring} {
2240
+ set highlight_files $findstring
2241
+ hfiles_change
2242
+ }
2243
+ }
2244
+ drawvisible
2245
+}
2246
+
2247
+proc findcom_change {} {
2248
+ global nhighlights mainfont boldnamerows
2249
+ global findpattern findtype findstring gdttype
2250
+
2251
+ # delete previous highlights, if any
2252
+ foreach row $boldnamerows {
2253
+ bolden_name $row $mainfont
2254
+ }
2255
+ set boldnamerows {}
2256
+ catch {unset nhighlights}
2257
+ unbolden
2258
+ unmarkmatches
2259
+ if {$gdttype ne "containing:" || $findstring eq {}} {
2260
+ set findpattern {}
2261
+ } elseif {$findtype eq "Regexp"} {
2262
+ set findpattern $findstring
2263
+ } else {
2264
+ set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \
2265
+ $findstring]
2266
+ set findpattern "*$e*"
2267
+ }
2268
+}
2269
+
2270
proc makepatterns {l} {
2271
set ret {}
2272
foreach e $l {
@@ -2250,8 +2289,11 @@ proc do_file_hl {serial} {
2289
set highlight_paths [makepatterns $paths]
2290
highlight_filelist
2291
set gdtargs [concat -- $paths]
2253
- } else {
2292
+ } elseif {$gdttype eq "adding/removing string:"} {
2293
set gdtargs [list "-S$highlight_files"]
2294
+ } else {
2295
+ # must be "containing:", i.e. we're searching commit info
2296
+ return
2297
}
2298
set cmd [concat | git diff-tree -r -s --stdin $gdtargs]
2299
set filehighlight [open $cmd r+]
@@ -2282,7 +2324,7 @@ proc askfilehighlight {row id} {
2324
2325
proc readfhighlight {} {
2326
global filehighlight fhighlights commitrow curview mainfont iddrawn
2285
- global fhl_list
2327
+ global fhl_list find_dirn
2328
2329
if {![info exists filehighlight]} {
2330
return 0
@@ -2314,35 +2356,21 @@ proc readfhighlight {} {
2356
unset filehighlight
2357
return 0
2358
}
2317
- next_hlcont
2318
- return 1
2319
-}
2320
-
2321
-proc find_change {name ix op} {
2322
- global nhighlights mainfont boldnamerows
2323
- global findstring findpattern findtype
2324
-
2325
- # delete previous highlights, if any
2326
- foreach row $boldnamerows {
2327
- bolden_name $row $mainfont
2328
- }
2329
- set boldnamerows {}
2330
- catch {unset nhighlights}
2331
- unbolden
2332
- unmarkmatches
2333
- if {$findtype ne "Regexp"} {
2334
- set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \
2335
- $findstring]
2336
- set findpattern "*$e*"
2359
+ if {[info exists find_dirn]} {
2360
+ if {$find_dirn > 0} {
2361
+ run findmore
2362
+ } else {
2363
+ run findmorerev
2364
+ }
2365
}
2338
- drawvisible
2366
+ return 1
2367
}
2368
2369
proc doesmatch {f} {
2342
- global findtype findstring findpattern
2370
+ global findtype findpattern
2371
2372
if {$findtype eq "Regexp"} {
2345
- return [regexp $findstring $f]
2373
+ return [regexp $findpattern $f]
2374
} elseif {$findtype eq "IgnCase"} {
2375
return [string match -nocase $findpattern $f]
2376
} else {
@@ -2535,81 +2563,6 @@ proc askrelhighlight {row id} {
2563
set rhighlights($row) $isbold
2564
}
2565
2538
-proc next_hlcont {} {
2539
- global fhl_row fhl_dirn displayorder numcommits
2540
- global vhighlights fhighlights nhighlights rhighlights
2541
- global hlview filehighlight findstring highlight_related
2542
-
2543
- if {![info exists fhl_dirn] || $fhl_dirn == 0} return
2544
- set row $fhl_row
2545
- while {1} {
2546
- if {$row < 0 || $row >= $numcommits} {
2547
- bell
2548
- set fhl_dirn 0
2549
- return
2550
- }
2551
- set id [lindex $displayorder $row]
2552
- if {[info exists hlview]} {
2553
- if {![info exists vhighlights($row)]} {
2554
- askvhighlight $row $id
2555
- }
2556
- if {$vhighlights($row) > 0} break
2557
- }
2558
- if {$findstring ne {}} {
2559
- if {![info exists nhighlights($row)]} {
2560
- askfindhighlight $row $id
2561
- }
2562
- if {$nhighlights($row) > 0} break
2563
- }
2564
- if {$highlight_related ne "None"} {
2565
- if {![info exists rhighlights($row)]} {
2566
- askrelhighlight $row $id
2567
- }
2568
- if {$rhighlights($row) > 0} break
2569
- }
2570
- if {[info exists filehighlight]} {
2571
- if {![info exists fhighlights($row)]} {
2572
- # ask for a few more while we're at it...
2573
- set r $row
2574
- for {set n 0} {$n < 100} {incr n} {
2575
- if {![info exists fhighlights($r)]} {
2576
- askfilehighlight $r [lindex $displayorder $r]
2577
- }
2578
- incr r $fhl_dirn
2579
- if {$r < 0 || $r >= $numcommits} break
2580
- }
2581
- flushhighlights
2582
- }
2583
- if {$fhighlights($row) < 0} {
2584
- set fhl_row $row
2585
- return
2586
- }
2587
- if {$fhighlights($row) > 0} break
2588
- }
2589
- incr row $fhl_dirn
2590
- }
2591
- set fhl_dirn 0
2592
- selectline $row 1
2593
-}
2594
-
2595
-proc next_highlight {dirn} {
2596
- global selectedline fhl_row fhl_dirn
2597
- global hlview filehighlight findstring highlight_related
2598
-
2599
- if {![info exists selectedline]} return
2600
- if {!([info exists hlview] || $findstring ne {} ||
2601
- $highlight_related ne "None" || [info exists filehighlight])} return
2602
- set fhl_row [expr {$selectedline + $dirn}]
2603
- set fhl_dirn $dirn
2604
- next_hlcont
2605
-}
2606
-
2607
-proc cancel_next_highlight {} {
2608
- global fhl_dirn
2609
-
2610
- set fhl_dirn 0
2611
-}
2612
-
2566
# Graph layout functions
2567
2568
proc shortids {ids} {
@@ -3669,7 +3622,7 @@ proc drawcmitrow {row} {
3622
global displayorder rowidlist nrows_drawn
3623
global iddrawn markingmatches
3624
global commitinfo parentlist numcommits
3672
- global filehighlight fhighlights findstring nhighlights
3625
+ global filehighlight fhighlights findpattern nhighlights
3626
global hlview vhighlights
3627
global highlight_related rhighlights
3628
@@ -3682,7 +3635,7 @@ proc drawcmitrow {row} {
3635
if {[info exists filehighlight] && ![info exists fhighlights($row)]} {
3636
askfilehighlight $row $id
3637
}
3685
- if {$findstring ne {} && ![info exists nhighlights($row)]} {
3638
+ if {$findpattern ne {} && ![info exists nhighlights($row)]} {
3639
askfindhighlight $row $id
3640
}
3641
if {$highlight_related ne "None" && ![info exists rhighlights($row)]} {
@@ -4190,9 +4143,9 @@ proc findmatches {f} {
4143
4144
proc dofind {{rev 0}} {
4145
global findstring findstartline findcurline selectedline numcommits
4146
+ global gdttype filehighlight fh_serial find_dirn
4147
4148
unmarkmatches
4195
- cancel_next_highlight
4149
focus .
4150
if {$findstring eq {} || $numcommits == 0} return
4151
if {![info exists selectedline]} {
@@ -4202,19 +4155,24 @@ proc dofind {{rev 0}} {
4155
}
4156
set findcurline $findstartline
4157
nowbusy finding
4158
+ if {$gdttype ne "containing:" && ![info exists filehighlight]} {
4159
+ after cancel do_file_hl $fh_serial
4160
+ do_file_hl $fh_serial
4161
+ }
4162
if {!$rev} {
4163
+ set find_dirn 1
4164
run findmore
4165
} else {
4208
- if {$findcurline == 0} {
4209
- set findcurline $numcommits
4210
- }
4211
- incr findcurline -1
4166
+ set find_dirn -1
4167
run findmorerev
4168
}
4169
}
4170
4171
proc findnext {restart} {
4217
- global findcurline
4172
+ global findcurline find_dirn
4173
+
4174
+ if {[info exists find_dirn]} return
4175
+ set find_dirn 1
4176
if {![info exists findcurline]} {
4177
if {$restart} {
4178
dofind
@@ -4228,7 +4186,10 @@ proc findnext {restart} {
4186
}
4187
4188
proc findprev {} {
4231
- global findcurline
4189
+ global findcurline find_dirn
4190
+
4191
+ if {[info exists find_dirn]} return
4192
+ set find_dirn -1
4193
if {![info exists findcurline]} {
4194
dofind 1
4195
} else {
@@ -4238,8 +4199,9 @@ proc findprev {} {
4199
}
4200
4201
proc findmore {} {
4241
- global commitdata commitinfo numcommits findstring findpattern findloc
4202
+ global commitdata commitinfo numcommits findpattern findloc
4203
global findstartline findcurline displayorder
4204
+ global find_dirn gdttype fhighlights
4205
4206
set fldtypes {Headline Author Date Committer CDate Comments}
4207
set l [expr {$findcurline + 1}]
@@ -4254,28 +4216,56 @@ proc findmore {} {
4216
if {$lim - $l > 500} {
4217
set lim [expr {$l + 500}]
4218
}
4257
- set last 0
4258
- for {} {$l < $lim} {incr l} {
4259
- set id [lindex $displayorder $l]
4260
- # shouldn't happen unless git log doesn't give all the commits...
4261
- if {![info exists commitdata($id)]} continue
4262
- if {![doesmatch $commitdata($id)]} continue
4263
- if {![info exists commitinfo($id)]} {
4264
- getcommit $id
4219
+ set found 0
4220
+ set domore 1
4221
+ if {$gdttype eq "containing:"} {
4222
+ for {} {$l < $lim} {incr l} {
4223
+ set id [lindex $displayorder $l]
4224
+ # shouldn't happen unless git log doesn't give all the commits...
4225
+ if {![info exists commitdata($id)]} continue
4226
+ if {![doesmatch $commitdata($id)]} continue
4227
+ if {![info exists commitinfo($id)]} {
4228
+ getcommit $id
4229
+ }
4230
+ set info $commitinfo($id)
4231
+ foreach f $info ty $fldtypes {
4232
+ if {($findloc eq "All fields" || $findloc eq $ty) &&
4233
+ [doesmatch $f]} {
4234
+ set found 1
4235
+ break
4236
+ }
4237
+ }
4238
+ if {$found} break
4239
}
4266
- set info $commitinfo($id)
4267
- foreach f $info ty $fldtypes {
4268
- if {($findloc eq "All fields" || $findloc eq $ty) &&
4269
- [doesmatch $f]} {
4270
- findselectline $l
4271
- notbusy finding
4272
- return 0
4240
+ } else {
4241
+ for {} {$l < $lim} {incr l} {
4242
+ set id [lindex $displayorder $l]
4243
+ if {![info exists fhighlights($l)]} {
4244
+ askfilehighlight $l $id
4245
+ if {$domore} {
4246
+ set domore 0
4247
+ set findcurline [expr {$l - 1}]
4248
+ }
4249
+ } elseif {$fhighlights($l)} {
4250
+ set found $domore
4251
+ break
4252
}
4253
}
4254
}
4255
+ if {$found} {
4256
+ unset find_dirn
4257
+ findselectline $l
4258
+ notbusy finding
4259
+ return 0
4260
+ }
4261
+ if {!$domore} {
4262
+ flushhighlights
4263
+ return 0
4264
+ }
4265
if {$l == $findstartline + 1} {
4266
bell
4267
unset findcurline
4268
+ unset find_dirn
4269
notbusy finding
4270
return 0
4271
}
@@ -4284,8 +4274,9 @@ proc findmore {} {
4274
}
4275
4276
proc findmorerev {} {
4287
- global commitdata commitinfo numcommits findstring findpattern findloc
4277
+ global commitdata commitinfo numcommits findpattern findloc
4278
global findstartline findcurline displayorder
4279
+ global find_dirn gdttype fhighlights
4280
4281
set fldtypes {Headline Author Date Committer CDate Comments}
4282
set l $findcurline
@@ -4301,27 +4292,55 @@ proc findmorerev {} {
4292
if {$l - $lim > 500} {
4293
set lim [expr {$l - 500}]
4294
}
4304
- set last 0
4305
- for {} {$l > $lim} {incr l -1} {
4306
- set id [lindex $displayorder $l]
4307
- if {![info exists commitdata($id)]} continue
4308
- if {![doesmatch $commitdata($id)]} continue
4309
- if {![info exists commitinfo($id)]} {
4310
- getcommit $id
4295
+ set found 0
4296
+ set domore 1
4297
+ if {$gdttype eq "containing:"} {
4298
+ for {} {$l > $lim} {incr l -1} {
4299
+ set id [lindex $displayorder $l]
4300
+ if {![info exists commitdata($id)]} continue
4301
+ if {![doesmatch $commitdata($id)]} continue
4302
+ if {![info exists commitinfo($id)]} {
4303
+ getcommit $id
4304
+ }
4305
+ set info $commitinfo($id)
4306
+ foreach f $info ty $fldtypes {
4307
+ if {($findloc eq "All fields" || $findloc eq $ty) &&
4308
+ [doesmatch $f]} {
4309
+ set found 1
4310
+ break
4311
+ }
4312
+ }
4313
+ if {$found} break
4314
}
4312
- set info $commitinfo($id)
4313
- foreach f $info ty $fldtypes {
4314
- if {($findloc eq "All fields" || $findloc eq $ty) &&
4315
- [doesmatch $f]} {
4316
- findselectline $l
4317
- notbusy finding
4318
- return 0
4315
+ } else {
4316
+ for {} {$l > $lim} {incr l -1} {
4317
+ set id [lindex $displayorder $l]
4318
+ if {![info exists fhighlights($l)]} {
4319
+ askfilehighlight $l $id
4320
+ if {$domore} {
4321
+ set domore 0
4322
+ set findcurline [expr {$l + 1}]
4323
+ }
4324
+ } elseif {$fhighlights($l)} {
4325
+ set found $domore
4326
+ break
4327
}
4328
}
4329
}
4330
+ if {$found} {
4331
+ unset find_dirn
4332
+ findselectline $l
4333
+ notbusy finding
4334
+ return 0
4335
+ }
4336
+ if {!$domore} {
4337
+ flushhighlights
4338
+ return 0
4339
+ }
4340
if {$l == -1} {
4341
bell
4342
unset findcurline
4343
+ unset find_dirn
4344
notbusy finding
4345
return 0
4346
}
@@ -4330,7 +4349,7 @@ proc findmorerev {} {
4349
}
4350
4351
proc findselectline {l} {
4333
- global findloc commentend ctext findcurline markingmatches
4352
+ global findloc commentend ctext findcurline markingmatches gdttype
4353
4354
set markingmatches 1
4355
set findcurline $l
@@ -4599,7 +4618,6 @@ proc selectline {l isnew} {
4618
catch {unset pending_select}
4619
$canv delete hover
4620
normalline
4602
- cancel_next_highlight
4621
unsel_reflist
4622
if {$l < 0 || $l >= $numcommits} return
4623
set y [expr {$canvy0 + $l * $linespc}]
@@ -4781,7 +4799,6 @@ proc unselectline {} {
4799
catch {unset currentid}
4800
allcanvs delete secsel
4801
rhighlight_none
4784
- cancel_next_highlight
4802
}
4803
4804
proc reselectline {} {
@@ -8223,6 +8240,7 @@ set historyindex 0
8240
set fh_serial 0
8241
set nhl_names {}
8242
set highlight_paths {}
8243
+set findpattern {}
8244
set searchdirn -forwards
8245
set boldrows {}
8246
set boldnamerows {}
@@ -8236,6 +8254,8 @@ set nextviewnum 1
8254
set curview 0
8255
set selectedview 0
8256
set selectedhlview None
8257
+set highlight_related None
8258
+set highlight_files {}
8259
set viewfiles(0) {}
8260
set viewperm(0) 0
8261
set viewargs(0) {}