git-p4: Unset P4DIFF environment variable when using 'p4 -du diff'

diff --git a/git-gui/lib/option.tcl b/git-gui/lib/option.tcl
index 3bfa2edf1ad8e5abb48df360758177a594dab1a1..9270512582034a6629c4ff15abb1f30889f76903 100644 (file)
--- a/git-gui/lib/option.tcl
+++ b/git-gui/lib/option.tcl
@@ -124,6 +124,7 @@ proc do_options {} {
                {b gui.pruneduringfetch {mc "Prune Tracking Branches During Fetch"}}
                {b gui.matchtrackingbranch {mc "Match Tracking Branches"}}
                {i-0..99 gui.diffcontext {mc "Number of Diff Context Lines"}}
+               {i-0..99 gui.commitmsgwidth {mc "Commit Message Text Width"}}
                {t gui.newbranchtemplate {mc "New Branch Name Template"}}
                } {
                set type [lindex $option 0]
@@ -193,9 +194,7 @@ proc do_options {} {
                        ${f}_config_new(gui.spellingdictionary) \
                        $all_dicts
                pack $w.$f.$optid.l -side left -anchor w -fill x
-               pack $w.$f.$optid.v -side left -anchor w \
-                       -fill x -expand 1 \
-                       -padx 5
+               pack $w.$f.$optid.v -side right -anchor e -padx 5
                pack $w.$f.$optid -side top -anchor w -fill x
        }
        unset all_dicts