Skip to content
Browse files

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
  • Loading branch information...
2 parents d82829b + 39ddf99 commit ca2b71a00b47e47990b3a196c9ae26ac6b19e287 @gitster gitster committed Apr 2, 2012
Showing with 2 additions and 1 deletion.
  1. +2 −1 gitk-git/gitk
View
3 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

0 comments on commit ca2b71a

Please sign in to comment.
Something went wrong with that request. Please try again.