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>

diff --git a/gitk b/gitk
index 01f5926916da4d0b69c12cd5bb46d61bb042dc72..35920abc7bd5f1680c7c102006e1f8e053c7f04a 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -2334,7 +2334,7 @@ proc find_change {name ix op} {
     drawvisible
 }
 
     drawvisible
 }
 

-proc findcom_change {} {
+proc findcom_change args {

     global nhighlights mainfont boldnamerows
     global findpattern findtype findstring gdttype
 
     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} {
     }
     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 {
     } elseif {$have_tk85 || $tabstop != 8} {
        $ctext conf -tabs [expr {$tabstop * $w}]
     } else {