mirror of
https://github.com/git/git.git
synced 2024-11-18 03:03:55 +01:00
gitk: Fix bug causing Tcl error when changing find match type
When changing the selector for Exact/IgnCase/Regexp, we were getting a Tcl error. This fixes it. It also adds a workaround for a bug in alpha versions of Tk8.5 where wordprocessor-style tabs don't seem to work properly around column 1. Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
32f1b3e4a4
commit
64b5f146fd
6
gitk
6
gitk
@ -2334,7 +2334,7 @@ proc find_change {name ix op} {
|
||||
drawvisible
|
||||
}
|
||||
|
||||
proc findcom_change {} {
|
||||
proc findcom_change args {
|
||||
global nhighlights mainfont boldnamerows
|
||||
global findpattern findtype findstring gdttype
|
||||
|
||||
@ -5529,8 +5529,8 @@ proc settabs {{firstab {}}} {
|
||||
}
|
||||
set w [font measure $textfont "0"]
|
||||
if {$firsttabstop != 0} {
|
||||
$ctext conf -tabs [list [expr {$firsttabstop * $w}] \
|
||||
[expr {($firsttabstop + $tabstop) * $w}]]
|
||||
$ctext conf -tabs [list [expr {($firsttabstop + $tabstop) * $w}] \
|
||||
[expr {($firsttabstop + 2 * $tabstop) * $w}]]
|
||||
} elseif {$have_tk85 || $tabstop != 8} {
|
||||
$ctext conf -tabs [expr {$tabstop * $w}]
|
||||
} else {
|
||||
|
Loading…
Reference in New Issue
Block a user