git-gui: Add option for changing the width of the commit message text box

The width of the commit message text area is currently hard-coded
to 75 characters. This value might be not optimal for some projects.
For instance users who would like to generate GNU-style ChangeLog
file from git commit message might prefer commit messages of width
no longer than 70 characters.

This patch adds a global and per repository option "Commit Message
Text Width", which could be used to change the width of the commit
message text area.

Signed-off-by: Adam Piątyszek <ediap@users.sourceforge.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/git-gui.sh b/git-gui.sh
index 874144397c4661fdcd107e060555ae5897ae004e..3a58cd2c6b49b8734234c6fb5957c035df9787d4 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -611,6 +611,7 @@ set default_config(gui.matchtrackingbranch) false
 set default_config(gui.pruneduringfetch) false
 set default_config(gui.trustmtime) false
 set default_config(gui.diffcontext) 5
 set default_config(gui.pruneduringfetch) false
 set default_config(gui.trustmtime) false
 set default_config(gui.diffcontext) 5

+set default_config(gui.commitmsgwidth) 75

 set default_config(gui.newbranchtemplate) {}
 set default_config(gui.spellingdictionary) {}
 set default_config(gui.fontui) [font configure font_ui]
 set default_config(gui.newbranchtemplate) {}
 set default_config(gui.spellingdictionary) {}
 set default_config(gui.fontui) [font configure font_ui]


@@ -2424,7 +2425,7 @@ text $ui_comm -background white -foreground black \
        -maxundo 20 \
        -autoseparators true \
        -relief sunken \
        -maxundo 20 \
        -autoseparators true \
        -relief sunken \

-       -width 75 -height 9 -wrap none \
+       -width $repo_config(gui.commitmsgwidth) -height 9 -wrap none \

        -font font_diff \
        -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
 scrollbar .vpane.lower.commarea.buffer.sby \
        -font font_diff \
        -yscrollcommand {.vpane.lower.commarea.buffer.sby set}
 scrollbar .vpane.lower.commarea.buffer.sby \

diff --git a/lib/option.tcl b/lib/option.tcl
index ea80df009226d0ff14e8fe423abfe3d7a94ef56b..9270512582034a6629c4ff15abb1f30889f76903 100644 (file)
--- a/lib/option.tcl
+++ b/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"}}
                {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]
                {t gui.newbranchtemplate {mc "New Branch Name Template"}}
                } {
                set type [lindex $option 0]