From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 20 Sep 2007 17:01:32 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: gitgui-0.9.0~67
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e7deec6c72f06b6e953cc1cf24653da4f69bcfd4;p=git.git

Merge branch 'maint'

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

e7deec6c72f06b6e953cc1cf24653da4f69bcfd4
diff --cc git-gui.sh
index 324303786,28d7c2169..db1507cde
--- a/git-gui.sh
+++ b/git-gui.sh
@@@ -1669,10 -1648,10 +1669,10 @@@ 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 "Invalid font specified in gui.$name:\n\n$err"
 +			error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]
  		}
  		foreach {cn cv} [font configure $font] {
  			font configure ${font}bold $cn $cv