Commits

Anonymous committed 48b8d2b

git-gui: Allow users to set font weights to bold

Previously we allowed users to tweak their font weight to be bold by
setting it manually in their ~/.gitconfig prior to starting git-gui.
This was broken in ae0754ac9a24afa2693246222fc078fe9c133b3a when
Simon set the font weight to normal by default, overridding whatever
we found from the ~/.gitconfig file.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

  • Participants
  • Parent commits 6ea1079

Comments (0)

Files changed (1)

 		set name [lindex $option 0]
 		set font [lindex $option 1]
 		if {[catch {
+			set need_weight 1
 			foreach {cn cv} $repo_config(gui.$name) {
-				font configure $font $cn $cv -weight normal
+				if {$cn eq {-weight}} {
+					set need_weight 0
+				}
+				font configure $font $cn $cv
+			}
+			if {$need_weight} {
+				font configure $font -weight normal
 			}
 			} err]} {
 			error_popup [strcat [mc "Invalid font specified in %s:" "gui.$name"] "\n\n$err"]