diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-05-31 23:34:24 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-05-31 23:34:24 -0400 |
| commit | 71a9db534a6bb4a6e9824c01b557a96ccaae0e89 (patch) | |
| tree | 8ab2a8437233dd6591593672d6e18d57d5cee43c | |
| parent | a1388cf0361b133deaba5266211a34bdec66b7cc (diff) | |
| parent | b8848f7753762ff8c4e34b3c15e788c5f7e6781f (diff) | |
| download | git-71a9db534a6bb4a6e9824c01b557a96ccaae0e89.tar.gz git-71a9db534a6bb4a6e9824c01b557a96ccaae0e89.tar.xz | |
Merge branch 'maint'
* maint:
git-gui: Allow as few as 0 lines of diff context
| -rwxr-xr-x | git-gui.sh | 6 | ||||
| -rw-r--r-- | lib/diff.tcl | 2 | ||||
| -rw-r--r-- | lib/option.tcl | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/git-gui.sh b/git-gui.sh index f87c12ea8..3bd12d20b 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -2071,17 +2071,17 @@ lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] $ctxm add separator $ctxm add command \ -label {Show Less Context} \ - -command {if {$repo_config(gui.diffcontext) >= 2} { + -command {if {$repo_config(gui.diffcontext) >= 1} { incr repo_config(gui.diffcontext) -1 reshow_diff }} lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] $ctxm add command \ -label {Show More Context} \ - -command { + -command {if {$repo_config(gui.diffcontext) < 99} { incr repo_config(gui.diffcontext) reshow_diff - } + }} lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state] $ctxm add separator $ctxm add command -label {Options...} \ diff --git a/lib/diff.tcl b/lib/diff.tcl index 7e715a686..29436b50c 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -145,7 +145,7 @@ proc show_diff {path w {lno {}}} { lappend cmd -p lappend cmd --no-color - if {$repo_config(gui.diffcontext) > 0} { + if {$repo_config(gui.diffcontext) >= 0} { lappend cmd "-U$repo_config(gui.diffcontext)" } if {$w eq $ui_index} { diff --git a/lib/option.tcl b/lib/option.tcl index 4924b9aa5..ba2a723fc 100644 --- a/lib/option.tcl +++ b/lib/option.tcl @@ -188,7 +188,7 @@ proc do_options {} { {b gui.trustmtime {Trust File Modification Timestamps}} {b gui.pruneduringfetch {Prune Tracking Branches During Fetch}} - {i-1..99 gui.diffcontext {Number of Diff Context Lines}} + {i-0..99 gui.diffcontext {Number of Diff Context Lines}} {t gui.newbranchtemplate {New Branch Name Template}} } { set type [lindex $option 0] |