[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/texi2any.pl: Call _encode_message on message
From: |
Gavin D. Smith |
Subject: |
branch master updated: * tp/texi2any.pl: Call _encode_message on messages passed to "die" to avoid "Wide character in die" warning. Report from Werner. |
Date: |
Tue, 08 Nov 2022 12:36:56 -0500 |
This is an automated email from the git hooks/post-receive script.
gavin pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 4818fbbf5f * tp/texi2any.pl: Call _encode_message on messages passed
to "die" to avoid "Wide character in die" warning. Report from Werner.
4818fbbf5f is described below
commit 4818fbbf5f573015a27d6e11dc11286c06034015
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Tue Nov 8 17:36:43 2022 +0000
* tp/texi2any.pl: Call _encode_message on messages passed to
"die" to avoid "Wide character in die" warning. Report from
Werner.
---
ChangeLog | 7 +++++++
tp/texi2any.pl | 13 +++++++------
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f49b24ebe6..b1bf44e1fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-11-08 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/texi2any.pl: Call _encode_message on messages passed to
+ "die" to avoid "Wide character in die" warning. Report from
+ Werner.
+
2022-11-05 Patrice Dumas <pertusus@free.fr>
Do not use FirstInFile in direction strings, document FirstInFile
@@ -244,6 +250,7 @@
2022-11-07 Gavin Smith <gavinsmith0123@gmail.com>
* README-hacking: new ChangeLog file done
+
Copyright 2022 Free Software Foundation, Inc.
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index f1573241fa..804d0ba6ff 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -1200,8 +1200,9 @@ if (defined ($formats_table{$format}->{'init_file'})) {
if ($call_texi2dvi) {
if (defined(get_conf('OUTFILE')) and @ARGV > 1) {
- die sprintf(__('%s: when generating %s, only one input FILE may be
specified with -o'."\n"),
- $real_command_name, format_name($format));
+ die _encode_message(
+ sprintf(__('%s: when generating %s, only one input FILE may be specified
with -o'."\n"),
+ $real_command_name, format_name($format)));
}
} elsif($Xopt_arg_nr) {
document_warn(__('--Xopt option without printed output'));
@@ -1253,7 +1254,7 @@ if
(defined($formats_table{$converted_format}->{'module'})) {
eval "require $module";
my $error = $@;
if ($error ne '') {
- die sprintf(__("error loading %s: %s"), $module, $error);
+ die _encode_message(sprintf(__("error loading %s: %s"), $module, $error));
};
eval "$module->import;";
@@ -1324,13 +1325,13 @@ if (get_conf('SHOW_BUILTIN_CSS_RULES')) {
}
# Main processing, process all the files given on the command line
-
# Note that the input file names are binary strings and are not decoded
my @input_files = @ARGV;
# use STDIN if not a tty, like makeinfo does
@input_files = ('-') if (!scalar(@input_files) and !-t STDIN);
-die sprintf(__("%s: missing file argument.\n"), $real_command_name)
- .sprintf(__("Try `%s --help' for more information.\n"), $real_command_name)
+die _encode_message(
+ sprintf(__("%s: missing file argument.\n"), $real_command_name)
+ .sprintf(__("Try `%s --help' for more information.\n"), $real_command_name))
unless (scalar(@input_files) >= 1);
my $file_number = -1;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/texi2any.pl: Call _encode_message on messages passed to "die" to avoid "Wide character in die" warning. Report from Werner.,
Gavin D. Smith <=