Merge branch 'maint-1.5.4' into maint

diff --git a/git-gui/lib/choose_font.tcl b/git-gui/lib/choose_font.tcl
index 0c4051b3752b4f88e50e1f4f22189d826234668a..56443b042c62bc10765aaf6484ad1077a843cb30 100644 (file)
--- a/git-gui/lib/choose_font.tcl
+++ b/git-gui/lib/choose_font.tcl
@@ -55,6 +55,7 @@ constructor pick {path title a_family a_size} {
        set w_family $w.inner.family.v
        text $w_family \
                -background white \
+               -foreground black \
                -borderwidth 1 \
                -relief sunken \
                -cursor $::cursor_ptr \
@@ -92,6 +93,7 @@ constructor pick {path title a_family a_size} {
        set w_example $w.example.t
        text $w_example \
                -background white \
+               -foreground black \
                -borderwidth 1 \
                -relief sunken \
                -height 3 \