git-gui: Add a menu of available encodings.

diff --git a/lib/diff.tcl b/lib/diff.tcl
index a30c80a935b58ce0c783dfffde196a85eadca9a2..8fefc5d9ae9cad3be93946b67f20bf82f09d0c89 100644 (file)
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -165,7 +165,9 @@ proc show_other_diff {path w m scroll_pos} {
                                }
                                file {
                                        set fd [open $path r]
-                                       fconfigure $fd -eofchar {}
+                                       fconfigure $fd \
+                                               -eofchar {} \
+                                               -encoding [get_path_encoding $path]
                                        set content [read $fd $max_sz]
                                        close $fd
                                        set sz [file size $path]
@@ -279,8 +281,8 @@ proc start_show_diff {scroll_pos {add_opts {}}} {
        set ::current_diff_inheader 1
        fconfigure $fd \
                -blocking 0 \
-               -encoding binary \
-               -translation binary
+               -encoding [get_path_encoding $path] \
+               -translation lf
        fileevent $fd readable [list read_diff $fd $scroll_pos]
 }
 
@@ -432,8 +434,9 @@ proc apply_hunk {x y} {
        }
 
        if {[catch {
+               set enc [get_path_encoding $current_diff_path]
                set p [eval git_write $apply_cmd]
-               fconfigure $p -translation binary -encoding binary
+               fconfigure $p -translation binary -encoding $enc
                puts -nonewline $p $current_diff_header
                puts -nonewline $p [$ui_diff get $s_lno $e_lno]
                close $p} err]} {
@@ -601,8 +604,9 @@ proc apply_line {x y} {
        set patch "@@ -$hln,$n +$hln,[eval expr $n $sign 1] @@\n$patch"
 
        if {[catch {
+               set enc [get_path_encoding $current_diff_path]
                set p [eval git_write $apply_cmd]
-               fconfigure $p -translation binary -encoding binary
+               fconfigure $p -translation binary -encoding $enc
                puts -nonewline $p $current_diff_header
                puts -nonewline $p $patch
                close $p} err]} {