gitk: fix tabbed preferences construction when using tcl 8.4
authorPat Thoyts <patthoyts@users.sourceforge.net>
Sun, 1 Apr 2012 22:00:51 +0000 (23:00 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Apr 2012 17:21:08 +0000 (10:21 -0700)
In 8.5 the incr command creates the target variable if it does not exist
but in 8.4 using incr on a non-existing variable raises an error. Ensure
we have created our counter variable when creating the tabbed dialog for
non-themed preferences.

Reported-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
gitk
diff --git a/gitk b/gitk
index 651b7400436c0a1eb4dfa029a9fee187060fc44d..68cd1a1fc51379f8e4995ebf408d229adce6088d 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -11012,6 +11012,7 @@ proc doprefs {} {
     lappend pages [prefspage_general $notebook] [mc "General"]
     lappend pages [prefspage_colors $notebook] [mc "Colors"]
     lappend pages [prefspage_fonts $notebook] [mc "Fonts"]
+    set col 0
     foreach {page title} $pages {
        if {$use_notebook} {
            $notebook add $page -text $title