diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-09-01 15:39:56 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-01 15:39:56 -0700 |
| commit | 961a628fdd79a30188b0f76be98b3c1db8e13389 (patch) | |
| tree | 9703c203a5a6006bc4c0ccb2a19ccda1cfd807b5 | |
| parent | f7078b40917daa20ea3fa54c7e38766594e4b996 (diff) | |
| parent | 9dc3793166db8f3b80b909e2cb3ac3c5d0a611d5 (diff) | |
| download | git-961a628fdd79a30188b0f76be98b3c1db8e13389.tar.gz git-961a628fdd79a30188b0f76be98b3c1db8e13389.tar.xz | |
Merge branch 'maint'
* maint:
git-gui: Fix string escaping in po2msg.sh
git gui: show diffs with a minimum of 1 context line
Conflicts:
lib/option.tcl
| -rwxr-xr-x | git-gui.sh | 2 | ||||
| -rw-r--r-- | lib/diff.tcl | 2 | ||||
| -rw-r--r-- | lib/option.tcl | 2 | ||||
| -rw-r--r-- | po/po2msg.sh | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/git-gui.sh b/git-gui.sh index ec08b5a92..99de1a257 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1947,7 +1947,7 @@ proc show_more_context {} { proc show_less_context {} { global repo_config - if {$repo_config(gui.diffcontext) >= 1} { + if {$repo_config(gui.diffcontext) > 1} { incr repo_config(gui.diffcontext) -1 reshow_diff } diff --git a/lib/diff.tcl b/lib/diff.tcl index 52b79e4a1..4a7138be9 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -175,7 +175,7 @@ proc show_diff {path w {lno {}} {scroll_pos {}}} { lappend cmd -p lappend cmd --no-color - if {$repo_config(gui.diffcontext) >= 0} { + if {$repo_config(gui.diffcontext) >= 1} { lappend cmd "-U$repo_config(gui.diffcontext)" } if {$w eq $ui_index} { diff --git a/lib/option.tcl b/lib/option.tcl index eb958ffd4..2d4b97b7d 100644 --- a/lib/option.tcl +++ b/lib/option.tcl @@ -126,7 +126,7 @@ proc do_options {} { {b gui.fastcopyblame {mc "Blame Copy Only On Changed Files"}} {i-20..200 gui.copyblamethreshold {mc "Minimum Letters To Blame Copy On"}} {i-0..300 gui.blamehistoryctx {mc "Blame History Context Radius (days)"}} - {i-0..99 gui.diffcontext {mc "Number of Diff Context Lines"}} + {i-1..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"}} } { diff --git a/po/po2msg.sh b/po/po2msg.sh index b7c4bf3fd..1e9f99252 100644 --- a/po/po2msg.sh +++ b/po/po2msg.sh @@ -11,8 +11,8 @@ proc u2a {s} { foreach i [split $s ""] { scan $i %c c if {$c<128} { - # escape '[', '\' and ']' - if {$c == 0x5b || $c == 0x5d} { + # escape '[', '\', '$' and ']' + if {$c == 0x5b || $c == 0x5d || $c == 0x24} { append res "\\" } append res $i |