diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-04-07 21:52:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-07 21:52:23 -0700 |
| commit | fae09a8084c9b51632726523b477a78dd28d7d7e (patch) | |
| tree | 05a6ce33b03d990ed8d9f6d0e8f1bca7516c5b4d /gitk-git/gitk | |
| parent | git-svn: fix following renamed paths when tracking a single path (diff) | |
| parent | gitk: Fix changing colors through Edit->Preferences (diff) | |
| download | tgif-fae09a8084c9b51632726523b477a78dd28d7d7e.tar.xz | |
Merge git://git.kernel.org/pub/scm/gitk/gitk
* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Fix changing colors through Edit->Preferences
Diffstat (limited to 'gitk-git/gitk')
| -rw-r--r-- | gitk-git/gitk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gitk-git/gitk b/gitk-git/gitk index 84ab02e15f..9a4d9c40cf 100644 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -8045,11 +8045,11 @@ proc doprefs {} { grid $top.cdisp - -sticky w -pady 10 label $top.bg -padx 40 -relief sunk -background $bgcolor button $top.bgbut -text [mc "Background"] -font optionfont \ - -command [list choosecolor bgcolor 0 $top.bg background setbg] + -command [list choosecolor bgcolor {} $top.bg background setbg] grid x $top.bgbut $top.bg -sticky w label $top.fg -padx 40 -relief sunk -background $fgcolor button $top.fgbut -text [mc "Foreground"] -font optionfont \ - -command [list choosecolor fgcolor 0 $top.fg foreground setfg] + -command [list choosecolor fgcolor {} $top.fg foreground setfg] grid x $top.fgbut $top.fg -sticky w label $top.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0] button $top.diffoldbut -text [mc "Diff: old lines"] -font optionfont \ @@ -8069,7 +8069,7 @@ proc doprefs {} { grid x $top.hunksepbut $top.hunksep -sticky w label $top.selbgsep -padx 40 -relief sunk -background $selectbgcolor button $top.selbgbut -text [mc "Select bg"] -font optionfont \ - -command [list choosecolor selectbgcolor 0 $top.selbgsep background setselbg] + -command [list choosecolor selectbgcolor {} $top.selbgsep background setselbg] grid x $top.selbgbut $top.selbgsep -sticky w label $top.cfont -text [mc "Fonts: press to choose"] |