From: Pat Thoyts <patthoyts@users.sourceforge.net>
Date: Sun, 1 Apr 2012 22:00:51 +0000 (+0100)
Subject: gitk: fix tabbed preferences construction when using tcl 8.4
X-Git-Tag: v1.7.10-rc4~1^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=28cb707472ad2861f9d994c279a9b6077160522e;p=git.git

gitk: fix tabbed preferences construction when using tcl 8.4

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>
---

diff --git a/gitk b/gitk
index 651b74004..68cd1a1fc 100755
--- 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