diff options
| author |  Pat Thoyts <patthoyts@users.sourceforge.net> | 2016-10-03 23:40:50 +0100 |
|---|---|---|
| committer | Pat Thoyts <patthoyts@users.sourceforge.net> | 2016-10-03 23:40:50 +0100 |
| commit | 52f2445d5c70a204f614fd83cf98a27359dff04c (patch) | |
| tree | 56fdf799654d24e1fcdc49658e9db215d54d45ba /lib/diff.tcl | |
| parent | Merge branch 'pt/non-mouse-usage' into pu (diff) | |
| parent | git-gui i18n: mark string in lib/error.tcl for translation (diff) | |
| download | tgif-52f2445d5c70a204f614fd83cf98a27359dff04c.tar.xz | |
Merge branch 'va/i18n_2' into pu
Diffstat (limited to 'lib/diff.tcl')
| -rw-r--r-- | lib/diff.tcl | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/lib/diff.tcl b/lib/diff.tcl index 30bdd691ee..4cae10a4c7 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -223,10 +223,9 @@ proc show_other_diff {path w m cont_info} { } $ui_diff conf -state normal if {$type eq {submodule}} { - $ui_diff insert end [append \ - "* " \ - [mc "Git Repository (subproject)"] \ - "\n"] d_info + $ui_diff insert end \ + "* [mc "Git Repository (subproject)"]\n" \ + d_info } elseif {![catch {set type [exec file $path]}]} { set n [string length $path] if {[string equal -length $n $path $type]} { @@ -611,7 +610,7 @@ proc apply_hunk {x y} { puts -nonewline $p $current_diff_header puts -nonewline $p [$ui_diff get $s_lno $e_lno] close $p} err]} { - error_popup [append $failed_msg "\n\n$err"] + error_popup "$failed_msg\n\n$err" unlock_index return } @@ -829,7 +828,7 @@ proc apply_range_or_line {x y} { puts -nonewline $p $current_diff_header puts -nonewline $p $wholepatch close $p} err]} { - error_popup [append $failed_msg "\n\n$err"] + error_popup "$failed_msg\n\n$err" } unlock_index |