summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-02 22:06:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-04-02 22:06:25 (GMT)
commitca2b71a00b47e47990b3a196c9ae26ac6b19e287 (patch)
tree51ee3a65becf81b5baf0cfda182ae2f86e1bc091
parentd82829b6128263951569221ca0c00dd143da055c (diff)
parent39ddf99c1db8b230ec7bdefc6ce3c769d1cf4ab6 (diff)
downloadgit-ca2b71a00b47e47990b3a196c9ae26ac6b19e287.zip
git-ca2b71a00b47e47990b3a196c9ae26ac6b19e287.tar.gz
git-ca2b71a00b47e47990b3a196c9ae26ac6b19e287.tar.bz2
Merge branch 'pt/gitk'
* pt/gitk: gitk: fix setting font display with new tabbed dialog layout. gitk: fix tabbed preferences construction when using tcl 8.4
-rwxr-xr-xgitk-git/gitk3
1 files changed, 2 insertions, 1 deletions
diff --git a/gitk-git/gitk b/gitk-git/gitk
index 651b740..22270ce 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -10795,7 +10795,7 @@ proc fontok {} {
if {$fontparam(slant) eq "italic"} {
lappend fontpref($f) "italic"
}
- set w $prefstop.$f
+ set w $prefstop.notebook.fonts.$f
$w conf -text $fontparam(family) -font $fontpref($f)
fontcan
@@ -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