summaryrefslogtreecommitdiff
path: root/gitk
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-10-04 12:19:24 (GMT)
committerPaul Mackerras <paulus@samba.org>2007-10-04 12:19:24 (GMT)
commit64b5f146fd2252646d23eac925c49ce9cb526de9 (patch)
treeade1ee576a8a52cadef3a6e3280f283c4bcbcbcf /gitk
parent32f1b3e4a4baa3fe3e1acbb75f8134d822a09d58 (diff)
downloadgit-64b5f146fd2252646d23eac925c49ce9cb526de9.zip
git-64b5f146fd2252646d23eac925c49ce9cb526de9.tar.gz
git-64b5f146fd2252646d23eac925c49ce9cb526de9.tar.bz2
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>
Diffstat (limited to 'gitk')
-rwxr-xr-xgitk6
1 files changed, 3 insertions, 3 deletions
diff --git a/gitk b/gitk
index 01f5926..35920ab 100755
--- a/gitk
+++ b/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 {