Merge branch 'maint'

diff --git a/git-gui.sh b/git-gui.sh
index c76622e4e9c685e9999a6444048d00d1f433d8d7..e33ee03bc0b1881596115da73c875ef784cd0a93 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1047,6 +1047,7 @@ proc incr_font_size {font {amt 1}} {
        incr sz $amt
        font configure $font -size $sz
        font configure ${font}bold -size $sz
+       font configure ${font}italic -size $sz
 }
 
 ######################################################################
@@ -1239,8 +1240,10 @@ catch {
        destroy .dummy
 }
 
+font create font_uiitalic
 font create font_uibold
 font create font_diffbold
+font create font_diffitalic
 
 foreach class {Button Checkbutton Entry Label
                Labelframe Listbox Menu Message
@@ -1276,8 +1279,10 @@ proc apply_config {} {
                }
                foreach {cn cv} [font configure $font] {
                        font configure ${font}bold $cn $cv
+                       font configure ${font}italic $cn $cv
                }
                font configure ${font}bold -weight bold
+               font configure ${font}italic -slant italic
        }
 }