git-gui: Corrected font used for options menu items.

diff --git a/git-gui b/git-gui
index c2b5e568385b430d521465367a2221ad67287df3..008eeb44607cfb96aacc0823214c912ea74324d7 100755 (executable)
--- a/git-gui
+++ b/git-gui
@@ -1510,10 +1510,15 @@ proc do_signoff {} {
                }
        }
 
-       set str "Signed-off-by: $GIT_COMMITTER_IDENT"
-       if {[$ui_comm get {end -1c linestart} {end -1c}] != $str} {
+       set sob "Signed-off-by: $GIT_COMMITTER_IDENT"
+       set last [$ui_comm get {end -1c linestart} {end -1c}]
+       if {$last != $sob} {
                $ui_comm edit separator
-               $ui_comm insert end "\n$str"
+               if {$last != {}
+                       && ![regexp {^[A-Z][A-Za-z]*-[A-Za-z-]+: *} $last]} {
+                       $ui_comm insert end "\n"
+               }
+               $ui_comm insert end "\n$sob"
                $ui_comm edit separator
                $ui_comm see end
        }
@@ -1563,7 +1568,7 @@ proc unclick {w x y} {
 
 set font_ui {Helvetica 10}
 set font_diff {Courier 10}
-set maincursor [. cget -cursor]
+set cursor_ptr left_ptr
 
 switch -glob -- "$tcl_platform(platform),$tcl_platform(os)" {
 windows,*   {set M1B Control; set M1T Ctrl}
@@ -1672,6 +1677,7 @@ menu .mbar.push
 menu .mbar.options
 .mbar.options add checkbutton \
        -label {Trust File Modification Timestamps} \
+       -font $font_ui \
        -offvalue false \
        -onvalue true \
        -variable cfg_trust_mtime
@@ -1690,8 +1696,8 @@ label .vpane.files.index.title -text {Modified Files} \
 text $ui_index -background white -borderwidth 0 \
        -width 40 -height 10 \
        -font $font_ui \
+       -cursor $cursor_ptr \
        -yscrollcommand {.vpane.files.index.sb set} \
-       -cursor $maincursor \
        -state disabled
 scrollbar .vpane.files.index.sb -command [list $ui_index yview]
 pack .vpane.files.index.title -side top -fill x
@@ -1707,8 +1713,8 @@ label .vpane.files.other.title -text {Untracked Files} \
 text $ui_other -background white -borderwidth 0 \
        -width 40 -height 10 \
        -font $font_ui \
+       -cursor $cursor_ptr \
        -yscrollcommand {.vpane.files.other.sb set} \
-       -cursor $maincursor \
        -state disabled
 scrollbar .vpane.files.other.sb -command [list $ui_other yview]
 pack .vpane.files.other.title -side top -fill x
@@ -1791,8 +1797,7 @@ text $ui_comm -background white -borderwidth 1 \
        -relief sunken \
        -width 75 -height 9 -wrap none \
        -font $font_diff \
-       -yscrollcommand {.vpane.lower.commarea.buffer.sby set} \
-       -cursor $maincursor
+       -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
 scrollbar .vpane.lower.commarea.buffer.sby \
        -command [list $ui_comm yview]
 pack $ui_coml -side top -fill x
@@ -1866,7 +1871,6 @@ text $ui_diff -background white -borderwidth 0 \
        -font $font_diff \
        -xscrollcommand {.vpane.lower.diff.body.sbx set} \
        -yscrollcommand {.vpane.lower.diff.body.sby set} \
-       -cursor $maincursor \
        -state disabled
 scrollbar .vpane.lower.diff.body.sbx -orient horizontal \
        -command [list $ui_diff xview]