Merge branch 'maint'

* maint:
git-gui: Avoid using bold text in entire gui for some fonts

diff --git a/git-gui.sh b/git-gui.sh
index 3243037861b762686cd987ede89f38aa52d3e336..db1507cdece56fa1031d5036e9887e39a98caf5f 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1669,7 +1669,7 @@ proc apply_config {} {
                set font [lindex $option 1]
                if {[catch {
                        foreach {cn cv} $repo_config(gui.$name) {
-                               font configure $font $cn $cv
+                               font configure $font $cn $cv -weight normal
                        }
                        } err]} {
                        error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]