Merge branch 'maint'

spearce · spearce · commit 961a628fdd79 · 2008-09-01T15:39:56.000-07:00
* maint:
  git-gui: Fix string escaping in po2msg.sh
  git gui: show diffs with a minimum of 1 context line

Conflicts:
	lib/option.tcl
diff --git 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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1947,7 +1947,7 @@ proc show_more_context {} {`
`1947`	`1947`
`1948`	`1948`	`proc show_less_context {} {`
`1949`	`1949`	`global repo_config`
`1950`		`- if {$repo_config(gui.diffcontext) >= 1} {`
	`1950`	`+ if {$repo_config(gui.diffcontext) > 1} {`
`1951`	`1951`	`incr repo_config(gui.diffcontext) -1`
`1952`	`1952`	`reshow_diff`
`1953`	`1953`	`}`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ proc show_diff {path w {lno {}} {scroll_pos {}}} {`
`175`	`175`
`176`	`176`	`lappend cmd -p`
`177`	`177`	`lappend cmd --no-color`
`178`		`- if {$repo_config(gui.diffcontext) >= 0} {`
	`178`	`+ if {$repo_config(gui.diffcontext) >= 1} {`
`179`	`179`	`lappend cmd "-U$repo_config(gui.diffcontext)"`
`180`	`180`	`}`
`181`	`181`	`if {$w eq $ui_index} {`