From 40f54f670a01b6ae4f13e0888796948ddce9104c Mon Sep 17 00:00:00 2001 From: Mark Levedahl Date: Thu, 22 May 2025 13:33:00 -0400 Subject: [PATCH] git-gui: replace encoding binary with iso8859-1 git-gui currently configures some channels as '-encoding binary' when the channel is not really binary (e.g, the channel is consumed as lines of text). In 8.6, '-encoding binary' is an alias for '-encoding iso8859), but TIP 699 removes this alias for Tcl 9.0. Let's switch to '-encoding iso8859-1' to be compatible across Tcl versions. Signed-off-by: Mark Levedahl --- lib/blame.tcl | 2 +- lib/commit.tcl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/blame.tcl b/lib/blame.tcl index e51a820b12..bb67b047eb 100644 --- a/lib/blame.tcl +++ b/lib/blame.tcl @@ -985,7 +985,7 @@ method _showcommit {cur_w lno} { set msg {} catch { set fd [git_read [list cat-file commit $cmit]] - fconfigure $fd -encoding binary -translation lf + fconfigure $fd -encoding iso8859-1 -translation lf # By default commits are assumed to be in utf-8 set enc utf-8 while {[gets $fd line] > 0} { diff --git a/lib/commit.tcl b/lib/commit.tcl index d6313e568b..adde708084 100644 --- a/lib/commit.tcl +++ b/lib/commit.tcl @@ -28,7 +28,7 @@ You are currently in the middle of a merge that has not been fully completed. Y set name "" set email "" set fd [git_read [list cat-file commit $curHEAD]] - fconfigure $fd -encoding binary -translation lf + fconfigure $fd -encoding iso8859-1 -translation lf # By default commits are assumed to be in utf-8 set enc utf-8 while {[gets $fd line] > 0} { @@ -361,7 +361,7 @@ proc commit_committree {fd_wt curHEAD msg_p} { # if {$commit_type eq {normal}} { set fd_ot [git_read [list cat-file commit $PARENT]] - fconfigure $fd_ot -encoding binary -translation lf + fconfigure $fd_ot -encoding iso8859-1 -translation lf set old_tree [gets $fd_ot] close $fd_ot -- 2.47.3