aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/blame.tcl2
-rw-r--r--lib/commit.tcl6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/blame.tcl b/lib/blame.tcl
index 22c5e7a193..4477b84eae 100644
--- a/lib/blame.tcl
+++ b/lib/blame.tcl
@@ -997,7 +997,7 @@ method _showcommit {cur_w lno} {
set enc [tcl_encoding $enc]
if {$enc ne {}} {
- set msg [encoding convertfrom $enc $msg]
+ set msg [convertfrom $enc $msg]
}
set msg [string trim $msg]
}
diff --git a/lib/commit.tcl b/lib/commit.tcl
index 5e77fd2f54..2c2f73d3af 100644
--- a/lib/commit.tcl
+++ b/lib/commit.tcl
@@ -43,9 +43,9 @@ You are currently in the middle of a merge that has not been fully completed. Y
set enc [tcl_encoding $enc]
if {$enc ne {}} {
- set msg [encoding convertfrom $enc $msg]
- set name [encoding convertfrom $enc $name]
- set email [encoding convertfrom $enc $email]
+ set msg [convertfrom $enc $msg]
+ set name [convertfrom $enc $name]
+ set email [convertfrom $enc $email]
}
if {$name ne {} && $email ne {}} {
set commit_author [list name $name email $email date $time]